From 13cf7620d99f36d534790ffdc41c1d15c882b331 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 30 Jun 2022 15:02:46 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B=E5=AE=9A=E6=97=B6=E5=99=A8?= =?UTF-8?q?=EF=BC=9A=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4=E6=9C=AA=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=BB=A5=E5=8F=8A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/GatherResultEnum.java | 4 +- .../job/LawsOpinionGatherJob.java | 64 +++++++++++++++++++ .../feginClient/WorkFlowFeignClient.java | 2 + 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java index 777f4ed77..ef0721ab5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/GatherResultEnum.java @@ -8,8 +8,8 @@ import org.apache.commons.lang3.StringUtils; */ public enum GatherResultEnum { - UNDERWAY("进行中","underway","underway"), - COMPLETED("已完成","completed","completed"), + UNDERWAY("进行中","Underway","Underway"), + COMPLETED("已完成","Completed","Completed"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java new file mode 100644 index 000000000..64c64e77f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java @@ -0,0 +1,64 @@ +package com.jero.modules.lawsOpinionGather.job; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.jeecg.modules.jmreport.common.constant.CommonConstant; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 法规意见收集表 - 定时器 + * 作用：当前日期大于等于截止日志的时候，把该数据的收集结果，更新为已完成，同时把当前这条数据的所有待办任务提交 + */ +@Slf4j +public class LawsOpinionGatherJob implements Job { + + @Autowired + private ILawsOpinionGatherEOService lawsOpinionGatherEOService; + @Autowired + private WorkFlowFeignClient workFlowFeignClient; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + log.info("法规意见收集流程，定时任务开启 ====================================================="); + QueryWrapper lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>(); + lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue()); + List lawsOpinionGatherEOList = this.lawsOpinionGatherEOService.list(lawsOpinionGatherEOQueryWrapper); + if (CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)) { + Date currentDate = new Date(); + List updateLawsOpinionGatherEOList = lawsOpinionGatherEOList.stream().filter(e -> { + boolean flag = false; + if(currentDate.after(e.getEndTime())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(updateLawsOpinionGatherEOList)){ + List actiProcInstIdList = updateLawsOpinionGatherEOList.stream().map(LawsOpinionGatherEO::getActiProcInstId).distinct().collect(Collectors.toList()); + String actiProcInstIds = StringUtils.join(actiProcInstIdList,","); + //将这些流程实例下的待办任务提交 + Result result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds); + if(result.getCode().equals(CommonConstant.SC_OK_200)){ + updateLawsOpinionGatherEOList.forEach(lawsOpinionGatherEO -> { + lawsOpinionGatherEO.setGatherResult(GatherResultEnum.COMPLETED.getValue()); + }); + this.lawsOpinionGatherEOService.updateBatchById(updateLawsOpinionGatherEOList); + } + } + } + log.info("法规意见收集流程，定时任务开启 ====================================================="); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 54850b646..f6a1f8a0a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -135,4 +135,6 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/queryProcessHistoryByPrcId",method = RequestMethod.GET) List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); + @RequestMapping(value = "/bat-wkflow/task/completeTaskByPids",method = RequestMethod.GET) + Result completeTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); } From f292de72a7fe639a1133a4c5ab356e2e6f31fc38 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 30 Jun 2022 15:34:49 +0800 Subject: [PATCH 02/22] =?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-=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IParamsConfigDataEOService.java | 7 +++++++ .../IParamsConfigDataHistoryEOService.java | 10 ++++++++++ .../ParamsCollectManifestEOServiceImpl.java | 13 ++++++++++++- ...msCollectManifestHistoryEOServiceImpl.java | 18 +++++++++++++++--- .../impl/ParamsConfigDataEOServiceImpl.java | 16 ++++++++++++++++ .../ParamsConfigDataHistoryEOServiceImpl.java | 19 +++++++++++++++++++ .../impl/ParamsConfigEOServiceImpl.java | 6 ++++-- 7 files changed, 83 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java index 5bd56aa89..ed9ffbd67 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -62,4 +62,11 @@ public interface IParamsConfigDataEOService extends IService * @return */ List queryList(); + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + List queryListByConfigIdList(List configIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java index 84ff430f9..d7f6f1f41 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java @@ -1,8 +1,11 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; +import java.util.List; + /** * @Description: 参数配置数据历史版本 * @Author: jero-boot @@ -19,4 +22,11 @@ public interface IParamsConfigDataHistoryEOService extends IService queryListByConfigIdList(List configIdList); } 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 11947cd09..56bbc2800 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 @@ -217,6 +217,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataEOList) { + List configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList.get(0); + } + return null; + } + /** * 列表查询 * @@ -255,6 +263,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 // 普通数据字典 List dictItemList = new ArrayList<>(); @@ -318,7 +328,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { // 参数配置 Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 +// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index 3a31c4d3e..70c6b7e9a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -58,6 +58,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl paramsConfigDataEOList) { + List configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList.get(0); + } + return null; + } + /** * 列表查询 * @@ -69,6 +77,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 + // 普通数据字典 List dictItemList = new ArrayList<>(); @@ -132,8 +143,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl { // 参数配置 Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 +// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); @@ -166,7 +178,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataHistoryEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); String templateId = null; String templateName = null; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index 9e10c9da8..a25a7e355 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.collect.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; @@ -107,4 +108,19 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryList() { return list(); } + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + @Override + public List queryListByConfigIdList(List configIdList) { + if (CollectionUtil.isNotEmpty(configIdList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList); + return list(queryWrapper); + } + return null; + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java index 0a58d103f..08ac676f1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java @@ -1,12 +1,16 @@ package com.jero.modules.cert.collect.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper; import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 参数配置数据历史版本 * @Author: jero-boot @@ -31,4 +35,19 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl queryListByConfigIdList(List configIdList) { + if (CollectionUtil.isNotEmpty(configIdList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList); + return list(queryWrapper); + } + return null; + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java index 810363d77..c1410f477 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -107,9 +107,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl updateList = paramsCollectManifestEOList.stream() + .filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(updateList)) { List updateCollectManifestEOList = new ArrayList<>(); - paramsCollectManifestEOList.forEach(collectManifestEO -> { + updateList.forEach(collectManifestEO -> { ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); updateCollectManifestEO.setId(collectManifestEO.getId()); updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); From 32d0e0581ebfcba3603e0bbee24a0bbd8d1117d2 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 16:09:56 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E7=BC=96=E5=8F=B7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../src/views/parameter/parameterlist/components/addModel.vue | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 864996229..31adbbc6f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1028,6 +1028,7 @@ module.exports = { FNumber: 'Number', NNNiONumber: 'Number', NNiONumber: 'NIO Number', + ParameterNo: 'Number', NRequired: 'Is Must', NParameterName: 'Params Name', NtechnicalField: 'Technical Field', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index be54f48e2..16d90e5b3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1033,6 +1033,7 @@ module.exports = { FNumber: '账号', NNNiONumber: 'NIO编号', NNiONumber: 'NIO编号', + ParameterNo: '编号', NRequired: '是否必填', NParameterName: '参数名称', NtechnicalField: '技术领域', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 594a1bc86..10107d1b3 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -236,13 +236,13 @@
* {{$t('NNNiONumber')}} + :title="$t('ParameterNo')">{{$t('ParameterNo')}}
+ :placeholder="$t('PleaseEnter')+$t('ParameterNo')"/> From ace469130f1276eb58d530e88e2e38160ada3f7b Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 30 Jun 2022 17:04:56 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-bug55184?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsManifestEOServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 02261b799..c24cab3ee 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -304,8 +304,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Thu, 30 Jun 2022 17:13:40 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-bug55182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsTemplateEOController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index 198f7b38b..f98d03861 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.service.IParamsTemplateEOService; @@ -188,9 +189,14 @@ public class ParamsTemplateEOController extends JeroController copyById(@RequestParam(name="id") String id, - @RequestParam(name="paramsTemplateName") String paramsTemplateName) { + @RequestParam(name="paramsTemplateName") String paramsTemplateName, + @RequestParam(name="cut") String cut) { ParamsTemplateEO paramsTemplateEO = paramsTemplateEOService.copyById(id, paramsTemplateName); - return Result.OK("复制成功", paramsTemplateEO); + if (CutEnum.EN.getValue().equals(cut)) { + return Result.OK("Copy successful", paramsTemplateEO); + } else { + return Result.OK("复制成功", paramsTemplateEO); + } } From 312c47fc9038c7445766836db4cc2d4847922fa4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 30 Jun 2022 17:30:59 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 57 +-- .../dialog/ParameterTemplateAdd.vue | 420 +++++++++--------- 2 files changed, 248 insertions(+), 229 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 571641062..e6476fe42 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -1,7 +1,7 @@ @@ -139,7 +144,8 @@ { title: this.$t('collectionCompletionTime'), align: 'center', - dataIndex: 'finishTime' + dataIndex: 'finishTime', + scopedSlots: { customRender: 'collectionCompletionTime' } }, { title: this.$t('Version'), @@ -177,7 +183,7 @@ deleteAll: 'params/manifest/deleteBatch', conAdd: 'params/config/addBatch', conList: 'params/config/list', - changeExtension:'params/manifest/changeExtension', + changeExtension: 'params/manifest/changeExtension', verifyConfig: 'params/manifest/verifyConfig' }, loading: false, @@ -199,7 +205,7 @@ drawerVisible: false, drawerVisibleitem: false, titleTag: '', - selectedRowKeysvalArray: [], + selectedRowKeysvalArray: [] } }, mounted() { @@ -214,7 +220,7 @@ localStorage.setItem('paramsManifest', JSON.stringify(item)) let newUrl = _this.$router.resolve({ path: '/ParameterItemCollection', - query: item, + query: item }) window.open(newUrl.href, '_blank') } else { @@ -223,7 +229,7 @@ }) }, deleteLib(val) { - if(val.state === '已完成' || val.state === 'Finished' ) { + if (val.state === '已完成' || val.state === 'Finished') { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), @@ -252,9 +258,9 @@ }, // 配置 configure(item) { - this.itemId = item.id - this.itemRow = item - this.$refs.configureRef.addModel(item.id) + this.itemId = item.id + this.itemRow = item + this.$refs.configureRef.addModel(item.id) }, handleCancel(val) { this.areaVisible = val @@ -277,7 +283,7 @@ this.pageNo = 1 this.getlist() }, - onSelectChange(val,valArray) { + onSelectChange(val, valArray) { this.selectedRowKeys = val this.selectedRowKeysArray = val.join(',') this.selectedRowKeysvalArray = valArray @@ -286,7 +292,7 @@ this.areaVisible = true setTimeout(() => { this.$refs.templateRef.editData(edit) - },50) + }, 50) }, handleAdd() { this.areaVisible = true @@ -294,11 +300,11 @@ // 变更扩展 handleModule() { let _this = this - if(this.selectedRowKeys.length == 0){ + if (this.selectedRowKeys.length == 0) { this.$message.warning(_this.$t('pleaseSelectData')) - }else if(this.selectedRowKeys.length > 1){ + } else if (this.selectedRowKeys.length > 1) { this.$message.warning(_this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeysvalArray[0].state === '已完成'|| this.selectedRowKeysvalArray[0].state ==='Finished'){ + } else if (this.selectedRowKeysvalArray[0].state === '已完成' || this.selectedRowKeysvalArray[0].state === 'Finished') { getAction(_this.url.changeExtension, { id: this.selectedRowKeys[0] }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -316,11 +322,11 @@ // 默认为0 可全部删除 let flag = 1 this.selectedRowKeysvalArray.forEach((item) => { - if(item.state !== '已完成' && val.state !== 'Finished' ){ - flag = 0 + if (item.state !== '已完成' && val.state !== 'Finished') { + flag = 0 } }) - if(flag) { + if (flag) { let param = { ids: this.selectedRowKeysArray } @@ -501,8 +507,9 @@ cursor: pointer; border-radius: 4px; } - /deep/.add-padding{ - margin-left: -89px!important; + + /deep/ .add-padding { + margin-left: -89px !important; } + \ No newline at end of file From 2d32bcfb3c4c4f774ecaff75eb3d52c522344735 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 17:36:59 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/dialog/ProjectCollectionParameters.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index 8b4388419..3abd7c09a 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -174,7 +174,7 @@ export default { methods: { // 清单列表传出数据 listVisibleRow(val) { - this.selectedRowKeys = [] + // this.selectedRowKeys = [] let newAreaTable=JSON.parse(JSON.stringify(this.areaTable)) newAreaTable.forEach((item, index) => { if( item.id == this.listVisibleRowDate.id ) { From 6f92f27aec4385d7c3a50452ac58a4e4334c8367 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Jun 2022 18:07:37 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 117 ++++++++++++++---- .../views/parameter/parameterlist/index.vue | 2 +- 2 files changed, 91 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 594a1bc86..726cbd3c5 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -229,7 +229,7 @@ - +
@@ -398,6 +398,7 @@ export default { disabled: false, projectNameList: [], title: '', + cut:'', stateOne: '', contentList : [], contentListed: [], // 编辑 contentList 所带出来的数据 @@ -411,6 +412,14 @@ export default { mounted() { this.getNameList() this.getSysCategoryTree() + let long = localStorage.getItem('language') + this.cut = '' + if (long && long == 'zh-cn') { + this.cut = 'cn' + } else if (long && long == 'en-us') { + this.cut = 'en' + } + console.log(this.cut) }, methods: { getcontentListedEdit() { @@ -427,6 +436,7 @@ export default { tt.push(Object.assign(obj,item)) }) this.contentListStart = tt + console.log(this.contentListStart) } }) }, @@ -455,42 +465,86 @@ export default { Onchangelabel(val) { let _tt = [] if(this.flag == 1) { - this.contentListStart.forEach((itemVal) => { - val.forEach((item) => { - if(itemVal.value === item.value) { - _tt.push(itemVal) - } + if(this.cut == 'cn'){ + this.contentListStart.forEach((itemVal) => { + val.forEach((item) => { + if(itemVal.value === item.value) { + itemVal.cut = 'cn' + _tt.push(itemVal) + } + }) }) - }) + }else { + this.contentListStart.forEach((itemVal) => { + val.forEach((item) => { + if(itemVal.value === item.value) { + itemVal.cut = 'en' + _tt.push(itemVal) + } + }) + }) + } + this.contentList = _tt + } else { let _mm = [] - this.contentListStart.forEach((itemVal) => { - val.forEach((item) => { - if(itemVal.value === item.value) { - _mm.push(itemVal) - } + if(this.cut == 'cn'){ + this.contentListStart.forEach((itemVal) => { + val.forEach((item) => { + if(itemVal.value === item.value) { + itemVal.cut = 'cn' + _mm.push(itemVal) + } + }) }) - }) - _mm.forEach((item) => { - this.contentListed.forEach((itemVal) => { - // 原编辑的数据 - if(itemVal.certCategory === item.value) { + _mm.forEach((item) => { + this.contentListed.forEach((itemVal) => { + // 原编辑的数据 + if(itemVal.certCategory === item.value) { item.textVal= itemVal.textVal, - item.certCategory= itemVal.certCategory, - item.paramsNumber= itemVal.paramsNumber, // 编号 - item.paramsName= itemVal.paramsName, //参数名称 - item.description= itemVal.description // 描述 - } + item.certCategory= itemVal.certCategory, + item.paramsNumber= itemVal.paramsNumber, // 编号 + item.paramsName= itemVal.paramsName, //参数名称 + item.cut= itemVal.cut, //中英文标识 + item.description= itemVal.description // 描述 + } + }) }) - }) + }else { + this.contentListStart.forEach((itemVal) => { + val.forEach((item) => { + if(itemVal.value === item.value) { + itemVal.cut = 'en' + _mm.push(itemVal) + } + }) + }) + _mm.forEach((item) => { + this.contentListed.forEach((itemVal) => { + // 原编辑的数据 + if(itemVal.certCategory === item.value) { + item.textVal= itemVal.textVal, + item.certCategory= itemVal.certCategory, + item.paramsNumber= itemVal.paramsNumber, // 编号 + item.paramsName= itemVal.paramsName, //参数名称 + item.cut= itemVal.cut, //中英文标识 + item.description= itemVal.description // 描述 + } + }) + }) + } this.contentList = _mm + console.log(this.contentList) } }, Onchange(val) { - if(this.formInline.certCategory == '') { - this.contentList = [] + console.log(this.formInline) + if(this.formInline.certCategory == '' && this.flag == 1) { + console.log(1111) + this.contentList= [] } + }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { @@ -540,10 +594,19 @@ export default { // 获取认证类别 this.getcontentListedEdit() value.certCategoryParamsInfoEOList.map((item, index) => { - item.textVal = item.certCategory_dictText - this.contentListed.push(item) + if(this.cut == 'cn'){ + item.cut = 'cn' + this.contentListed.push(item) + item.text = item.certCategory_dictText + }else { + item.cut = 'en' + this.contentListed.push(item) + item.textEn = item.certCategory_dictText + } + }) this.contentList = this.contentListed + console.log(this.contentList) }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index c20d72b9e..f1a41648e 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -229,7 +229,7 @@ export default { if (res.success) { this.$message.success(res.result) } else { - this.$message.warning(res.result) + this.$message.warning(res.message) } }) }, From 36bbf0c0fa5e64ec15595941f9460d82113fd02d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Jun 2022 19:10:14 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E7=90=86=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/dict/JMultiSelectTagOnlyRz.vue | 2 +- .../parameterlist/components/addModel.vue | 30 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue b/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue index b09a3a9cb..5229d68f5 100644 --- a/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue +++ b/jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue @@ -2,7 +2,7 @@ - {{ (item.text && item.text.length > 6 ? item.text.slice(0, 5) + '...' : item.text) || (item.label && item.label.length > 6 ? item.label.slice(0, 5) + '...' : item.label) }} + {{ (item.text && item.text.length > 6 ? item.text.slice(0, 14) + '...' : item.text) || (item.label && item.label.length > 6 ? item.label.slice(0, 14) + '...' : item.label) }} diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index ad79dd65c..5c1c8ec40 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -539,11 +539,31 @@ export default { } }, Onchange(val) { - console.log(this.formInline) - if(this.formInline.certCategory == '' && this.flag == 1) { - console.log(1111) - this.contentList= [] - } + let tabList = [] + let arr = [] + let newArray = [] + this.arr = [] + this.contentListStart.forEach((item,index) => { + this.arr.push(item.certCategory) + }) + console.log(this.arr) + this.tabList = val.split(',') + console.log(this.tabList) + this.arr.forEach(item => { + if (!this.tabList.includes(item)) { + newArray.push(item); + this.contentList.forEach((item1,index1) => { + if(item == item1.certCategory){ + item1.paramsNumber= '', // 编号 + item1.paramsName= '', //参数名称 + item1.description= '' // 描述 + } + }) + }; + + }) + + }, getSysCategoryTree() { From b85308bfc8e3fcbf7d3e077607588d72158588d2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 30 Jun 2022 19:26:43 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterLibraryAdd/index.vue | 1 + .../src/components/tableCollection/index.vue | 2 +- .../ParameterTemplate/components/addModel.vue | 4 +- .../parameterlist/components/addModel.vue | 16 +- .../ParameterItemCollection/index.vue | 262 --- .../ParameterItemCollectionList.vue | 1928 +++++++++-------- .../components/TaskParameterCollection.vue | 3 +- .../projectManagement/dialog/configure.vue | 616 +++--- 8 files changed, 1331 insertions(+), 1501 deletions(-) delete mode 100644 jero-web/src/views/projectManagement/ParameterItemCollection/index.vue diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index 7c92dfe48..80c226ea3 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -2,6 +2,7 @@
@@ -87,7 +87,7 @@ export default { visible: false, rules: { paramsTemplateName:[ - { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' }, { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, ], description:[ diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 5c1c8ec40..eb51bb29e 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -22,7 +22,7 @@
@@ -55,7 +55,7 @@ @@ -127,7 +127,7 @@ style='height: 95px; width: 100%' type="textarea" :disabled="disabled" - v-model="formInline.description" + v-model.trim="formInline.description" :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/> @@ -204,7 +204,7 @@ @@ -349,12 +349,12 @@ export default { visible: false, rules: { nioNumber:[ - { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, { pattern: /^[0-9a-zA-Z-]{1,}$/, message: this.$t('onlyThree'), - trigger: 'change' + trigger: 'blur' } ], certCategory: [ @@ -364,7 +364,7 @@ export default { { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' }, ], paramsName: [ - { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'change' }, + { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' }, { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' }, ], technologyTerritory: [ @@ -386,7 +386,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('controlVerification'), trigger: 'change' }, ], controlValues: [ - { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' }, { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' }, ], }, diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue deleted file mode 100644 index b43b77d8c..000000000 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ce51d31e5..35767d708 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1,161 +1,172 @@ \ No newline at end of file From 79c64d3f8785833daeb3dc39bc0b5129f335a6d2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 30 Jun 2022 19:55:56 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 65 +++++++++++-------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 9a6f0ca00..21f1d508d 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -1,22 +1,24 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index b0badbc4e..bb640dbd3 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -796,7 +796,7 @@ this.currentPersonRole = val.length >= 1 ? val[0].value : '' } this.RoleType = val - this.formInlineRoleSwitching.roleSwitchingCode = JSON.parse(localStorage.getItem('currentPersonRole')) === null ? this.currentPersonRole : JSON.parse(localStorage.getItem('currentPersonRole')) + this.formInlineRoleSwitching.roleSwitchingCode = val[0].value this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } }, // 表格所选中得行内容 @@ -969,27 +969,33 @@ ishandleSubmit() { let _this = this let postDate = [] - console.log(this.selectedRowKeysValue) - this.selectedRowKeysValue.forEach((item, index) => { + for (let i = 0; i < this.selectedRowKeysValue.length; i++) { let postDateobj = {} - Object.keys(item).forEach((itemIn, index) => { - if (itemIn !== 'sdt') { - if (item[itemIn] instanceof Object && !(item[itemIn] instanceof Array)) { - postDateobj[itemIn] = item[itemIn] - item[itemIn].list.forEach((item, index) => { - if (item.type == 'pull_more') { - item.dataValue = item.dataValue.join(',') + let itemIn = Object.keys(this.selectedRowKeysValue[i]) + for (let j = 0; j < itemIn.length; j++) { + if (itemIn[j] !== 'sdt') { + if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]] + for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') } - if (item.type == 'text' && item.dataValue !== null) { - item.dataValue = item.dataValue.toString() + if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() } - }) + if (!this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && this.selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' + && this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { + this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) + return + } + } } } - }) - postDateobj.id = item.id + } + postDateobj.id = this.selectedRowKeysValue[i].id postDate.push(postDateobj) - }) + } + let configDataList = { configDataList: postDate } if (this.selectedRowKeys.length == 0) { this.$message.warning(this.$t('selectLeastOne')) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index b6e124509..74218183e 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -49,16 +49,18 @@ :dataSource='dataSource' :pagination='false' :loading='loading' - :scroll="{x: 600}" + :scroll="{x: '100%',y:'calc(100vh - 320px)'}" :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> - + {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }} - {{record.finishTime ? record.finishTime : '-'}} + + {{record.finishTime ? record.finishTime : '-'}} + {{$t('configure')}} @@ -129,43 +131,50 @@ title: this.$t('title'), align: 'center', dataIndex: 'title', + width: 240, scopedSlots: { customRender: 'paramsManifestClick' } }, { title: this.$t('status'), align: 'center', width: 80, + ellipsis: true, dataIndex: 'state' }, { title: this.$t('parameterTemplateName'), align: 'center', width: 180, + ellipsis: true, dataIndex: 'paramsTemplateName' }, { title: this.$t('collectionCompletionTime'), align: 'center', dataIndex: 'finishTime', - width: 130, + width: 160, + ellipsis: true, scopedSlots: { customRender: 'collectionCompletionTime' } }, { title: this.$t('Version'), align: 'center', width: 50, + ellipsis: true, dataIndex: 'version' }, { title: this.$t('creator'), align: 'center', width: 110, + ellipsis: true, dataIndex: 'createBy' }, { title: this.$t('createTime'), align: 'center', width: 160, + ellipsis: true, dataIndex: 'createTime' }, { @@ -517,6 +526,19 @@ /deep/ .add-padding { margin-left: -89px !important; } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 4f2b96002..b138f5948 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -47,7 +47,8 @@ - + { if (res.success) { this.getTableList(res.result[0].value) - this.$emit('LoginUserType', res.result,this.currentPersonRole) + this.$emit('LoginUserType', res.result, this.currentPersonRole) } }) }, @@ -481,7 +487,7 @@ } }) }, - cancleoperationFailed(){ + cancleoperationFailed() { this.selectedRowKeys = [] }, getTableList(currentPersonRole) { @@ -671,6 +677,7 @@ .resize-table-th { position: relative; } + .table-draggable-handle { /* width: 10px !important; */ height: 100% !important; @@ -683,4 +690,10 @@ transform: none !important; bottom: 0; } + .rowClassRed{ + background: #f3d9de; + } + .rowClassRedYellow{ + background: yellow; + } From a29194c89494db548775a54d1dd336c9040dd3bd Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 13:51:53 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 20b926bd8..8a5ca15a8 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -348,6 +348,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -428,6 +429,7 @@ } ], selectedRowKeys: [], + textLoading: false, formInline: {}, url: { tableHeader: 'params/collectManifest/getHeader', @@ -821,6 +823,7 @@ let _this = this let paramsConfig = this.Dateline.paramsConfig === undefined ? '' : this.Dateline.paramsConfig.join(',') let param = { paramsManifestId: this.paramsManifest.id, paramsConfigIds: paramsConfig } + this.textLoading = true axios({ url: '/jero-boot/params/collectManifest/lockConfigColumn', method: 'post', @@ -839,14 +842,17 @@ }) .then((res) => { if (res.data.success) { + this.textLoading = false _this.$message.success(res.data.result) this.areaVisibleFreeze = false this.$refs.CollectionTabel.getTableList() } else { + this.textLoading = false _this.$message.warning(res.data.result) } }) .catch((error) => { + this.textLoading = false }) }, // 冻结配置取消 @@ -897,6 +903,7 @@ }, // 下发收集---请求接口 distributionAndCollection() { + let _array = [] this.selectedRowKeysValue.forEach((item, index) => { _array.push(item.id) @@ -907,6 +914,7 @@ projectId: this.$route.query.projectId, ids: _array.join(',') } + this.textLoading = true axios({ url: '/jero-boot/params/collectManifest/issueCollection', method: 'post', @@ -927,12 +935,15 @@ if (res.data.success) { _this.$message.success(this.$t('OperationSuccessful')) _this.areaVisible = false + this.textLoading = false _this.GetgetTableList() } else { + this.textLoading = false _this.$message.warning(this.$t('operationFailed')) } }) .catch((error) => { + this.textLoading = false }) }, // 同步上报库 权限 From 5f082ef210375b0223501477a7c0acf5e3206321 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 1 Jul 2022 14:09:50 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onthlyReportTitleTemplateEOController.java | 18 ++- .../LawsMonthlyReportTitleTemplateEO.java | 26 +++-- ...LawsMonthlyReportTitleTemplateEOMapper.xml | 1 + ...wsMonthlyReportTitleTemplateEOService.java | 19 +++- ...nthlyReportTitleTemplateEOServiceImpl.java | 105 +++++++++++++++++- 5 files changed, 155 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index 55495b7ba..57cf0fd29 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -53,8 +53,9 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = lawsMonthlyReportTitleTemplateEOService.page(page, queryWrapper); +// Page page = new Page(pageNo, pageSize); +// IPage pageList = lawsMonthlyReportTitleTemplateEOService.page(page, queryWrapper); + IPage pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(pageNo,pageSize, queryWrapper); return Result.OK(pageList); } @@ -167,4 +168,17 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController> OneMenuList() { + List list = lawsMonthlyReportTitleTemplateEOService.OneMenuList(); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java index 2d7084e0c..af530b5e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -1,21 +1,21 @@ package com.jero.modules.report.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** @@ -76,4 +76,14 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable { @ApiModelProperty(value = "英文标题") private java.lang.String titleEn; + @TableField(exist = false) + private List children = new ArrayList<>(); + + //标识(上移-->0,下移-->1) + @TableField(exist = false) + private String flag; + + //排序 + private int sort; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml index 5ce76fae5..c96150e0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportTitleTemplateEOMapper.xml @@ -11,5 +11,6 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java index 63b28c44f..b0272fd65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java @@ -1,7 +1,10 @@ package com.jero.modules.report.service; -import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; + import java.util.List; /** @@ -58,4 +61,18 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService queryList(); + + /** + * 分页 + * @param pageNo + * @param pageSize + * @param queryWrapper + * @return + */ + IPage getPageInfo(Integer pageNo,Integer pageSize, QueryWrapper queryWrapper); + + /** + * 以及菜单 + */ + List OneMenuList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index e0509e457..8efdd7896 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -1,12 +1,22 @@ package com.jero.modules.report.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; +import com.jero.modules.system.util.StringUtils; import org.springframework.stereotype.Service; -import java.util.List; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import java.util.stream.Collectors; /** * @Description: 月报标题模板 @@ -25,7 +35,29 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = this.list(); + List parent = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + List children = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); + int sort = 0; + if(StringUtils.isBlank(lawsMonthlyReportTitleTemplateEO.getParentId())){ + if(parent.size() == 0){ + lawsMonthlyReportTitleTemplateEO.setSort(0); + }else{ + List sortList = parent.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList()); + Collections.sort(sortList); + sort = sortList.get(sortList.size()-1) + 1; + } + }else{ + if(children.size() == 0){ + lawsMonthlyReportTitleTemplateEO.setSort(0); + }else{ + List sortList = parent.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList()); + Collections.sort(sortList); + sort = sortList.get(sortList.size()-1) + 1; + } + } + lawsMonthlyReportTitleTemplateEO.setSort(sort); + Date now = new Date(); lawsMonthlyReportTitleTemplateEO.setCreateTime(now); lawsMonthlyReportTitleTemplateEO.setUpdateTime(now); save(lawsMonthlyReportTitleTemplateEO); @@ -86,4 +118,71 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public IPage getPageInfo( Integer pageNo,Integer pageSize,QueryWrapper queryWrapper) { + List lawsMonthlyReportTitleTemplateEOS = this.list(); + List parentList = lawsMonthlyReportTitleTemplateEOS.stream() + .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + Collections.sort(parentList, new Comparator() { + @Override + public int compare(LawsMonthlyReportTitleTemplateEO p1, LawsMonthlyReportTitleTemplateEO p2) { + return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort())); + } + }); + + for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : parentList) { + List children = lawsMonthlyReportTitleTemplateEOS.stream() + .filter(e -> lawsMonthlyReportTitleTemplateEO.getId().equals(e.getParentId())).collect(Collectors.toList()); + if(children.size() != 0){ + Collections.sort(children, new Comparator() { + @Override + public int compare(LawsMonthlyReportTitleTemplateEO p1, LawsMonthlyReportTitleTemplateEO p2) { + return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort())); + } + }); + lawsMonthlyReportTitleTemplateEO.setChildren(children); + } + } + Page pages = getPages(pageNo, pageSize, parentList); + return pages; + } + + /** + * 以及菜单 + * @return + */ + @Override + public List OneMenuList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.isNull(LawsMonthlyReportTitleTemplateEO::getParentId); + return this.list(wrapper); + } + + public Page getPages(Integer currentPage, Integer pageSize, List list){ + Page page =new Page(); + if(list==null){ + return null; + } + int size = list.size(); + if(pageSize > size){ + pageSize = size; + } + if(pageSize!=0){ + //求出最⼤页数，防⽌currentPage越界 + int maxPage = size % pageSize ==0? size / pageSize : size / pageSize +1; + if(currentPage > maxPage){ + currentPage = maxPage; + } + } + //当前页第⼀条数据的下标 + int curIdx = currentPage >1?(currentPage -1)* pageSize :0; + List pageList =new ArrayList(); + //将当前页的数据放进pageList + for(int i =0; i < pageSize && curIdx + i < size; i++){ + pageList.add(list.get(curIdx + i)); + } + page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList); + return page; + } }