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 a8bcc7f33..07e3d90c4 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 @@ -54,7 +54,7 @@ - AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7') + AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7','8') AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8') 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 3f055584b..0b4407b6f 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 @@ -102,6 +102,8 @@ public interface IParamsCollectManifestEOService extends IService> queryByManifestIdList(List manifestIdList); + // 退回 boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO); 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..eaa2b7af5 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 @@ -166,6 +166,18 @@ 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 +275,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 +340,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); @@ -1027,6 +1050,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> queryByManifestIdList(List manifestIdList){ + Map> map = new HashMap<>(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, manifestIdList); + List list = list(queryWrapper); + for (String manifestId : manifestIdList) { + List collectManifestEOList = list.stream().filter(e->manifestId.equals(e.getParamsManifestId())).collect(Collectors.toList()); + map.put(manifestId, collectManifestEOList); + } + return map; + } + @Override public boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO) { if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) { @@ -1490,7 +1527,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = isCollectFinished(paramsManifestId); + Boolean finish = (Boolean) map.get("finish"); + Date time = (Date) map.get("time"); + if (finish) { + // 更新清单状态和完成时间 + ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); + updateParamsManifestEO.setId(paramsManifestId); + updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue()); + updateParamsManifestEO.setFinishTime(time); + paramsManifestEOService.updateById(updateParamsManifestEO); + + } + + return isSuccess; } /** 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()); 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..08e7848b1 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 @@ -80,6 +80,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = rows.getRecords(); - paramsManifestEOList.forEach(manifestEO -> { - Map map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId()); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + List manifestIdList = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList()); + Map> manifestMap = paramsCollectManifestEOService.queryByManifestIdList(manifestIdList); + + paramsManifestEOList.forEach(manifestEO -> { + /*Map map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId()); Boolean finish = (Boolean) map.get("finish"); Date time = (Date) map.get("time"); if (finish) { @@ -304,8 +312,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl list) { + int number = (int) list.stream().filter(e->CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) + || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count(); + if (number == list.size() && list.size() > 0) { + return true; + } else { + return false; + } + } /** * 变更扩展 @@ -468,6 +484,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl 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); + } } 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/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; + } } 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); } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 864996229..5d3f89fe0 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', @@ -1063,4 +1064,5 @@ module.exports = { Templatenamelist: 'Template name - parameter item collection list', newNiONumber: 'Number', English: 'English', + requiredParametersEmpty:'Required parameters cannot be empty', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index be54f48e2..aa0add5a9 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: '技术领域', @@ -1067,4 +1068,5 @@ module.exports = { Templatenamelist: '模板名称-参数项收集清单', newNiONumber: 'NIO编号', English:'英文', + requiredParametersEmpty:'必填参数不能为空', } \ No newline at end of file diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 1c12046db..c6cd18823 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -1,7 +1,7 @@ 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 @@
- {{ (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.label}} diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 383d55a84..b138f5948 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/parameter/ParameterTemplate/components/addModel.vue b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue index ad6a8f8f0..4aa13444f 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue @@ -22,7 +22,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/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 526b3e8b5..3929a5a96 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -132,6 +132,7 @@ export default { rules: { paramsTemplateName:[ { required: true, message: this.$t('PleaseEnter')+this.$t('templateName'), trigger: 'change' }, + { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, ], }, visible: false, @@ -243,6 +244,7 @@ export default { }, hideModal(){ this.visible = false; + this.$refs['ruleForm'].resetFields() }, //批量删除 handleDel() { diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 594a1bc86..32995fb60 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 @@ @@ -229,20 +229,20 @@ - +
* {{$t('NNNiONumber')}} + :title="$t('ParameterNo')">{{$t('ParameterNo')}}
+ v-model.trim="item.paramsNumber" + :placeholder="$t('PleaseEnter')+$t('ParameterNo')"/>
@@ -255,7 +255,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' }, ], }, @@ -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,105 @@ 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 = [] - } + 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(',') + 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() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { @@ -540,13 +613,23 @@ 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 + this.$refs['ruleForm'].resetFields() }, handleSubmit() { if(this.formInline.certCategory == undefined) { 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) } }) }, 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..8a5ca15a8 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1,164 +1,175 @@ + \ No newline at end of file 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 ) { diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index c88c6a2de..db46275fa 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -17,8 +17,8 @@
* - {{$t('configurationName')}} + {{$t('configurationName')}}
* - {{$t('Model')}} + {{$t('Model')}}
* - {{$t('electricMachinery')}} + {{$t('electricMachinery')}}
- {{$t('addConfiguration')}} - {{$t('deleteConfiguration')}} + {{$t('addConfiguration')}} + + + {{$t('deleteConfiguration')}} + @@ -112,337 +115,340 @@ \ No newline at end of file