From f26479cce163cbd313a3c045016fcacbb7ac158a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 8 Mar 2023 09:33:05 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=BF=9B=E5=BA=A6=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=82=E5=A4=84=E7=90=86SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 8 +++++- .../enums/EvaluationTypeEnum.java | 8 +++--- .../ProjectCertificationInventoryEO.java | 8 ++++++ ...ctCertificationInventoryEOServiceImpl.java | 26 +++++++++++++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index de2244b1d..167801aa3 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -293,4 +293,10 @@ ALTER TABLE `project_library_role_rel` ADD COLUMN `model_type` varchar(64) NULL COMMENT '模块类型，对应系统中枚举类 RoleRelModelTypeEnum ' AFTER `role_code`; -- 初始化历史数据 -update project_library_role_rel set model_type = 'Laws inventory' +update project_library_role_rel set model_type = 'Laws inventory'; + +-- 项目库-认证清单表-增加认证进度备注 2023-03-08 未同步生产环境 +ALTER TABLE `project_certification_inventory` + ADD COLUMN `certification_progress_remark` varchar(2000) NULL COMMENT '认证进度备注' AFTER `certification_progress`; +-- 将之前的任务清单-认证进度，修改为 认证清单-认证进度 2023-03-08 未同步生产环境 +UPDATE `sys_dict` SET `dict_name` = '认证清单-认证进度', `description` = '认证清单-认证进度' WHERE `id` = '1524311122804346881'; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java index 06d9043c6..e2e40a670 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java @@ -37,12 +37,12 @@ public enum EvaluationTypeEnum { public static String getTextByValue(String value,String cut) { EvaluationTypeEnum[] values = values(); - for (EvaluationTypeEnum certificationProgressEnum : values) { - if (certificationProgressEnum.value.equals(value)) { + for (EvaluationTypeEnum evaluationTypeEnum : values) { + if (evaluationTypeEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return certificationProgressEnum.name; + return evaluationTypeEnum.name; }else { - return certificationProgressEnum.value; + return evaluationTypeEnum.value; } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index 2a34dc9c2..9242934e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -174,6 +174,14 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "认证进度") private java.lang.String certificationProgress; + /**认证进度展示名称**/ + @TableField(exist = false) + private String certificationProgress_dictText; + + @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + /**项目库id*/ @ApiModelProperty(value = "项目库id") private String projectLibraryId; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 76c7e1e0d..8d8323785 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -209,6 +209,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl categoryList = this.sysCategoryService.list(); List sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + List certificationProgress = this.sysDictItemServiceImpl.selectItemsByDictCode("certification_progress"); List userIdList = new ArrayList<>(); @@ -248,6 +249,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl collect = certificationProgress.stream() + .filter(dict -> StringUtils.equals(dict.getItemValue(), data.getCertificationProgress())) + .collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(collect)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + certificationProgress_dictText = collect.get(0).getItemText(); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + certificationProgress_dictText = collect.get(0).getEnName(); + } + } + data.setCertificationProgress_dictText(certificationProgress_dictText); + } } } } @@ -619,6 +634,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl submitTask(JSONObject json) { + if (!json.containsKey("nodeKey")) { + throw new JeroBootException("nodeKey不能为空，请联系管理员！"); + } + String nodeKey = json.getString("nodeKey"); CertificationFlowNodeEnum flowNodeEnum = CertificationFlowNodeEnum.getEnumByKey(nodeKey); @@ -626,6 +645,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Wed, 8 Mar 2023 09:46:48 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationInventoryEOController.java | 7 +++++++ .../service/IProjectCertificationInventoryEOService.java | 7 +++++++ .../impl/ProjectCertificationInventoryEOServiceImpl.java | 9 +++++++++ 3 files changed, 23 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index dadbccd26..57396b6fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -213,4 +213,11 @@ public class ProjectCertificationInventoryEOController extends JeroController submitTask(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.submitTask(json); } + + @AutoLog(value = "项目库-认证清单表-批量保存") + @ApiOperation(value="项目库-认证清单表-批量保存", notes="项目库-认证清单表-批量保存") + @PostMapping(value = "/saveBatch") + public Result saveBatch(@RequestBody List projectCertificationInventoryEOList) { + return this.projectCertificationInventoryEOService.saveBatch(projectCertificationInventoryEOList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index c0c51c178..ff2340860 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -128,4 +128,11 @@ public interface IProjectCertificationInventoryEOService extends IService certificationInitiatingTask(JSONObject json); + + /** + * 批量保存 + * @param projectCertificationInventoryEOList + * @return + */ + Result saveBatch(List projectCertificationInventoryEOList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 8d8323785..370ef55f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -715,4 +715,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveBatch(List projectCertificationInventoryEOList) { + if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){ + throw new JeroBootException("无法获取需要保存的数据，请检查！"); + } + this.updateBatchById(projectCertificationInventoryEOList); + return Result.OK("保存成功！"); + } + } From 5807ffeb7bff4b164d080fd7fd0c37139ef297ab Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 8 Mar 2023 11:20:55 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E9=9B=86=E6=88=90=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B=EF=BC=88?= =?UTF-8?q?Pre-Homo=E6=B5=81=E7=A8=8B=EF=BC=89=E3=80=82=20=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOService.java | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 121 ++++++++++++++++-- .../mapper/xml/ProcessInfoEOMapper.xml | 5 +- .../impl/ProcessInfoEOServiceImpl.java | 30 +++-- 4 files changed, 135 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index ff2340860..6a2bed01d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -102,7 +102,7 @@ public interface IProjectCertificationInventoryEOService extends IService processInfoDetailEOList, ProcessInfoEO processInfoEO); + void addProcessInfoDetailEO(List processInfoDetailEOList, String processInfoId, String taskDefinitionKey); Result> getRoleByUserId(Map params); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 370ef55f1..1d9bbca81 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -342,12 +342,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl deleteDetailWrap = new QueryWrapper<>(); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId()); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + this.processInfoDetailEOService.remove(deleteDetailWrap); + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); this.updateBatchById(projectCertificationInventoryEOList); return Result.OK("发布成功！"); } @@ -366,6 +374,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl deleteWrap = new QueryWrapper<>(); deleteWrap.lambda().eq(ProcessInfoEO::getId,projectLibraryId); this.processInfoEOService.remove(deleteWrap); @@ -375,19 +386,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList,ProcessInfoEO processInfoEO){ + public void addProcessInfoDetailEO(List processInfoDetailEOList,String processInfoId,String taskDefinitionKey){ processInfoDetailEOList.forEach(detail -> { + detail.setActiProcInstId(processInfoId); + detail.setProcessInfoId(processInfoId); detail.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); + detail.setTaskDefinitionKey(taskDefinitionKey); + detail.setStatus(TaskStatusEnum.NOT_DONE.getValue()); +// detail.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get())); + detail.setCreateTime(new Date()); + detail.setStatus(TaskStatusEnum.NOT_DONE.getValue()); }); - // 删除该项目数据的待办任务，key为 认证工程师接受任务的数据 - QueryWrapper deleteDetailWrap = new QueryWrapper<>(); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId()); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); - this.processInfoDetailEOService.remove(deleteDetailWrap); + List userIdList = processInfoDetailEOList.stream().map(ProcessInfoDetailEO::getUserId).distinct().collect(Collectors.toList()); + QueryWrapper removeWrap = new QueryWrapper<>(); + removeWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId); + removeWrap.lambda().in(ProcessInfoDetailEO::getUserId,userIdList); + // 删除用户在这个认证清单流程中其它的待办任务 + this.processInfoDetailEOService.remove(removeWrap); + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); } @@ -650,14 +670,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationReturnedStudioTask(JSONObject json) { + String ids = json.getString("ids"); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("至少选择一条数据进行操作！"); + } + List idList = Arrays.asList(ids.split(",")); + List flowStatusList = new ArrayList<>(); + flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + flowStatusList.add(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,idList); + queryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); + List projectCertificationInventoryEOList = this.list(queryWrapper); + + if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){ + throw new JeroBootException("至少选择一条数据流程状态为'清单待校核 或 责任人拒绝的数据'！"); + } + + ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); + if (StringUtils.isEmpty(projectLibraryBase.getStudioEngineer())) { + throw new JeroBootException("该项目的studio为空，请维护studio后再进行退回操作！"); + } + + // 给studio分配待办中心任务 + List processInfoDetailEOList = new ArrayList<>(); + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(projectLibraryBase.getStudioEngineer()); + processInfoDetailEOList.add(processInfoDetailEO); + this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.STUDIOFQ.getKey()); + + try { + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()); + } + // 认证工程师发起任务，将数据的状态更新为 任务待确认。 + this.updateBatchById(projectCertificationInventoryEOList); + }catch (Exception ex){ + ex.printStackTrace(); + log.error("认证工程师-退回认证清单任务失败：" + ex.getMessage()); + throw new JeroBootException("退回任务失败！"); + } + + return Result.OK("退回任务成功！"); + } + /** * 认证工程师发起任务 * @param json @@ -700,10 +766,45 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dutyPersonList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + List processInfoDetailEOList = new ArrayList<>(); + for (String dutyPerson : dutyPersonList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(dutyPerson); + processInfoDetailEOList.add(processInfoDetailEO); + } + this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRJSRW.getKey()); + + // 更新该项目认证流程中，认证工程师的任务状态。 + QueryWrapper queryCountWrap = new QueryWrapper<>(); + queryCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryBase.getId()); + queryCountWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); + int notDoneCount = this.count(queryCountWrap); + // 如果还有 清单待校核、责任人拒绝 状态的数据，不做操作，如果没有 将这个项目认证流程的所有认证工程师待办任务转为已办 + if(notDoneCount == 0){ + QueryWrapper detailQueryWrapper = new QueryWrapper<>(); + detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId()); + detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + List detailEOList = this.processInfoDetailEOService.list(detailQueryWrapper); + + for (ProcessInfoDetailEO processInfoDetailEO : detailEOList) { + processInfoDetailEO.setStatus(TaskStatusEnum.HAVE_DONE.getValue()); + } + + this.processInfoDetailEOService.updateBatchById(detailEOList); + } + // 认证工程师发起任务，将数据的状态更新为 任务待确认。 this.updateBatchById(projectCertificationInventoryEOList); }catch (Exception ex){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index d85aad48a..7fdaf67df 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -203,7 +203,10 @@ where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus} ) ) - AND pi.flow_type = #{params.qdqrFlowTypeValue} + AND pi.flow_type IN + + #{item} + )temp order by temp.end_time asc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index f72b89ba1..6549e3e92 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -39,6 +39,7 @@ import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.feginClient.impl.WorkFlowFeignClientImpl; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -199,11 +200,16 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl qdqrFlowTypeValue = new ArrayList<>(); + qdqrFlowTypeValue.add(FlowTypeEnum.QDQR.getValue()); + qdqrFlowTypeValue.add(FlowTypeEnum.CERTIFICATION_LC.getValue()); + params.put("qdqrFlowTypeValue",qdqrFlowTypeValue); IPage page = new Page(pageNo, pageSize); IPage result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params); @@ -304,7 +310,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl flowTypeList = new ArrayList<>(); flowTypeList.add(FlowTypeEnum.RWQRLC.getValue()); flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue()); - flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue()); + // flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue()); flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue()); //根据法规清单id，查询待办中心数据 @@ -396,7 +402,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Wed, 8 Mar 2023 11:42:42 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskListModel.vue | 3 +- .../certificationList/components/addModel.vue | 3 + .../components/batSetting.vue | 27 +- .../components/referenceDeliverablesList.vue | 252 ++++++++++++++++++ .../components/certificationList/index.vue | 114 ++++++-- 5 files changed, 363 insertions(+), 36 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 8430cd4f2..31e1cc703 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -183,7 +183,8 @@ studioList: [], disabled: false, url: { - edit: '/project/projectTaskInventoryEO/edit', + // edit: '/project/projectTaskInventoryEO/edit', + edit: '/project/projectCertificationInventoryEO/edit', addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate', list: '/project/projectTaskInventoryConditionAssessmentEO/list' } diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 8c5b56716..03441eca1 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -496,6 +496,9 @@ this.formInline = {} this.visible = true this.formInline = value + if (this.formInline.deliverableType) { + this.formInline.deliverableType = this.formInline.deliverableType.split(',') + } this.getRegulationNo() this.title = this.$t('edit') this.$nextTick(() => { diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index f5f3110f0..6d7f9cde3 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -1,7 +1,7 @@