fix(任务转交): 81351

laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java

@@ -39,7 +39,7 @@ public class LawsStandardization extends BaseEntity {
     private java.lang.String supperName;
 	/**节点类型*/
 	@Excel(name = "节点类型", width = 15)
-    @ApiModelProperty(value = "节点类型(ROOT:总标委，WYH:委员会，FBW:委员会，GROUP:工作组)")
+    @ApiModelProperty(value = "节点类型(ROOT:总标委，WYH:委员会，FBW:分标委，GROUP:工作组)")
     @Dict(dicCode = "standardization_type")
     private java.lang.String standardizationType;
 	/**编号*/

laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml

@@ -85,6 +85,8 @@
     </select>
 
     <select id="queryProcessDB" resultType="com.jero.modules.laws.tasktransfer.entity.LawsProcessDB">
+        select *
+        from (
         SELECT pa.id,
                task_id,
                prc_num,
@@ -92,6 +94,7 @@
                pa.project_id AS project_id,
                pa.prc_name,
                task_name,
+               par.create_time,
                user_id AS user,
                (IF(prc_status IN (2, 3) OR finish_flag = 2, FALSE, TRUE)) state
         FROM process_all pa
@@ -99,6 +102,9 @@
                     LEFT JOIN process_node pn ON pa.process_definition_id = pn.process_definition_id
                     AND  SUBSTR(par.node_id,1,LENGTH(par.node_id)-1) = SUBSTR(pn.xml_node_id,1,LENGTH(pn.xml_node_id)-1)
                  LEFT JOIN sys_user u ON user_id = u.id
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
+                 group by par.id
+                ) t
+        ORDER BY create_time DESC
     </select>
 </mapper>

laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java

@@ -126,7 +126,6 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
         queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue());
         queryWrapper.eq("pn.transfer_flag", YesOrNoEnum.YES.getValue());
         queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue());
-        queryWrapper.orderByDesc("par.create_time");
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleIds = loginUser.getRoleIds();
         if (!roleIds.contains("admin") && !roleIds.contains("BZGLY")){