WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单--中英文切换

Browse Source
This commit is contained in:
zhn
2022-04-22 12:01:38 +08:00
parent 497cbf3eb1
commit 4ddaed596f
2 changed files with 1 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
+1 -1
View File
@@ -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);
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
-70
View File
@@ -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");