From a9fc1cf3e1d6fa1cef9a0cc9d088002143c7b847 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 29 Dec 2022 17:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/document/enums/LawsStateEnum.java |  2 +-
 .../impl/DummyInventoryInfoEOServiceImpl.java | 54 +++++++------------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java
index 9d580bac4..c4bfd70ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java
@@ -11,7 +11,7 @@ public enum LawsStateEnum {
     ABOLISH("废止","2"),
     THE_UPCOMING("即将实施","3"),
     DRAFT("草稿","4"),
-    BE_REPLACED("被代替","5");
+    BE_REPLACED("被替代","5");
 
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 369928b37..25e9a0748 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -466,7 +466,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			dummyInventoryInfoEOList = stateSort(orderBy, orderByField, dummyInventoryInfoEOList, list);
 
 			//认证级别（WVTA，Com.-VTA，Cert.-Market，Reg.-Market,NA）
-			dummyInventoryInfoEOList = attestationRankSort(orderBy, orderByField, dummyInventoryInfoEOList, list);
+			dummyInventoryInfoEOList = attestationRankSort(orderBy, orderByField, dummyInventoryInfoEOList);
 
 			//责任领域
 			if("dutyTerritory".equals(orderByField)){
@@ -484,7 +484,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		return dummyInventoryInfoEOList;
 	}
 
-	private List<DummyInventoryInfoEO> attestationRankSort(String orderBy, String orderByField, List<DummyInventoryInfoEO> dummyInventoryInfoEOList, List<DummyInventoryInfoEO> list) {
+	private List<DummyInventoryInfoEO> attestationRankSort(String orderBy, String orderByField, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
+		List<DummyInventoryInfoEO> list = new LinkedList<>();
 		if(ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)){
 			List<DummyInventoryInfoEO> wvta = dummyInventoryInfoEOList.stream()
 					.filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList());
@@ -496,10 +497,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					.filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.REGU.getValue())).collect(Collectors.toList());
 			List<DummyInventoryInfoEO> na = dummyInventoryInfoEOList.stream()
 					.filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.NA.getValue())).collect(Collectors.toList());
+			List<DummyInventoryInfoEO> valueNull = dummyInventoryInfoEOList.stream()
+					.filter(e -> StringUtils.isBlank(e.getAttestationRankStr())).collect(Collectors.toList());
 
 
 			if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
 				//正序
+				list.addAll(valueNull);
 				list.addAll(wvta);
 				list.addAll(vta);
 				list.addAll(market);
@@ -513,6 +517,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				list.addAll(market);
 				list.addAll(vta);
 				list.addAll(wvta);
+				list.addAll(valueNull);
 			}
 		}
 		if(ObjectUtils.isNotEmpty(list)){
@@ -580,6 +585,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(shi4Yong4Fan4Wei2)){
 					String shi4Yong4Fan4Wei2_dictText = this.disposeShowDictItemValue(sysDictItems, shi4Yong4Fan4Wei2,cut, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getValue());
 					data.setShi4Yong4Fan4Wei2_dictText(shi4Yong4Fan4Wei2_dictText);
+					data.setShi4Yong4Fan4Wei2Str(shi4Yong4Fan4Wei2_dictText);
+				}else{
+					data.setShi4Yong4Fan4Wei2Str("");
 				}
 
 				// 状态
@@ -587,6 +595,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(state)){
 					String state_dictText = this.disposeShowDictItemValue(sysDictItems, state,cut, DummyInventoryBaseFieldEnum.STATE.getValue());
 					data.setState_dictText(state_dictText);
+					data.setStateStr(state_dictText);
+				}else{
+					data.setStateStr("");
 				}
 
 				// 实施类别
@@ -608,6 +619,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(attestationRank)){
 					String attestationRank_dictText = this.disposeShowDictItemValue(sysDictItems, attestationRank,cut, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue());
 					data.setAttestationRank_dictText(attestationRank_dictText);
+					data.setAttestationRankStr(attestationRank_dictText);
+				}else{
+					data.setAttestationRankStr("");
 				}
 
 				// 责任领域
@@ -615,6 +629,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(dutyTerritory)){
 					String dutyTerritory_dictText = this.disposeShowDictItemValue(sysDictItems, dutyTerritory,cut, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue());
 					data.setDutyTerritory_dictText(dutyTerritory_dictText);
+					data.setDutyTerritoryStr(dutyTerritory_dictText);
+				}else{
+					data.setDutyTerritoryStr("");
 				}
 
 				// 设计符合性-发起人
@@ -1191,42 +1208,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			List<SysCategory> categoryList = sysCategoryService.list();
 
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
-				String shi4Yong4Fan4Wei2 = record.getShi4Yong4Fan4Wei2();
-				String state = record.getState();
-				String attestationRank = record.getAttestationRank();
-				String dutyTerritory = record.getDutyTerritory();
 				if(StringUtils.isBlank(record.getWvtaId())){
 					record.setWvtaId("");
 				}
-
-				//适用范围 apply_scope
-				if(StringUtils.isNotBlank(shi4Yong4Fan4Wei2)){
-					String applyScope = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, shi4Yong4Fan4Wei2, "apply_scope");
-					record.setShi4Yong4Fan4Wei2Str(applyScope);
-				}else{
-					record.setShi4Yong4Fan4Wei2Str("");
-				}
-				//状态  state
-				if(StringUtils.isNotBlank(state)){
-					String stateTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, state, "state");
-					record.setStateStr(stateTemp);
-				}else{
-					record.setStateStr("");
-				}
-				//认证级别 attestation_rank
-				if(StringUtils.isNotBlank(attestationRank)){
-					String attestationRankTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, attestationRank, "attestation_rank");
-					record.setAttestationRankStr(attestationRankTemp);
-				}else{
-					record.setAttestationRankStr("");
-				}
-				//责任领域  duty_territory
-				if(StringUtils.isNotBlank(dutyTerritory)){
-					String dutyTerritoryTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, dutyTerritory, "duty_territory");
-					record.setDutyTerritoryStr(dutyTerritoryTemp);
-				}else{
-					record.setDutyTerritoryStr("");
-				}
 				//技术领域
 				if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
 					List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));