配置文件修改

sop-api/install/mysql/init/init.sql

@@ -1818,7 +1818,7 @@ INSERT INTO `sys_privilege` VALUES (248, '组织架构查询', '/api/admin/org/l
 INSERT INTO `sys_privilege` VALUES (249, '组织架构保存/修改', '/api/admin/org/save', 'URL', 13, 2, 'AUTH', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (250, '组织架构启用/禁用', '/api/admin/org/enable', 'URL', 13, 3, 'AUTH', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (251, '获取机构下所有用户', '/api/admin/common/get_org_user_list', 'URL', 64, 9, 'SYS', NULL, 1, 1, 0);
-INSERT INTO `sys_privilege` VALUES (252, '用户查询', '/api/admin/user/list', 'URL', 15, 1, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` VALUES (252, '用户查询', '/api/admin/user/list', 'URL', 15, 1, 'SYS', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (253, '服务档位删除', '/api/sys/level/delete', 'URL', 6, 2, 'AUTH', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (254, '服务档位', '/api/sys/level/get', 'URL', 6, 3, 'AUTH', NULL, 1, 1, 0);
 INSERT INTO `sys_privilege` VALUES (255, '服务档位列表', '/api/sys/level/list', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);

sop-api/src/main/java/com/qmth/sop/server/api/TBDingApplyController.java

@@ -1,7 +1,6 @@
 package com.qmth.sop.server.api;
 
 
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.DingApplyDoneResult;
@@ -21,9 +20,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * <p>
@@ -64,7 +61,7 @@ public class TBDingApplyController {
                                      @ApiParam(value = "申请结束时间") @RequestParam(required = false) Long applyEndTime,
                                      @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                      @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) throws Exception {
-        return ResultUtil.ok(tbDingApplyService.flowTaskUnDoneList(new Page<>(pageNumber, pageSize), serviceId, name, supplierId, customName, Objects.nonNull(startTime) ? DateUtil.format(new Date(startTime), SystemConstant.DEFAULT_DATE_YMD_PATTERN) : null, Objects.nonNull(endTime) ? DateUtil.format(new Date(endTime), SystemConstant.DEFAULT_DATE_YMD_PATTERN) : null, applyStartTime, applyEndTime));
+        return ResultUtil.ok(tbDingApplyService.flowTaskUnDoneList(new Page<>(pageNumber, pageSize), serviceId, name, supplierId, customName, startTime, endTime, applyStartTime, applyEndTime));
     }
 
     @ApiOperation(value = "考勤异常已审核接口")
@@ -81,7 +78,7 @@ public class TBDingApplyController {
                                    @ApiParam(value = "申请结束时间") @RequestParam(required = false) Long applyEndTime,
                                    @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                    @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) throws Exception {
-        return ResultUtil.ok(tbDingApplyService.flowTaskDoneList(new Page<>(pageNumber, pageSize), serviceId, name, supplierId, dingExceptionApprove, customName, Objects.nonNull(startTime) ? DateUtil.format(new Date(startTime), SystemConstant.DEFAULT_DATE_YMD_PATTERN) : null, Objects.nonNull(endTime) ? DateUtil.format(new Date(endTime), SystemConstant.DEFAULT_DATE_YMD_PATTERN) : null, applyStartTime, applyEndTime));
+        return ResultUtil.ok(tbDingApplyService.flowTaskDoneList(new Page<>(pageNumber, pageSize), serviceId, name, supplierId, dingExceptionApprove, customName, startTime, endTime, applyStartTime, applyEndTime));
     }
 
     @ApiOperation(value = "考勤异常审核接口")

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDingApplyMapper.java

@@ -36,7 +36,7 @@ public interface TBDingApplyMapper extends BaseMapper<TBDingApply> {
      * @param applyEndTime
      * @return
      */
-    IPage<DingApplyUnDoneResult> flowTaskUnDoneList(IPage<Map> iPage, @Param("userIdList") List<String> userIdList, @Param("serviceId") Long serviceId, @Param("name") String name, @Param("supplierId") Long supplierId, @Param("customName") String customName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("dpr") DataPermissionDto dpr);
+    IPage<DingApplyUnDoneResult> flowTaskUnDoneList(IPage<Map> iPage, @Param("userIdList") List<String> userIdList, @Param("serviceId") Long serviceId, @Param("name") String name, @Param("supplierId") Long supplierId, @Param("customName") String customName, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("dpr") DataPermissionDto dpr);
 
     /**
      * 异常已审核接口
@@ -54,5 +54,5 @@ public interface TBDingApplyMapper extends BaseMapper<TBDingApply> {
      * @param applyEndTime
      * @return
      */
-    IPage<DingApplyDoneResult> flowTaskDoneList(IPage<Map> iPage, @Param("userIdList") List<String> userIdList, @Param("serviceId") Long serviceId, @Param("name") String name, @Param("supplierId") Long supplierId, @Param("dingExceptionApprove") String dingExceptionApprove, @Param("customName") String customName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("dpr") DataPermissionDto dpr);
+    IPage<DingApplyDoneResult> flowTaskDoneList(IPage<Map> iPage, @Param("userIdList") List<String> userIdList, @Param("serviceId") Long serviceId, @Param("name") String name, @Param("supplierId") Long supplierId, @Param("dingExceptionApprove") String dingExceptionApprove, @Param("customName") String customName, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("dpr") DataPermissionDto dpr);
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBDingApplyService.java

@@ -44,7 +44,7 @@ public interface TBDingApplyService extends IService<TBDingApply> {
      * @param applyEndTime
      * @return
      */
-    IPage<DingApplyUnDoneResult> flowTaskUnDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, String customName, String startTime, String endTime, Long applyStartTime, Long applyEndTime) throws Exception;
+    IPage<DingApplyUnDoneResult> flowTaskUnDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, String customName, Long startTime, Long endTime, Long applyStartTime, Long applyEndTime) throws Exception;
 
     /**
      * 异常已审核接口
@@ -61,7 +61,7 @@ public interface TBDingApplyService extends IService<TBDingApply> {
      * @param applyEndTime
      * @return
      */
-    IPage<DingApplyDoneResult> flowTaskDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, DingExceptionApproveEnum dingExceptionApprove, String customName, String startTime, String endTime, Long applyStartTime, Long applyEndTime) throws Exception;
+    IPage<DingApplyDoneResult> flowTaskDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, DingExceptionApproveEnum dingExceptionApprove, String customName, Long startTime, Long endTime, Long applyStartTime, Long applyEndTime) throws Exception;
 
     /**
      * 考勤异常审核接口

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -120,7 +120,7 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
      * @return
      */
     @Override
-    public IPage<DingApplyUnDoneResult> flowTaskUnDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, String customName, String startTime, String endTime, Long applyStartTime, Long applyEndTime) throws Exception {
+    public IPage<DingApplyUnDoneResult> flowTaskUnDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, String customName, Long startTime, Long endTime, Long applyStartTime, Long applyEndTime) throws Exception {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
 
@@ -172,7 +172,7 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
      * @return
      */
     @Override
-    public IPage<DingApplyDoneResult> flowTaskDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, DingExceptionApproveEnum dingExceptionApprove, String customName, String startTime, String endTime, Long applyStartTime, Long applyEndTime) throws Exception {
+    public IPage<DingApplyDoneResult> flowTaskDoneList(IPage<Map> iPage, Long serviceId, String name, Long supplierId, DingExceptionApproveEnum dingExceptionApprove, String customName, Long startTime, Long endTime, Long applyStartTime, Long applyEndTime) throws Exception {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
 

sop-business/src/main/java/com/qmth/sop/business/sync/FxxkApiUtils.java

@@ -36,8 +36,8 @@ public class FxxkApiUtils {
     @Value("${fxxk.app.id}")
     String fxxkAppId;
 
-    @Value("${fxxk.app.secret}")
-    String fxxkAppSecret;
+    @Value("${fxxk.app.secrete}")
+    String fxxkAppSecrete;
 
     @Value("${fxxk.permanent.code}")
     String fxxkPermanentCode;
@@ -64,7 +64,7 @@ public class FxxkApiUtils {
         try {
             Map<String, Object> map = new HashMap<>();
             map.put("appId", validParam(fxxkAppId, null, true, "纷享销客AppID"));
-            map.put("appSecret", validParam(fxxkAppSecret, null, true, "纷享销客APPSecret"));
+            map.put("appSecret", validParam(fxxkAppSecrete, null, true, "纷享销客APPSecret"));
             map.put("permanentCode", validParam(fxxkPermanentCode, null, true, "纷享销客永久授权码"));
             String requestJson = JacksonUtil.parseJson(map);
 

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -1961,4 +1961,8 @@ SET `type`='PROJECT_EXCHANGE_FLOW', t_f_custom_flow_id=NULL, t_f_custom_flow_ent
 WHERE id=1;
 UPDATE t_f_custom_flow_allocation
 SET `type`='QUALITY_PROBLEM_FLOW', t_f_custom_flow_id=NULL, t_f_custom_flow_entity_id=NULL, role_allocation='{"approveConfig":[{"setup":2,"roleTypes":[{"role":"QA"}]}]}', version=NULL
-WHERE id=2;
+WHERE id=2;
+
+UPDATE sys_privilege
+SET name='用户查询', url='/api/admin/user/list', `type`='URL', parent_id=15, `sequence`=1, property='SYS', related=NULL, enable=1, default_auth=1, front_display=0
+WHERE id=252;

sop-business/src/main/resources/mapper/TBDingApplyMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.qmth.sop.business.mapper.TBDingApplyMapper">
 
     <select id="flowTaskUnDoneList" resultType="com.qmth.sop.business.bean.result.DingApplyUnDoneResult">
-        select distinct t.* from(<include refid="flowTaskUnDoneListHeader"/>
+        select t.* from(<include refid="flowTaskUnDoneListHeader"/>
         where 1 = 1
         <if test="userIdList != null and userIdList != '' and userIdList.size() > 0">
             and art.ASSIGNEE_ IN
@@ -104,10 +104,10 @@
             and sc.name like concat('%', #{customName}, '%')
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            and ((tbd.sign_date <![CDATA[ >= ]]> #{startTime} or tbd.sign_date <![CDATA[ <= ]]> #{endTime}) and (tbd.sign_in_time is null or tbd.sign_out_time is null))
+            and (tbda.apply_time <![CDATA[ >= ]]> #{startTime} and tbda.apply_time <![CDATA[ <= ]]> #{endTime})
         </if>
         <if test="applyStartTime != null and applyStartTime != '' and applyEndTime != null and applyEndTime != ''">
-            and (tbda.apply_time <![CDATA[ >= ]]> #{applyStartTime} or tbda.apply_time <![CDATA[ <= ]]> #{applyEndTime})
+            and (tbda.create_time <![CDATA[ >= ]]> #{applyStartTime} and tbda.create_time <![CDATA[ <= ]]> #{applyEndTime})
         </if>
         <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
             <choose>
@@ -133,7 +133,7 @@
     </sql>
 
     <select id="flowTaskDoneList" resultType="com.qmth.sop.business.bean.result.DingApplyDoneResult">
-        select distinct t.* from(select
+        select t.* from(select
             distinct tfcf.type,
             tfcfe.code,
             tffa.status,
@@ -159,9 +159,9 @@
             tbda.`type` as dingExceptionType,
             tbd.sign_date as exceptionTime,
             tbda.apply_time as applyTime,
+            tbda.create_time as createTime,
             tbda.reason,
             (select group_concat(ba.`path` SEPARATOR ';') from basic_attachment ba where find_in_set(ba.id, tbda.attachment_ids)) as attachmentPaths,
-            tbda.create_time as createTime,
             (select CONCAT(tffl.approve_remark, ';' ,tffl.create_time) from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1) as approveInfo,
             (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
 		where find_in_set(us1.id, (select group_concat(tffl.approve_id) from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id and tffl.approve_setup > 1))) as approveUsersName,
@@ -246,10 +246,10 @@
                 and t.customName like concat('%', #{customName}, '%')
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and ((tbd.sign_date <![CDATA[ >= ]]> #{startTime} or tbd.sign_date <![CDATA[ <= ]]> #{endTime}) and (tbd.sign_in_time is null or tbd.sign_out_time is null))
+                and (t.applyTime <![CDATA[ >= ]]> #{startTime} and t.applyTime <![CDATA[ <= ]]> #{endTime})
             </if>
             <if test="applyStartTime != null and applyStartTime != '' and applyEndTime != null and applyEndTime != ''">
-                and (t.applyTime <![CDATA[ >= ]]> #{applyStartTime} or t.applyTime <![CDATA[ <= ]]> #{applyEndTime})
+                and (t.createTime <![CDATA[ >= ]]> #{applyStartTime} and t.createTime <![CDATA[ <= ]]> #{applyEndTime})
             </if>
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
                 <choose>

sop-task/src/main/resources/application.properties

@@ -75,6 +75,18 @@ com.qmth.solar.access-key=9ed64a57627845118913229ad578939b
 com.qmth.solar.access-secret=0qtqPS9S3DnjR043nuszsrUttl6ufqvc
 com.qmth.solar.app-code=sop
 
+wxapp.appid=wx8b4c77de1b6f387b
+
+face.verify.baiduLocalAppId=test
+face.verify.baiduLocalUrlPrefix=http://192.168.20.253
+
+fxxk.app.id=FSAID_131c93b
+fxxk.app.secrete=5d590b10cca24ce5a51fc716564aac9f
+fxxk.permanent.code=4EFBD3FCF655B4D934C163EA5ECE638D
+fxxk.curren.open.user.id=FSUID_AE9192D544DCF7924E88E9EA800641C7
+fxxk.api.name.crm=object_zS8me__c
+fxxk.api.name.crm.detail=object_bs553__c
+
 #============================================================================
 # \u914D\u7F6EJobStore
 #============================================================================