From 02c5ba7feba2745fbef3161ec79f4acf5b8fb983 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 4 Aug 2022 15:06:28 +0800 Subject: [PATCH 01/51] =?UTF-8?q?57009=20=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 15c79a89f..b73b856cc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2315,11 +2315,44 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + " View details" + ""; + String href = ""; + if(StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())) + { + hrefFeishu = backUrl + + JumpLinkEnum.TASK_AFFIRM_LINK.getLink(); + href = "" + " View details" + ""; + }else if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) + { + hrefFeishu = backUrl + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + "-" + + projectYearNameInfoEO.getYearName() + + projectLibraryBase.getTargetMarket(); + href = "" + " View details" + ""; + } + String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu); From 58ed14fac2aa33038d5a7ff2ad9db491f9c574fe Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 4 Aug 2022 15:48:42 +0800 Subject: [PATCH 02/51] =?UTF-8?q?57061=20=E6=B8=85=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=AE=9A=E6=97=B6=E5=99=A8=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/job/InventoryAffirmJob.java | 10 ++++++---- .../impl/ProjectLawsInventoryEOServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index bd9170331..d339bf66d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -105,9 +105,10 @@ public class InventoryAffirmJob implements Job { //如果清单确认结束日期是当前日期 if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){ currentDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + } + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){ currentDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); } projectLawsInventoryEO.setSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); @@ -118,9 +119,10 @@ public class InventoryAffirmJob implements Job { //如果清单确认结束时间是当前系统时间后三天 if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgCurrentFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){ threeDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + } + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){ threeDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); } projectLawsInventoryEO.setSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index b73b856cc..add32a051 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4135,6 +4135,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); From 0259400fe4590be7fe84507261e646a4604cac12 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 5 Aug 2022 11:37:30 +0800 Subject: [PATCH 03/51] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=AE=BE=E7=BD=AE=E4=B8=BA=20?= =?UTF-8?q?=E8=AF=A5=E9=A1=B9=E7=9B=AE=E7=9A=84studio=E3=80=82=20=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=97=B6=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E8=AE=BE=E7=BD=AE=E4=B8=BA=20=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E6=B5=81=E7=A8=8B=E5=9C=A8=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 80 ++++++++++++++++--- ...ectTaskInventoryFeedbackEOServiceImpl.java | 32 +++++++- 2 files changed, 101 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index add32a051..6c9a1a3f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1290,6 +1290,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + // studio信息 + SysUser studioUserInfo = this.sysUserMapper.selectOne( + new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) + ); + QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); @@ -1354,7 +1359,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) - ); - //只要有一个人拒绝，就改为拒绝。 if(StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())){ inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue(); @@ -1493,7 +1494,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne( + new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, id) + ); SysUser studioUserInfo = this.sysUserMapper.selectOne( new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) @@ -2112,6 +2116,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){ String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id userIdList.add(prehomoDutyId); @@ -2212,7 +2233,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){ String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id userIdList.add(verifyDutyId); @@ -2225,7 +2252,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id userIdList.add(designInitiatorId); @@ -2238,7 +2270,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2251,7 +2288,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2264,7 +2306,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); @@ -2277,7 +2324,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){ String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id userIdList.add(prehomoDutyId); @@ -2290,7 +2342,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){ String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id userIdList.add(verifyDutyId); @@ -2303,7 +2360,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ @@ -2311,7 +2373,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryOneWrapper = new QueryWrapper<>(); + queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); + SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); + initiator = sysUser.getUsername(); + } + feishuMsgVo.setInitiator(initiator); //发送消息 SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } @@ -351,13 +362,30 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl queryOneWrapper = new QueryWrapper<>(); + queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); + SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); + initiator = sysUser.getUsername(); + } + feishuMsgVo.setInitiator(initiator); MessageTypeEnum messageTypeEnum = null; From bc9709efd1e1f1bb429255104ce3c01460a66e54 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 16:20:14 +0800 Subject: [PATCH 04/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 65 ++++++++++++++----- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6a69c579a..ec2b465bc 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1080,7 +1080,7 @@ ...this.queryParam, ids: selectedRowKeys.join(','), ...this.queryParamQuery, - roleCode:roleCodeIndex, + roleCode: roleCodeIndex, projectLibraryId: this.$route.query.id } downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect) @@ -1629,30 +1629,42 @@ this.detailedWarningList = [] }) } else { - for (let i = 0; i < this.TaskSuccessList.length; i++) { - ((i) => { - this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate - Object.keys(this.TaskSuccessList[i]).forEach(res => { - if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') - } - }) - setTimeout(() => { - this.confirmLoading = true - this.startProcess(this.TaskSuccessList[i], (i + 1)) - }, 500) - })(i) + // for (let i = 0; i < this.TaskSuccessList.length; i++) { + // ((i) => { + // this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + // Object.keys(this.TaskSuccessList[i]).forEach(res => { + // if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { + // this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') + // this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') + // } + // }) + // setTimeout(() => { + // this.confirmLoading = true + // this.startProcess(this.TaskSuccessList[i], (i + 1)) + // }, 500) + // })(i) + // } + let TaskSuccessList = JSON.parse(JSON.stringify(this.TaskSuccessList)) + for (let i = 0; i < TaskSuccessList.length; i++) { + TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + Object.keys(TaskSuccessList[i]).forEach(res => { + if (TaskSuccessList[i][res] && TaskSuccessList[i][res] instanceof String) { + TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\"/g, '“') + TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\'/g, '‘') + } + }) } + this.confirmLoading = true + this.startProcess(TaskSuccessList) } } }) }, - startProcess(value, index) { + startProcess(value) { let query = { type: 1, - msg: JSON.stringify(value).replace(/\"/g, '\''), + projectLawsInvnetoryList:value, projectNameId: this.$route.query.projectNameId, projectName: this.$route.query.projectName, projectLawsInventoryId: value.id, @@ -1660,7 +1672,24 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result, index) + this.visible = false + this.selectedRowKeys = [] + this.$message.success(this.$t('OperationSuccessful')) + this.confirmLoading = false + this.getList() + let that = this + if (this.TaskWarningList.length > 0) { + this.$warning({ + content: ( + < div > + { that.TaskWarningList } + < /div> + ) + }) + } + // this.completeTask(value, res.result, index) + }else{ + this.$message.warning(this.$t('operationFailed')) } }) }, From fbf23b2b52e38234b9993d686a035edea398a6fc Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 16:34:22 +0800 Subject: [PATCH 05/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/listOfRegulations.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ec2b465bc..40bf45fb9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -212,7 +212,7 @@ ((record.roleCode == 1 && !record.regulationOwnerSubmitStatus) || (record.roleCode == 2 && !record.homologationEngineerSubmitStatus) || (record.roleCode == 4 && !record.regulationOwnerSubmitStatus && !record.homologationEngineerSubmitStatus))) - || record.roleCode == 0" + || (record.roleCode == 0 && record.taskAffirmStatus != 'List to confirm')" @click="edit(record)"> {{ $t('edit') }} @@ -1664,7 +1664,7 @@ startProcess(value) { let query = { type: 1, - projectLawsInvnetoryList:value, + projectLawsInvnetoryList: value, projectNameId: this.$route.query.projectNameId, projectName: this.$route.query.projectName, projectLawsInventoryId: value.id, @@ -1688,7 +1688,7 @@ }) } // this.completeTask(value, res.result, index) - }else{ + } else { this.$message.warning(this.$t('operationFailed')) } }) From 861f21149df8e5bbe0403b389193a3903a1487ab Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 17:30:10 +0800 Subject: [PATCH 06/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 40bf45fb9..dbf4800e9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1211,7 +1211,7 @@ content: _this.$t('NoteConfirmTheChange'), onOk() { let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - getAction('/project/projectLawsInventoryEO/change', { + postAction('/project/projectLawsInventoryEO/change', { ids: idList.join(','), projectLibraryId: _this.$route.query.id }).then((res) => { From 4bf161ed3038251437c81d5fc1e268bf7f46b912 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 5 Aug 2022 18:37:51 +0800 Subject: [PATCH 07/51] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82?= =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E5=BC=8F=EF=BC=88=E5=90=8E=E7=AB=AF=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=A4=84=E7=90=86=E6=89=B9=E9=87=8F=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 4 ++-- .../service/IProjectLawsInventoryEOService.java | 2 +- .../impl/ProjectLawsInventoryEOServiceImpl.java | 11 ++++++++--- .../wkflow/controller/workFlowController.java | 15 +++++++++++++-- .../wkflow/feginClient/WorkFlowFeignClient.java | 12 ++++++++++-- .../feginClient/impl/WorkFlowFeignClientImpl.java | 14 ++++++++++++-- 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 3e3cb5a99..289f60ec9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -377,8 +377,8 @@ public class ProjectLawsInventoryEOController extends JeroController change(@RequestParam Map params) { + @PostMapping(value = "/change") + public Result change(@RequestBody JSONObject params) { return this.projectLawsInventoryEOService.change(params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 675dda5e0..fde39e439 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -122,7 +122,7 @@ public interface IProjectLawsInventoryEOService extends IService list, LoginUser currentUser, int isProjectRole, String cut); - Result change(Map parmas); + Result change(JSONObject parmas); /** * 下载pdf报告 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 6c9a1a3f1..91fbcc37e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4182,8 +4182,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl change(Map parmas) { - String ids = parmas.get("ids").toString(); + public Result change(JSONObject parmas) { + String ids = parmas.getString("ids"); if(StringUtils.isNotEmpty(ids)){ List idList = Arrays.asList(ids.split(",")); String projectLawsInventoryIds = ids; @@ -4199,6 +4199,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); @@ -4275,7 +4280,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); + JSONObject params = new JSONObject(); params.put("projectLawsInventoryIds",projectLawsInventoryIds); params.put("pIds",pIds); //根据流程实例id 、 法规清单id 删除相关流程。 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index b39663dc2..f3abd5757 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -54,8 +54,10 @@ public class workFlowController { jsonObject.put("loginUserId", currentUser.getId()); jsonObject.put("loginUserName", currentUser.getUsername()); if(StringUtils.equals(type,FlowTypeEnum.RWQRLC.getValue())){ - jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id - return this.activiti_define_start(jsonObject); + /*jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id + return this.activiti_define_start(jsonObject);*/ + jsonObject.put("processDefinitionKey", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); + return this.startTaskToConfirmProcess(jsonObject); }else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){ jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey()); initConditionAssessmentEO(jsonObject); @@ -203,4 +205,13 @@ public class workFlowController { public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){ return workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject); } + + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){ + return workFlowFeignClient.startTaskToConfirmProcess(jsonObject); + } } 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 1c48c7d24..401da0f62 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 @@ -84,8 +84,8 @@ public interface WorkFlowFeignClient { * @param params * @return */ - @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.GET) - Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map params); + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result deleteProcessInstanceByProjectLawsInventoryIds(String params); /** * 流程实例明细列表 @@ -146,6 +146,14 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) Result startLawsTechnologyEvaluationProcess(String jsonObject); + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + @RequestMapping(value = "/bat-wkflow/startTaskToConfirmProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result startTaskToConfirmProcess(String jsonObject); + @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 78da46005..707089e60 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -101,8 +101,8 @@ public class WorkFlowFeignClientImpl{ * @param params * @return */ - public Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map params){ - return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params); + public Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestBody JSONObject params){ + return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params.toString()); } /** @@ -167,4 +167,14 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + public Result startTaskToConfirmProcess(@RequestBody net.sf.json.JSONObject jsonObject){ + Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); + return Result.OK(stringWrapper.getResult()); + } } From b6df72eb752cb1a70f7146018cfd928d97142686 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 9 Aug 2022 13:37:39 +0800 Subject: [PATCH 08/51] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=97=B6=E9=9A=90=E8=97=8F=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameterlist/components/addModel.vue | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 530ff93fb..722984cd1 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -134,15 +134,15 @@ - +
- * + * {{$t('NcertificationCategory')}}
- + - - + + - + 吧
- * + * {{$t('ParameterNo')}}
@@ -271,7 +271,7 @@
- * + * {{$t('NParameterName')}}
@@ -679,7 +679,6 @@ export default { return } let falg = 1 - if(this.formInline.controlType != 11){ this.contentList.forEach((item,index) => { let reg = /^[0-9a-zA-Z-/. ]{1,}$/ // 编号的限制 @@ -715,7 +714,6 @@ export default { } } }) - } if(falg === 1) { this.$refs.ruleForm.validate(valid => { From 34777e91d544fe570270bbd700f2bf9f8296d04c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 13:48:17 +0800 Subject: [PATCH 09/51] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=98=8E=E7=BB=86=E8=A1=A8-=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2:=E5=A4=84=E7=90=86=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ryCardManageReleaseDetailEOController.java | 8 ++-- .../CountryCardManageReleaseDetailEO.java | 13 ++++-- .../entity/ProblemKnowledgeBaseEO.java | 10 ++--- ...untryCardManageReleaseDetailEOService.java | 11 ++++- ...yCardManageReleaseDetailEOServiceImpl.java | 42 ++++++++++++++++++- 5 files changed, 67 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java index c6c423cab..493c97a09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java @@ -59,6 +59,7 @@ public class CountryCardManageReleaseDetailEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = countryCardManageReleaseDetailEOService.page(page, queryWrapper); + this.countryCardManageReleaseDetailEOService.disposeData(pageList.getRecords(),countryCardManageReleaseDetailEO.getCut()); return Result.OK(pageList); } @@ -70,9 +71,10 @@ public class CountryCardManageReleaseDetailEOController extends JeroController> queryList() { - List list = countryCardManageReleaseDetailEOService.queryList(); - return Result.OK(list); + public Result> queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO,HttpServletRequest req) { + List result = countryCardManageReleaseDetailEOService.queryList(countryCardManageReleaseDetailEO,req); + this.countryCardManageReleaseDetailEOService.disposeData(result,countryCardManageReleaseDetailEO.getCut()); + return Result.OK(result); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java index 6df383189..61fb169dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -1,21 +1,18 @@ package com.jero.modules.problemKnowledgeBase.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.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -70,6 +67,10 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @Excel(name = "模板表id", width = 15) @ApiModelProperty(value = "模板表id") private java.lang.String countryCardTempId; + /**标签名称**/ + @TableField(exist = false) + @ApiModelProperty(value = "标签名称") + private java.lang.String countryCardTempIdName; /**描述*/ @Excel(name = "描述", width = 15) @@ -81,4 +82,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @ApiModelProperty(value = "内容") private java.lang.String content; + + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index dd152f332..7287306a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -1,8 +1,6 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -18,8 +16,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - /** * @Description: 问题知识库表 @@ -100,9 +96,9 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**内容（正文）*/ @Excel(name = "内容（正文）", width = 15) - private transient java.lang.String contentString; + private java.lang.String content; - private byte[] content; + /*private byte[] content; public byte[] getContent(){ if(contentString==null){ @@ -126,7 +122,7 @@ public class ProblemKnowledgeBaseEO implements Serializable { e.printStackTrace(); } return ""; - } + }*/ /**附件*/ @Excel(name = "附件", width = 15) @ApiModelProperty(value = "附件") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java index 9d078df1b..11c5f9efc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java @@ -2,6 +2,8 @@ package com.jero.modules.problemKnowledgeBase.service; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -57,5 +59,12 @@ public interface ICountryCardManageReleaseDetailEOService extends IService queryList(); + List queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java index 949ec4682..ab421eefd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -1,15 +1,28 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 问题知识库-country_card-管理发布明细表 * @Author: jero-boot @@ -20,6 +33,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseDetailEOService { + @Autowired + private ICountryCardTempEOService countryCardTempEOService; + /** * 保存 * @@ -86,7 +102,29 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; } + + @Override + public void disposeData(List datas, String cut) { + if (CollectionUtils.isNotEmpty(datas)) { + //获取模板 + List countryCardTempEOList = this.countryCardTempEOService.list(); + + datas.forEach(data -> { + String lableName = countryCardTempEOList.stream().filter(countryCardTempEO -> { + boolean flag = false; + if (StringUtils.equals(data.getCountryCardTempId(), countryCardTempEO.getId())) { + flag = true; + } + return flag; + }).map(CountryCardTempEO::getLableName).collect(Collectors.joining(",")); + data.setCountryCardTempIdName(lableName); + }); + + } + } } From 2c30985f738f87ca5c05dcb28a7b9600a68e0c86 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 14:03:11 +0800 Subject: [PATCH 10/51] =?UTF-8?q?Country=20Card=E6=A8=A1=E6=9D=BF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CountryCardTempEOServiceImpl.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index 730e25e30..8bb1d4c49 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -2,10 +2,14 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; import com.jero.modules.problemKnowledgeBase.enums.LableTypeEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardTempEOMapper; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; import org.apache.commons.collections4.CollectionUtils; @@ -13,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -35,6 +40,10 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl countryCardManageReleaseEOList = this.countryCardManageReleaseEOService.list(); + if(CollectionUtils.isNotEmpty(countryCardManageReleaseEOList)){ + List releaseDetailEOList = new ArrayList<>(); + countryCardManageReleaseEOList.forEach(manageReleaseEO -> { + CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO = new CountryCardManageReleaseDetailEO(); + countryCardManageReleaseDetailEO.setCountryCardTempId(countryCardTempEO.getId()); + countryCardManageReleaseDetailEO.setCountryCardManageReleaseId(manageReleaseEO.getId()); + }); + this.countryCardManageReleaseDetailEOService.saveBatch(releaseDetailEOList); + } + } /** * 更新 @@ -82,6 +102,9 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl manageReleaseDetailDeleteWrapper = new QueryWrapper<>(); + manageReleaseDetailDeleteWrapper.lambda().eq(CountryCardManageReleaseDetailEO::getCountryCardTempId,id); + this.countryCardManageReleaseDetailEOService.remove(manageReleaseDetailDeleteWrapper); } /** @@ -97,6 +120,10 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl itemDeleteWrapper = new QueryWrapper<>(); itemDeleteWrapper.lambda().in(CountryCardTempItemEO::getCountryCardTempId,ids); this.countryCardTempItemEOService.remove(itemDeleteWrapper); + + QueryWrapper manageReleaseDetailDeleteWrapper = new QueryWrapper<>(); + manageReleaseDetailDeleteWrapper.lambda().in(CountryCardManageReleaseDetailEO::getCountryCardTempId,ids); + this.countryCardManageReleaseDetailEOService.remove(manageReleaseDetailDeleteWrapper); } /** From 52dacca9db0b79dc66f17eeedaf87ccae139694f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 9 Aug 2022 14:07:10 +0800 Subject: [PATCH 11/51] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardRelease.vue | 16 ++-- .../components/countryCardReleaseAdd.vue | 88 ++++++++++++++----- .../components/countryCardReleaseModelAdd.vue | 4 +- 3 files changed, 80 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index e4ec51484..ec96f19d0 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -96,7 +96,7 @@
- +
@@ -128,13 +128,13 @@ { title: this.$t('applicableMarket'), align: 'center', - dataIndex: 'applicableMarket', + dataIndex: 'applyMarket', ellipsis: true }, { title: this.$t('releaseStatus'), align: 'center', - dataIndex: 'releaseStatus', + dataIndex: 'releaseStatus_dictText', ellipsis: true }, { @@ -165,11 +165,15 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() }, + countryCardReleaseAddForm() { + this.pageNo = 1 + this.getList() + }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { @@ -224,8 +228,8 @@ this.$message.warning(this.$t('selectLeastOne')) } }, - edit() { - this.$refs.countryCardReleaseAddRef.edit() + edit(record) { + this.$refs.countryCardReleaseAddRef.edit(JSON.parse(JSON.stringify(record))) }, subscribe(record) { let _this = this diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 164da146a..db4a9d6a0 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -43,25 +43,26 @@ :loading="loading"> - + - - {{ item.projectName}} + + {{ item.itemText}} - {{ (record.verifyDeliverableTemplate === 'null' || record.verifyDeliverableTemplate === '' || - record.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + v-else-if="record.lableType == 7" + @click="clickButtonToUpload('content',index)"> + {{ (record.content === 'null' || record.content === '' || + record.content == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -89,8 +90,10 @@ data() { return { url: { - list: '', - deleteOne: '' + list: '/problemKnowledgeBase/countryCardTempEO/list', + deleteOne: '', + add: '/problemKnowledgeBase/countryCardManageReleaseEO/add', + edit: '/problemKnowledgeBase/countryCardManageReleaseDetailEO/editBatch' }, title: '', formInline: {}, @@ -98,7 +101,7 @@ applyMarket: [ { required: true, - message: this.$t('LabelType') + this.$t('cannotEmpty'), + message: this.$t('applicableMarket') + this.$t('cannotEmpty'), trigger: 'change' } ] @@ -113,21 +116,23 @@ columns: [ { title: this.$t('LabelName'), - dataIndex: 'LabelName', + dataIndex: 'lableName', align: 'center', - ellipsis: true + ellipsis: true, + width: 220 }, { title: this.$t('describe'), - dataIndex: 'describe', + dataIndex: 'description', align: 'center', + width: 260, ellipsis: true }, { title: this.$t('content'), align: 'center', fixed: 'right', - width: 180, + width: 260, scopedSlots: { customRender: 'content' } } ] @@ -139,11 +144,13 @@ add() { this.visible = true this.title = this.$t('newlyAdded') + this.replacePage() this.getApplyMarketList() }, - edit() { + edit(row) { this.visible = true this.title = this.$t('edit') + this.editReplacePage(row) this.getApplyMarketList() }, getApplyMarketList() { @@ -186,13 +193,54 @@ handleSubmit() { this.$refs.ruleForm.validate(valid => { if (valid) { - + let url = '' + if (this.title == this.$t('newlyAdded')) { + url = this.url.add + } else { + url = this.url.edit + } + this.confirmLoading = true + let content = [] + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content + }) + }) + let query = { + countryCardManageReleaseDetailEOList: content, + applyMarket: this.formInline.applyMarket + } + postAction(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('countryCardReleaseAddForm') + } else { + this.confirmLoading = false + this.$message.warning(this.$t('operationFailed')) + } + }) } }) }, replacePage() { this.loading = true - postAction(this.url.list, {}).then((res) => { + getAction(this.url.list, {}).then((res) => { + if (res.success) { + this.dataList = res.result || [] + this.loading = false + } else { + this.dataList = [] + this.loading = false + } + }) + }, + editReplacePage(row) { + this.loading = true + getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { editReplacePage: row.id }).then((res) => { if (res.success) { this.dataList = res.result || [] this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue index 90873d393..ef66a9780 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModelAdd.vue @@ -124,7 +124,7 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index cd7fc3755..e3e4044bf 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -8,8 +8,17 @@
{{$t('applicableMarket')}}
- + + + + {{ item.title}} + + + @@ -89,15 +98,25 @@ return { queryParam: {}, conList: [], + applyMarketList: [], pageSize: 10, total: 0, pageNo: 1 } }, mounted() { - + this.getApplyMarketList() }, methods: { + getApplyMarketList() { + getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: 'countryCard' }).then((res) => { + if (res.success) { + this.applyMarketList = res.result || [] + } else { + this.applyMarketList = [] + } + }) + }, searchQuery() { }, diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index ec96f19d0..9e34a7f28 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -19,8 +19,10 @@
{{$t('applicableMarket')}}
- + @@ -28,8 +30,18 @@
{{$t('releaseStatus')}}
- + + + + {{ item.name}} + + + @@ -74,8 +86,10 @@ {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}} {{$t('edit')}} {{$t('delete')}} @@ -104,6 +118,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import countryCardReleaseModel from './countryCardReleaseModel' import countryCardReleaseAdd from './countryCardReleaseAdd' + import { mapGetters } from 'vuex' export default { name: 'countryCardRelease', @@ -114,8 +129,19 @@ data() { return { queryParam: {}, + releaseStatusList: [ + { + value: 'Draft', + name: this.$t('draft') + }, + { + value: 'Have released', + name: this.$t('HaveReleased') + } + ], loading: false, - dataSource: [{}], + dataSource: [], + selectedRowKeysRecord: [], total: 0, pageSize: 10, pageNo: 1, @@ -123,12 +149,13 @@ list: '/problemKnowledgeBase/countryCardManageReleaseEO/page', deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch' }, + userInfoQuery: {}, selectedRowKeys: [], columns: [ { title: this.$t('applicableMarket'), align: 'center', - dataIndex: 'applyMarket', + dataIndex: 'applyMarket_dictText', ellipsis: true }, { @@ -150,8 +177,10 @@ mounted() { document.title = 'Country Card-' + this.$t('managePublishing') this.getList() + this.userInfoQuery = this.userInfo() }, methods: { + ...mapGetters(['userInfo']), searchQuery() { this.pageNo = 1 this.getList() @@ -197,8 +226,9 @@ } }) }, - onSelectChange(value) { + onSelectChange(value, record) { this.selectedRowKeys = value + this.selectedRowKeysRecord = record }, newlyAddedClick() { this.$refs.countryCardReleaseAddRef.add() @@ -212,16 +242,27 @@ this.$confirm({ content: _this.$t('ConfirmBatchDeletion'), onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(res.message) + let idList = [] + let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord)) + for (let i = 0; i < selectedRowKeysRecord.length; i++) { + if (selectedRowKeysRecord[i].createBy == _this.userInfo().username && + selectedRowKeysRecord[i].releaseStatus == 'Draft') { + idList.push(selectedRowKeysRecord[i].id) } - }) + } + if (idList.length > 0) { + deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } else { + _this.$message.warning(_this.$t('doNotHavePermissionDeleteData')) + } } }) } else { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index db4a9d6a0..a2ed72151 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -10,7 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
@@ -20,6 +20,7 @@
+ + +
+
+ {{$t('applicableMarket')}} +
+ + + +
+ +
{ + this.formInline = {} + this.$refs.ruleForm.clearValidate() + }) this.title = this.$t('newlyAdded') this.replacePage() this.getApplyMarketList() }, edit(row) { this.visible = true + this.$nextTick(() => { + this.formInline = row + this.formInline = { ...this.formInline } + this.$refs.ruleForm.clearValidate() + }) this.title = this.$t('edit') this.editReplacePage(row) - this.getApplyMarketList() }, getApplyMarketList() { getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', {}).then((res) => { @@ -194,20 +220,29 @@ this.$refs.ruleForm.validate(valid => { if (valid) { let url = '' + let content = [] if (this.title == this.$t('newlyAdded')) { url = this.url.add + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content + }) + }) } else { url = this.url.edit + this.dataList.forEach(res => { + content.push({ + countryCardTempId: res.id, + description: res.description, + content: res.content, + id: res.id + }) + }) } this.confirmLoading = true - let content = [] - this.dataList.forEach(res => { - content.push({ - countryCardTempId: res.id, - description: res.description, - content: res.content - }) - }) + let query = { countryCardManageReleaseDetailEOList: content, applyMarket: this.formInline.applyMarket @@ -240,7 +275,7 @@ }, editReplacePage(row) { this.loading = true - getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { editReplacePage: row.id }).then((res) => { + getAction('/problemKnowledgeBase/countryCardManageReleaseDetailEO/list', { countryCardManageReleaseId: row.id }).then((res) => { if (res.success) { this.dataList = res.result || [] this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 6e291a5a3..d7a0ab0e4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -215,8 +215,7 @@ } .box-content-left { - width: 60%; - float: left; + width: 100%; font-size: 14px; font-weight: 400; color: #040B29; @@ -224,8 +223,7 @@ } .box-content-right { - width: 40%; - float: left; + width: 100%; display: inline-block; text-align: right; margin-top: 20px; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 1419c58cc..232ad441e 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -8,6 +8,12 @@ {{$t('applicableInstructionsMarketList')}}
+
+
+ + {{$t('forward')}} +
+
@@ -77,18 +83,21 @@
+ - + \ No newline at end of file diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 4156aceda..034ad00dc 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -29,7 +29,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 180px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" From 9d1d429977efd8c4d418f9a8d42212263152b8df Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 10 Aug 2022 15:00:42 +0800 Subject: [PATCH 44/51] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=88=AA=E6=AD=A2=E5=BD=93?= =?UTF-8?q?=E5=A4=A9-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/project/job/InventoryAffirmJob.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index e1c8e8369..f99726b03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -172,22 +172,22 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){ currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ - String msgContentEN = "The regulation list confirmation for " + String msgContentEN = "The regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + " will expire today. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The task will expire today. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 @@ -210,7 +210,7 @@ public class InventoryAffirmJob implements Job { sendMessageMap.put("hrefFeishu",hrefFeishu); sendMessageMap.put("contentInfo",contentInfo); //发送消息 - projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK_CONFIRMATION,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } } } From 688cac5c106dd0753219c757b41186274f00ddb9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 10 Aug 2022 15:31:01 +0800 Subject: [PATCH 45/51] =?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 --- .../documentTranslation/components/RetrieveFilesList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 37b0c040b..7f6d3b096 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -91,7 +91,7 @@
- {{$t('cancel')}} + {{$t('cancel')}} {{$t('submit')}}
From 13d16a097498150933331d954f2b2b1d0da76999 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 10 Aug 2022 16:26:41 +0800 Subject: [PATCH 46/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 591446f6f..9c36fbf2f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1252,7 +1252,7 @@ module.exports = { optionDropDownBox:'Option drop - down box', attachmentUpload:'file', textInput:'Text Input', - deleteNode:'If any file information exists, it will be deleted', + deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', } \ 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 6cdb9acde..459a1e4b5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1355,7 +1355,7 @@ module.exports = { Paraname: '参数名称', Parabatch: '参数批次', freeze:'请选择冻结配置', - deleteNode:'若有文件信息将同步删除', + deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', } \ No newline at end of file From 4fd5d9a85afdbe21b52168b50ced081432585962 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 10 Aug 2022 16:28:13 +0800 Subject: [PATCH 47/51] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BE=85=E5=8A=9Eid?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/enums/JumpLinkEnum.java | 3 +++ .../modules/wkflow/controller/workFlowController.java | 7 +++++++ .../modules/wkflow/feginClient/WorkFlowFeignClient.java | 8 ++++++++ .../wkflow/feginClient/impl/WorkFlowFeignClientImpl.java | 9 +++++++++ 4 files changed, 27 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index 54aa3225b..85f2b4d9f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -19,6 +19,9 @@ public enum JumpLinkEnum { DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"), TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""), COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""), + + PROBLEM_KNOWLEDGE_BASE_DETAIL("问题知识库，详情页","","/problemKnowledgeBaseView",""), + PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index f3abd5757..a8b8f4fa9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -214,4 +214,11 @@ public class workFlowController { public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){ return workFlowFeignClient.startTaskToConfirmProcess(jsonObject); } + + @AutoLog(value = "根据taskId删除流程") + @ApiOperation(value="根据taskId删除流程", notes="根据taskId删除流程") + @GetMapping("/deleteProcessInstanceByTaskId") + public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } 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 401da0f62..aa9bdd61b 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 @@ -156,4 +156,12 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByTaskId",method = RequestMethod.GET) + Result deleteProcessInstanceByTaskId(@RequestParam("taskId") String taskId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 707089e60..ae1940c04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -177,4 +177,13 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 根据待办id删除流程 + * @param taskId + * @return + */ + public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ + return workFlowFeignClient.deleteProcessInstance(taskId); + } } From 24961940febb397f10a01f2cf9dd9ca1c4a16f0d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 16:35:09 +0800 Subject: [PATCH 48/51] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardList.vue | 9 +- .../components/countryCardView.vue | 184 ++++++++++++++++-- .../components/countryCardViewAdd.vue | 23 ++- .../components/displayInformationModel.vue | 31 ++- 4 files changed, 194 insertions(+), 53 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index e9280d893..61e974e72 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -38,7 +38,7 @@
- + {{item.applyMarket_dictText}} @@ -144,7 +144,7 @@ path: '/countryCardView', query: { applyMarket: row.applyMarket, - id: row.id, + id: row.id } }) window.open(newUrl.href, '_blank') @@ -216,14 +216,14 @@ } .content-box-box-img { - width: 70%; + width: 238px; height: 100%; border-right: 1px #d9d9d9 solid; } .content-box-box-text { + width: calc(100% - 238px); display: inline-block; - width: 30%; text-align: center; font-size: 18px; font-weight: 500; @@ -234,6 +234,7 @@ width: 100%; text-align: right; margin-top: 20px; + margin-bottom: 20px; } .operator-text { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 6c194fd8a..e73433631 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -23,22 +23,37 @@
-
-
+
+
- + - 中国 + {{item2.applyMarket_dictText}}
- - - 中国 - + + {{$t('viewFile')}} + + + {{item2.lableName}} + + + + + +
@@ -47,8 +62,11 @@
- + + {{$t('dataLoading')}} +
@@ -56,49 +74,155 @@ import { getAction, postAction, downloadFile } from '@/api/manage' import displayInformationModel from './displayInformationModel' import countryCardViewAdd from './countryCardViewAdd' + import viewFileModel from '@/components/viewFileModel/index' export default { name: 'countryCardView', components: { displayInformationModel, - countryCardViewAdd + countryCardViewAdd, + viewFileModel }, data() { return { clientWidth: '', isTrue: false, + loading: false, dataList: [], + contentList: [], + displayList: [], + queryCountryList: [], + countryCardViewList:[], + applyMarkets: '', + url: { + list: '/problemKnowledgeBase/countryCardTempEO/list', + deleteOne: '' + }, list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets' } }, mounted() { - this.isTrue = false - this.$nextTick(() => { - this.clientWidth = 340 * 14 + 'px' - this.isTrue = true + this.queryCountry(() => { + this.replacePage() }) - this.queryCountry() }, methods: { displayInformationClick() { - this.$refs.displayInformationModelRef.getData() + this.$refs.displayInformationModelRef.getData(JSON.parse(JSON.stringify(this.displayList))) + }, + displayInformationModelForm(data) { + this.displayList = data + this.displayList = [...this.displayList] + this.consolidateData() }, newlyAddedClick() { - this.$refs.countryCardViewAddRef.add() + this.$refs.countryCardViewAddRef.add(this.countryCardViewList) }, countryCardViewAddForm(val) { - + this.countryCardViewList = JSON.parse(JSON.stringify(val)) + let content = [] + if (val && val.length > 0) { + val.forEach(res => { + if (res.applyMarket) { + content.push(res.applyMarket) + } + }) + } + this.applyMarkets = content.join(',') + this.queryCountry() }, - queryCountry() { + replacePage() { + getAction(this.url.list, {}).then((res) => { + if (res.success) { + this.displayList = res.result || [] + this.displayList.forEach(val => { + val.showOrNot = true + }) + this.consolidateData() + this.loading = false + } else { + this.displayList = [] + this.loading = false + } + }) + }, + consolidateData() { + let content = [] + this.contentList = [] + this.contentList.push({}) + if (this.displayList && this.displayList.length > 0) { + this.displayList.forEach(res => { + if (res.showOrNot) { + content.push(res) + } + }) + } + if (this.queryCountryList && this.queryCountryList.length > 0) { + this.contentList[0].list = [] + this.contentList[0].list.push({}) + this.queryCountryList.forEach(val => { + this.contentList[0].name = 'tou' + this.contentList[0].list.push({ + applyMarket_dictText: val.applyMarket_dictText, + img: val.countryNationalFlag + }) + }) + } + if (content && content.length > 0) { + content.forEach((res, index) => { + this.contentList[index + 1] = { name: res.lableName } + this.contentList[index + 1].list = [] + this.contentList[index + 1].list.push({ + lableName: res.lableName, + lableType: res.lableType + }) + }) + } + this.queryCountryList.forEach((res, index) => { + res.countryCardManageReleaseDetailEOList.forEach((val, index1) => { + this.contentList.forEach(res1 => { + if (res1.name == val.lableName) { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } + }) + }) + }) + console.log(this.contentList) + }, + queryCountry(callback) { + this.loading = true let applyMarkets = this.$route.query.applyMarket + if (this.applyMarkets) { + applyMarkets = applyMarkets + ',' + this.applyMarkets + } let query = { applyMarkets: applyMarkets } postAction(this.list, query).then((res) => { if (res.success) { - + this.queryCountryList = res.result || [] + this.isTrue = false + this.$nextTick(() => { + this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' + this.isTrue = true + }) + callback && callback() + if (!callback) { + this.consolidateData() + this.loading = false + } + } else { + callback && callback() + this.contentList = [] + this.loading = false } }) + }, + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } } @@ -218,6 +342,8 @@ width: 340px; display: inline-block; height: 80px; + line-height: 80px; + text-align: center; background: #fff; border-right: 1px #d9d9d9 solid; border-bottom: 1px #d9d9d9 solid; @@ -249,10 +375,28 @@ background: #fff; } + .content-box-top { + height: 80px; + } + .content-box-top:first-child { position: sticky; top: 0; + height: 160px; z-index: 111; background: #fff; } + + .content-box-box-text-index { + width: 100% !important; + padding: 0 12px; + box-sizing: border-box; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .content-box-box-text-admin { + height: 80px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index 2c1767b7a..39181fe65 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -31,7 +31,6 @@
- * {{$t('comparisonMarket')+(index+1)}}
@@ -111,14 +110,19 @@ mounted() { }, methods: { - add() { + add(data) { this.visible = true + console.log(data) this.$nextTick(() => { this.formInline = {} this.formInline.applyMarket = this.$route.query.applyMarket - this.formInline.dataList = [{ - relatedSection: '' - }] + if (data && data.length > 0) { + this.formInline.dataList = JSON.parse(JSON.stringify(data)) + } else { + this.formInline.dataList = [{ + applyMarket: '' + }] + } this.getList() this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() @@ -129,11 +133,8 @@ this.formInline = { ...this.formInline } }, handleOk() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - - } - }) + this.$emit('countryCardViewAddForm', JSON.parse(JSON.stringify(this.formInline.dataList))) + this.visible = false }, handleCancel() { this.visible = false @@ -185,8 +186,6 @@ for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) { if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket) && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) { - console.log(111) - console.log(j) this.formInline.dataList[i].applyMarketList.splice(j, 1) j-- } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index a6f01a5c3..724dc4f46 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -11,13 +11,15 @@ style="height: 100%;overflow: auto;padding-bottom: 53px;">
- - + +
@@ -65,28 +67,23 @@ mounted() { }, methods: { - getData() { + getData(data) { this.visible = true - this.replacePage() + this.$nextTick(() => { + this.dataList = data + this.dataList = [...this.dataList] + }) }, handleCancel() { this.visible = false }, handleSubmit() { - - }, - replacePage() { - this.loading = true - getAction(this.url.list, {}).then((res) => { - if (res.success) { - this.dataList = res.result || [] - this.loading = false - } else { - this.dataList = [] - this.loading = false - } - }) + this.$emit('displayInformationModelForm', this.dataList) + this.visible = false }, + onCheckAllChange(index) { + this.dataList[index].showOrNot = !this.dataList[index].showOrNot + } } } From 1ea54e3924870b960430593903478eb9e3e0d4dd Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 10 Aug 2022 16:42:03 +0800 Subject: [PATCH 49/51] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?,Pre-Homo,=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 91fbcc37e..023bd336c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1350,7 +1350,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 10 Aug 2022 16:50:51 +0800 Subject: [PATCH 50/51] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 2ca45b0f6..e723872d4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -13,13 +13,15 @@
- {{$t('recentHotSpots')}} - {{$t('disseminationMaterials')}} - {{$t('informationSafety')}} - {{$t('blueBook')}} - {{$t('invoiceCollection')}} - {{$t('productHighlights')}} - {{$t('financialReimbursement')}} +
@@ -91,9 +93,12 @@ searchContent: '', checkboxText: [], conList: [], + searchStr: '', total: 0, + selectedTags: [], loading: false, pageSize: 10, + tagList: [], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { @@ -103,12 +108,29 @@ }, mounted() { this.getList() + this.replacePage() }, methods: { + replacePage() { + getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { + if (res.success) { + this.tagList = res.result + } else { + this.tagList = [] + } + }) + }, onSearch() { this.pageNo = 1 this.getList() }, + handleChange(tag, checked) { + const { selectedTags } = this + const nextSelectedTags = checked + ? [...selectedTags, tag] + : selectedTags.filter(t => t !== tag) + this.selectedTags = nextSelectedTags + }, ResetSearch() { this.searchStr = '' this.pageNo = 1 @@ -128,11 +150,6 @@ this.$router.push({ path: '/problemKnowledgeBaseAdd' }) - // let newUrl = this.$router.resolve({ - // path: '/problemKnowledgeBaseAdd', - // query: {} - // }) - // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page @@ -323,4 +340,19 @@ text-align: center; line-height: 10; } + + \ No newline at end of file From 0f3bcd0b9629e80b0b91ad745bf8851e296ab42f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 17:19:11 +0800 Subject: [PATCH 51/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 17 +++++++++++-- .../components/initiatingProcess.vue | 6 +++++ .../processForm/evaluationProcess/index.vue | 9 ++++++- .../processForm/handshakeProcess/index.vue | 25 ++++++++++++++++--- .../processForm/regulatoryProcess/index.vue | 9 ++++++- .../processForm/taskListProcess/index.vue | 6 +++++ .../components/listOfRegulations.vue | 6 +++++ 7 files changed, 71 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 8201e8ed5..c2042a3c1 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -350,13 +350,23 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result) + this.completeTask(value, res.result, true) } else { this.JLoading = false } }) }, - completeTask(value, taskId) { + deleteProcessInstanceByTask(taskId) { + getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { + }) + }, + completeTask(value, taskId, isTrue) { + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, @@ -375,6 +385,9 @@ } else { this.JLoading = false this.$message.warning(this.$t('operationFailed')) + if (isTrue) { + this.deleteProcessInstanceByTask(taskId) + } } }) } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 8cdb5103a..1ef583d29 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -564,6 +564,12 @@ }) }, completeTask(value, taskId) { + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 59f0fa530..ac1f757f6 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -307,11 +307,18 @@ } }, completeTask() { + let value = JSON.parse(JSON.stringify(this.queryProject)) + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskIds, flag: this.queryProject.flag, - json: JSON.stringify(this.queryProject).replace(/\"/g, '\'') + json: JSON.stringify(value).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index c5390aa79..533a748a9 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -186,6 +186,12 @@ completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) let data = JSON.stringify(json).replace(/\"/g, '\'') + Object.keys(data).forEach(res => { + if (data[res] && data[res] instanceof String) { + data[res] = data[res].replace(/\"/g, '“') + data[res] = data[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, @@ -248,15 +254,24 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTaskDesign(value, res.result) + this.completeTaskDesign(value, res.result,true) } }) }, - - completeTaskDesign(value, taskId) { + deleteProcessInstanceByTask(taskId) { + getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { + }) + }, + completeTaskDesign(value, taskId,isTrue) { value.reviewResult = 'launch' let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.operatorTime = operatorTime + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId, @@ -272,6 +287,10 @@ // this.$router.push({ // path: '/ProcessCenter' // }) + }else{ + if (isTrue) { + this.deleteProcessInstanceByTask(taskId) + } } }) }, diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 503b8409d..604e429ce 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -171,10 +171,17 @@ // this.insertBatch(dataList, 2) }, completeTask() { + let value = JSON.parse(JSON.stringify(this.queryProject)) + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskIds, - json: JSON.stringify(this.queryProject).replace(/\"/g, '\'') + json: JSON.stringify(value).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 20412f416..efb58fae4 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -342,6 +342,12 @@ completeTask(value) { let json = Object.assign(this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index dbf4800e9..e289457ce 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1697,6 +1697,12 @@ completeTask(value, taskId, index) { let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime + Object.keys(value).forEach(res => { + if (value[res] && value[res] instanceof String) { + value[res] = value[res].replace(/\"/g, '“') + value[res] = value[res].replace(/\'/g, '‘') + } + }) let query = { userid: this.userInfo().id, taskId: taskId,