wangliang 1 năm trước cách đây
mục cha
commit
a7912ee53f

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/bean/result/DingApplyUnDoneResult.java

@@ -48,7 +48,7 @@ public class DingApplyUnDoneResult extends WorkTaskResult implements Serializabl
     String supplierCode;
 
     @ApiModelProperty(value = "是否是自己审核")
-    boolean myself;
+    boolean myself = false;
 
     @ApiModelProperty(value = "sop单号")
     String sopNo;

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/bean/result/ProjectExchangeResult.java

@@ -46,7 +46,7 @@ public class ProjectExchangeResult extends WorkTaskResult implements Serializabl
     String approveUsersName = "--";
 
     @ApiModelProperty(value = "是否是自己审核")
-    boolean myself;
+    boolean myself = false;
 
     public boolean isMyself() {
         return myself;

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/bean/result/TBQualityProblemApplyResult.java

@@ -67,7 +67,7 @@ public class TBQualityProblemApplyResult extends TBQualityProblemApply implement
     private Long taskId;
 
     @ApiModelProperty(value = "是否是自己审核")
-    boolean myself;
+    boolean myself = false;
 
     public boolean isMyself() {
         return myself;

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

@@ -159,7 +159,6 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
                     }
                     if (!match) {
                         d.setTaskId(Long.parseLong(taskStrs[0]));
-                        d.setMyself(false);
                     }
                 } else if (Objects.nonNull(taskIds)) {
                     Task task = taskService.createTaskQuery().taskId(taskIds).singleResult();

+ 2 - 2
sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -74,8 +74,8 @@
                tfcf.version,
                cast(tfcf.flow_deployment_id as char) as flowDeploymentId,
                art.NAME_ as taskName,
-               art.TASK_DEF_KEY_ as taskDefKey
---                (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId,
+               art.TASK_DEF_KEY_ as taskDefKey,
+               (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId
 --                IFNULL((select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
 --                 where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))),'--') as pendApproveName
                 <if test="fieldName != null and fieldName != ''">