Browse Source

优化代码

wangliang 1 year ago
parent
commit
00ce03fae1

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

@@ -87,8 +87,8 @@
         fa.update_time updateDateTime,
         fa.update_time updateDateTime,
         cu.real_name submitter ,
         cu.real_name submitter ,
         fe.flow_id as flowId,
         fe.flow_id as flowId,
-        (select group_concat(art.NAME_) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskName,
-        (select group_concat(art.TASK_DEF_KEY_) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskDefKey,
+        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_ = fa.flow_id) as taskId,
         (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskId,
         (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
         (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
         where find_in_set(us1.id, a.user_ids)) user_names,
         where find_in_set(us1.id, a.user_ids)) user_names,

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

@@ -14,8 +14,8 @@
         fa.update_time updateDateTime,
         fa.update_time updateDateTime,
         cu.real_name submitter ,
         cu.real_name submitter ,
         fe.flow_id as flowId,
         fe.flow_id as flowId,
-        (select group_concat(art.NAME_) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskName,
-        (select group_concat(art.TASK_DEF_KEY_) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskDefKey,
+        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_ = fa.flow_id) as taskId,
         (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = fa.flow_id) as taskId,
         (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
         (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
         where find_in_set(us1.id, a.user_ids)) user_names,
         where find_in_set(us1.id, a.user_ids)) user_names,

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

@@ -134,7 +134,7 @@
                     </otherwise>
                     </otherwise>
                 </choose>
                 </choose>
             </if>
             </if>
-                and tffa.status <![CDATA[ <> ]]> 'END'
+                and tffa.status in ('START','DRAFT','AUDITING','REJECT','CANCEL','FINISH')
             <!--and EXISTS(
             <!--and EXISTS(
             select t.* from(select cast(art.PROC_INST_ID_ as Decimal(24)) as flowId
             select t.* from(select cast(art.PROC_INST_ID_ as Decimal(24)) as flowId
             from
             from