From 5e9b42a48d3eb98b06479f0160071d23f6a95c1f Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 29 Jan 2024 16:03:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E8=BD=AC=E4=BA=A4):=2081?=
 =?UTF-8?q?351?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asms/service/impl/LawsAsmsOpenApiServiceImpl.java     | 7 ++++---
 .../laws/standardization/entity/LawsStandardization.java  | 2 +-
 .../tasktransfer/mapper/xml/LawsTaskTransferMapper.xml    | 8 +++++++-
 .../service/impl/LawsTaskTransferServiceImpl.java         | 1 -
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
index b7c52565..0733b025 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
@@ -25,6 +25,7 @@ import com.jero.modules.laws.home.service.ILawsHomeSearchService;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
 import com.jero.modules.laws.standard.service.ILawsReplacedStandardService;
+import com.jero.modules.laws.standardization.common.LawsStandardizationCommon;
 import com.jero.modules.laws.standardization.entity.LawsStandardization;
 import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
 import com.jero.modules.oss.entity.OSSFile;
@@ -159,7 +160,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 	 */
 	@Override
     public void editById(LawsAsmsOpenApi lawsAsmsOpenApi) {
-    	saveOrUpdate(lawsAsmsOpenApi);
+		saveOrUpdate(lawsAsmsOpenApi);
     }
 
 	/**
@@ -309,7 +310,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 
 				mapList.forEach(eMap -> {
 					LawsStandardization lawsStandardization = new LawsStandardization();
-					lawsStandardization.setStandardizationType("分标委");
+					lawsStandardization.setStandardizationType(LawsStandardizationCommon.FBW);
 					lawsStandardization.setPid(parentId);
 					eMap.forEach((k,v) -> {
 						if ("code".equals(k)) {
@@ -495,7 +496,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 					// 代替标准号
 					lawsReplacedStandardService.addRelation(lawsAsmsDomestic.getReplaceCode(), lawsAsmsDomestic.getCode(), 1);
 					// 标准性质
-					/*itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(),
+                    /*itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(),
 							"1695010513489833985", sysDictItemList);*/
 					lawsDomesticStandard.setStandardProperty("SN002");
 					// 标准状态
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java
index dcb10dc8..5b7be4c9 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java
+++ b/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;
 	/**编号*/
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml
index 49c40e0e..a63e4be7 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml
+++ b/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>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java
index a6e02fbb..4bdb4844 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java
+++ b/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")){