From ecf699bc66ec5a4be17e809670efd58563800f19 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 16 May 2022 14:43:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug50782-=E6=A0=87=E5=87=86=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=AD=98=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FileSplitItemsEOServiceImpl.java | 55 ++++++++----------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index f6f8ff08a..f6adbf734 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -366,7 +366,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); for (String fileId : value.toString().split(",")) { @@ -381,9 +380,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); for (String fileId : value.toString().split(",")) { @@ -396,11 +394,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl ossFiles = ossFileService.getFileInfosByConnectId(value.toString()); - if(CollectionUtil.isNotEmpty(ossFiles)){ + if(CollectionUtil.isNotEmpty(ossFiles)){ // 没有修改文件 valuesBuilder.append("," + "'" + value + "'"); - } else { + } else { // 新加了一个文件 String valueTemp = UUID.randomUUID().toString().replace("-", ""); - // value = valueTemp; //修改文件表关联信息connect_id List oSSFileList = new ArrayList<>(); for (String fileId : value.toString().split(",")) { @@ -418,7 +415,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(","))); @@ -924,43 +921,39 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl 0) { - List> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString()); + List> documentLibraryEOList = documentLibraryEOService.getListBySerialNumber(itemsMap.get(dbFieldName).toString()); + documentLibraryEOList = documentLibraryEOList.stream() + .collect(Collectors.collectingAndThen(Collectors + .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.get("serial_number").toString()))), ArrayList::new)); // 根据编号去重 Map idSerialNumberMap = new HashMap<>(); List idList = new ArrayList<>(); + List nameList = new ArrayList<>(); for (Map map : documentLibraryEOList) { - String serialNumber = (String) map.get("serial_number"); + String serialNumber = (String) map.get("serial_number"); // TODO 可能存在编号相同的情况 String documentLibraryEOId = (String) map.get("id"); - idSerialNumberMap.put(documentLibraryEOId, serialNumber); - idList.add(documentLibraryEOId); + idSerialNumberMap.put(serialNumber, documentLibraryEOId); + nameList.add(serialNumber); } - List valueList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")); - List newValueList = new ArrayList<>(); - + List valueList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")).stream().distinct().collect(Collectors.toList()); for(String value : valueList) { - if (idList.contains(value)) { - newValueList.add(idSerialNumberMap.get(value)); + if (nameList.contains(value)) { + idList.add(idSerialNumberMap.get(value)); } else { - newValueList.add(value); + idList.add(value); } } - String names = StringUtils.join(newValueList, ","); - itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString()); - itemsMap.put(dbFieldName, names); + + String ids = StringUtils.join(idList, ","); + itemsMap.put(dbFieldName+"_id", ids); + itemsMap.put(dbFieldName, itemsMap.get(dbFieldName).toString()); } -// List> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString()); -// if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ -// String names = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); -// itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString()); -// itemsMap.put(dbFieldName, names); -// -// } } - } + }*/ } return itemsMap; } From fd1ffd6af42412134c755e53f77f70306568b359 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 16 May 2022 15:07:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[add]=20=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 35 ++++++++++++++++++- .../ParameterItemCollectionList.vue | 1 + 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 0a9f5c0a6..38ee9ab3a 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -13,6 +13,10 @@ @change="tableOnChange" @onHeaderRow='onHeaderRow' > + + 按钮 + {{ record }} + @@ -76,7 +80,10 @@ export default { searchParmes: {}, loading: false, orderBy: '1', - orderByField: '' + orderByField: '', + homo: 0, // 认证工程师 + sdt: 0, // 工程接口人 + dre: 0, // 填写人 } }, mounted() {}, @@ -84,6 +91,25 @@ export default { onHeaderRow(column, index) { console.log(column, index) }, + getLoginUserType() { + let params = { + paramsManifestId: this.paramsManifest.id, + projectId: this.$route.query.id + } + getAction(this.url.getLoginUserType, params).then((res) => { + if (res.success) { + res.result.split(',').forEach((item,index) => { + if(item === 'homo') { + this.homo = 1 + } else if(item === 'sdt') { + this.sdt = 1 + } else if(item === 'dre') { + this.dre = 1 + } + }) + } + }) + }, getData() { let params = { paramsManifestId: this.paramsManifest.id, @@ -106,6 +132,12 @@ export default { customRender: 'detailClick' } } + if(res.click) { + // 工程接口人列表修改 + this.columns[index].scopedSlots = { + customRender: 'operationbtn' + } + } }) if (this.showAction) { this.columns.push({ @@ -173,6 +205,7 @@ export default { watch: { paramsManifest(newVal, oldVal) { this.getData() + this.getLoginUserType() this.getTableList() } } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index c60dac214..63a8b687a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -196,6 +196,7 @@ export default { tableHeader: 'params/collectManifest/getHeader', tableList: 'params/collectManifest/list', add: 'params/collectManifest/submit', + getLoginUserType: 'params/collectManifest/getLoginUserType', // edit: 'params/manifest/edit', // queryById: 'params/manifest/queryById', deleteBatch: 'params/collectManifest/deleteBatch', From 19a93eafa6a6ac80b81423e57e417c4de44360fa Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 16 May 2022 15:29:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=9F=A5=E8=AF=A2=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 34 ++++- .../xml/ParamsCollectManifestEOMapper.xml | 4 +- .../mapper/xml/ParamsConfigEOMapper.xml | 1 + .../xml/ParamsConfigHistoryEOMapper.xml | 2 + .../IParamsCollectManifestEOService.java | 8 +- .../ParamsCollectManifestEOServiceImpl.java | 117 ++++++++++++++---- .../collect/vo/ParamsCollectManifestVO.java | 4 + 7 files changed, 137 insertions(+), 33 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index e6841442e..62008417e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -162,8 +162,8 @@ public class ParamsCollectManifestEOController extends JeroController> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) { - List sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO); + public Result>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) { + List> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO); return Result.OK(sdtList); } @@ -260,7 +260,7 @@ public class ParamsCollectManifestEOController extends JeroController updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) { boolean isSuccess = paramsCollectManifestEOService.updateDreBatch(paramsCollectManifestVO); @@ -290,13 +290,13 @@ public class ParamsCollectManifestEOController extends JeroController getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) { List> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO); @@ -321,6 +321,28 @@ public class ParamsCollectManifestEOController extends JeroController referParams(ParamsCollectManifestVO paramsCollectManifestVO) { + boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO); + if (isSuccess) { + return Result.OK("引用参数成功！"); + } else { + return Result.error("引用参数失败！"); + } + } + + + + + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 1918e78d7..5edd61fb9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -26,7 +26,6 @@ - @@ -60,6 +59,9 @@ AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) AND state != '1' + + AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml index 3ac473775..79daab23f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml @@ -15,6 +15,7 @@ + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml index 876924247..0bdd5f83b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml @@ -14,5 +14,7 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 5f5505e9d..75021bbe6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; -import com.jero.modules.system.entity.SysUser; import java.util.List; import java.util.Map; @@ -88,7 +87,7 @@ public interface IParamsCollectManifestEOService extends IService getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO); - List querySdtList(ParamsCollectManifestVO paramsCollectManifestVO); + List> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO); String getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO); @@ -112,9 +111,12 @@ public interface IParamsCollectManifestEOService extends IService> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO); // 冻结配置 boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO); + + // 引用参数 + boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 6b5aae253..e10ef5555 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -8,6 +8,7 @@ import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; @@ -203,16 +204,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) { String paramsManifestId = paramsCollectManifestEO.getParamsManifestId(); -// String userTypes = paramsCollectManifestEO.getUserTypes(); -// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户 -// if ("sdt".equals(userTypes)) { -// paramsCollectManifestEO.setSdt(loginUser.getUsername()); -// } else if ("dre".equals(userTypes)) { -// paramsCollectManifestEO.setDre(loginUser.getUsername()); -// } else if ("sdt,dre".equals(userTypes)) { -// paramsCollectManifestEO.setSdt(loginUser.getUsername()); -// paramsCollectManifestEO.setDre(loginUser.getUsername()); -// } + String userTypes = paramsCollectManifestEO.getUserTypes(); + if (StringUtils.isBlank(userTypes)) { + throw new JeroBootException("用户类型参数不能为空！"); + } + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户 + if ("sdt".equals(userTypes)) { + paramsCollectManifestEO.setSdt(loginUser.getUsername()); + } else if ("dre".equals(userTypes)) { + paramsCollectManifestEO.setDre(loginUser.getUsername()); + } else if ("sdt,dre".equals(userTypes)) { + paramsCollectManifestEO.setSdt(loginUser.getUsername()); + paramsCollectManifestEO.setDre(loginUser.getUsername()); + } else if ("guest".equals(userTypes)) { + paramsCollectManifestEO.setSdt(loginUser.getUsername()); + paramsCollectManifestEO.setDre(loginUser.getUsername()); + } List list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 @@ -230,7 +237,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { // 参数收集清单 // 处理数据字典字段 中英文切换 认证类型，责任领域 List certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(",")); - List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(",")); + List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(",")); // 单选 String certCategoryName = ""; String dutyTerritoryName = ""; if (CutEnum.CN.getValue().equals(cut)) { @@ -284,6 +291,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl sdtMap = new HashMap<>(); + sdtMap.put("controlType", controlType); + sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ",")); + sdtMap.put("dataValue", collectManifestEO.getSdt()); + manifestMap.put("sdt", sdtMap); + listMap.add(manifestMap); }); @@ -645,15 +659,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) { - List sdtList = new ArrayList<>(); + public List> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) { + List> sdtList = new ArrayList<>(); ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsCollectManifestVO.getProjectId(), paramsCollectManifestVO.getDutyTerritory()); if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) { - String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson(); - if (StringUtils.isNotBlank(sdtId)) { - SysUser sysUser = sysUserService.getById(sdtId); - if (ObjectUtil.isNotEmpty(sysUser)) { - sdtList.add(sysUser); + String sdtIds = projectRelatedPersonnel.getEngineeringInterfacePerson(); + if (StringUtils.isNotBlank(sdtIds)) { + String[] sdtIdStr = sdtIds.split(","); + for (int i=0; i userMap = new HashMap<>(); + userMap.put("label", sysUser.getUsername()); + userMap.put("value", sysUser.getUsername()); + sdtList.add(userMap); + } } } } @@ -929,11 +949,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO) { String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + String configFlag = paramsCollectManifestVO.getConfigFlag(); - // 查询未冻结配置列 + // 查询配置列 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); - queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.NO.getValue()); + + if ("2".equals(configFlag)) { // 指定查询非冻结配置 + queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.NO.getValue()); + } + queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); List paramsConfigEOList = paramsConfigEOService.list(queryWrapper); @@ -952,19 +977,65 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigIdList = Arrays.asList(paramsConfigIds.split(",")); List updateConfigEOList = new ArrayList<>(); - for (int i=0; i paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); + paramsConfigEOList = paramsConfigEOList.stream().filter(e-> !paramsConfigIdList.contains(e.getId())).collect(Collectors.toList()); + paramsConfigEOList.forEach(paramsConfigEO -> { + if (ConfigLockEnum.YES.getValue().equals(paramsConfigEO.getIsLock())) { + ParamsConfigEO updateConfigEO = new ParamsConfigEO(); + updateConfigEO.setId(paramsConfigEO.getId()); + updateConfigEO.setIsLock(ConfigLockEnum.NO.getValue()); + updateConfigEOList.add(updateConfigEO); + } + }); + + // 冻结选择的配置列 + for (String paramsConfigId : paramsConfigIdList) { ParamsConfigEO updateConfigEO = new ParamsConfigEO(); - updateConfigEO.setId(paramsConfigIdStr[i]); + updateConfigEO.setId(paramsConfigId); updateConfigEO.setIsLock(ConfigLockEnum.YES.getValue()); updateConfigEOList.add(updateConfigEO); } return paramsConfigEOService.updateBatchById(updateConfigEOList); } + @Override + public boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO) { + String paramsCollectManifestIds = paramsCollectManifestVO.getIds(); + String sourceConfigId = paramsCollectManifestVO.getSourceConfigId(); + String targetConfigIds = paramsCollectManifestVO.getTargetConfigIds(); + + if (targetConfigIds.contains(sourceConfigId)) { + throw new JeroBootException("引用到的配置不能包含被引用配置！"); + } + String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(","); + String[] targetConfigIdStr = targetConfigIds.split(","); + + ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.getById(sourceConfigId); + List updateConfigDataEOList = new ArrayList<>(); + for (int i=0; i Date: Mon, 16 May 2022 15:40:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug51957=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/enums/ProjectTaskPlanningNameEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 290039710..ac6da41f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,7 +4,7 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_END_TIME("认证结束"," Certification end\n"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), From 93717670590437d2667ed23eb1bceaba185721a7 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 16 May 2022 15:41:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"bug51957=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 02ad9c47902f62b1ee3a30c99dd797b6d2bdac5b. --- .../jero/modules/project/enums/ProjectTaskPlanningNameEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index ac6da41f0..290039710 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,7 +4,7 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), + PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_END_TIME("认证结束"," Certification end\n"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), From f7fe956cc7e8c648d58414abeddc925ce94895d1 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 16 May 2022 15:42:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug51957=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/ProjectTaskPlanningNameEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 290039710..02839a265 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,9 +4,9 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), - ATTESTATION_END_TIME("认证结束"," Certification end\n"), + ATTESTATION_END_TIME("认证结束"," Certification end"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), ;