From 4ddaed596f8823ddee21bdd4afb1fe25f65a570e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Apr 2022 12:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E4=B8=AD?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryInfoEOController.java       |  2 +-
 .../impl/DummyInventoryInfoEOServiceImpl.java | 70 -------------------
 2 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
index 22b8a4293..0ce478b4b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
@@ -67,7 +67,7 @@ public class DummyInventoryInfoEOController extends JeroController<DummyInventor
 	@GetMapping(value = "/list")
 	public Result<List<DummyInventoryInfoEO>> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
         List<DummyInventoryInfoEO> list = dummyInventoryInfoEOService.queryList(dummyInventoryInfoEO,req);
-        return Result.OK(list);
+        return Result.OK(dummyInventoryInfoEO.getCut(),list);
 	}
 
 	/**
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 bf4d9c408..a8b58326d 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
@@ -828,26 +828,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			}
 			//编号
 			String serialNumber = dummyInventoryInfoEO.getSerialNumber();
-			//标题
-//			String title = dummyInventoryInfoEO.getTitle();
-			//子标题
-			String subtitle = dummyInventoryInfoEO.getSubtitle();
-			//对应标准
-//			String correspondingStandard = dummyInventoryInfoEO.getCorrespondingStandard();
-			//状态
-//			String state = dummyInventoryInfoEO.getState();
 			//认证级别
 			String attestationRank = dummyInventoryInfoEO.getAttestationRank();
 			//责任领域
 			String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory();
-			//适用范围
-//			String shi4Yong4Fan4Wei2 = dummyInventoryInfoEO.getShi4Yong4Fan4Wei2();
 			//认证类型
 			String attestationType = dummyInventoryInfoEO.getAttestationType();
 			//实施类别
 			String implementType = dummyInventoryInfoEO.getImplementType();
-			//适用地区
-//			String region = dummyInventoryInfoEO.getRegion();
 			//设计交付物类型
 			String designDeliverableType = dummyInventoryInfoEO.getDesignDeliverableType();
 			//设计发起人
@@ -866,12 +854,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			String verifyInitiator = dummyInventoryInfoEO.getVerifyInitiator();
 			//确认责任人
 			String verifyDuty = dummyInventoryInfoEO.getVerifyDuty();
-			//技术领域
-//			String technologyTerritory = dummyInventoryInfoEO.getTechnologyTerritory();
-			//新车型实施日期
-//			Date xin1Che1Xing2Shi2Shi1Ri4Qi1 = dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1();
-			//在产车实施日期
-//			Date implementTime = dummyInventoryInfoEO.getImplementTime();
 			//文件
 			String designDeliverableTemplate = dummyInventoryInfoEO.getDesignDeliverableTemplate();
 			String prehomoDeliverableTemplate = dummyInventoryInfoEO.getPrehomoDeliverableTemplate();
@@ -880,48 +862,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			//编号(输入框必填)
 			flag = must(dummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "serial number");
 
-			//标题(输入框必填)
-//			if(StringUtils.isBlank(title)){
-//				//必填验证
-//				if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
-//					errorMsg += "标题为必填项,不能为空";
-//				}else{
-//					errorMsg += "title this parameter is mandatory and cannot be empty";
-//				}
-//				msgList.add(errorMsg);
-//			}
-			//适用范围(多选不必填)
-//			value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, shi4Yong4Fan4Wei2,msgList,"适用范围","scope of application");;
-//			if (StringUtils.isNotBlank(value)) {
-//				dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(value);
-//			}
-			//状态(单选必填)
-//			flag = must(dummyInventoryInfoEO, errorMsg, msgList, state, "状态", "state");
-//			if(flag){
-//				value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, state, msgList, "状态", "state");
-//				if(StringUtils.isNotBlank(value)){
-//					dummyInventoryInfoEO.setState(value);
-//				}
-//			}
-
-			//对应标准
-//			flag = must(dummyInventoryInfoEO, errorMsg, msgList, correspondingStandard,"对应标准","corresponding standard");
-//			if(flag){
-//				StringBuilder sb = new StringBuilder();
-//				for (String s : correspondingStandard.split(",")) {
-//					List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
-//							.filter(e -> s.equals(e.getSerialNumber())).collect(Collectors.toList());
-//					if(collect.size() == 0){
-//						sb.append(s+",");
-//					}else{
-//						sb.append(collect.get(0).getId()+",");
-//					}
-//				}
-//				if(StringUtils.isNotBlank(sb)){
-//					String substring = sb.substring(0, sb.length() - 1);
-//					dummyInventoryInfoEO.setCorrespondingStandard(substring);
-//				}
-//			}
 
 			//实施类别(单选不必填)
 			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, implementType,msgList,"实施类别","implementation category");
@@ -955,9 +895,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 			}
 
-			//技术领域
-//			tree(categoryList,msgList, dummyInventoryInfoEO, errorMsg, technologyTerritory);
-
 			//责任领域(多选必填)
 			flag = must(dummyInventoryInfoEO, errorMsg, msgList, dutyTerritory,"责任领域","area of responsibility");
 			if(flag){
@@ -967,13 +904,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 			}
 
-			//适用地区(多选不必填)
-//			value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, region,msgList,"适用地区","zone of application");;
-//			if (StringUtils.isNotBlank(value)) {
-//				dummyInventoryInfoEO.setRegion(value);
-//			}
-			//备注
-
 			//设计
 			//交付物类型
 			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, designDeliverableType,msgList,"交付物类型","type of deliverables");