From 34f93771e31a7389cee06f88d82f33ed5522cd04 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 11 Oct 2022 09:57:10 +0800 Subject: [PATCH 001/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestTodoCenterController.java | 19 +++++++++ .../entity/ParamsManifestTodoCenterEO.java | 42 +++++++++++++++++++ .../IParamsManifestTodoCenterService.java | 10 +++++ .../ParamsManifestTodoCenterServiceImpl.java | 13 ++++++ 4 files changed, 84 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ParamsManifestTodoCenterController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IParamsManifestTodoCenterService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ParamsManifestTodoCenterController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ParamsManifestTodoCenterController.java new file mode 100644 index 000000000..416c60689 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ParamsManifestTodoCenterController.java @@ -0,0 +1,19 @@ +package com.jero.modules.todoCenter.controller; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 09:43 2022/10/11 + */ + +@Api(tags="待办中心-参数清单") +@RestController +@RequestMapping("/todoCenter/params/manifest") +@Slf4j +public class ParamsManifestTodoCenterController { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java new file mode 100644 index 000000000..0ea7b497a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java @@ -0,0 +1,42 @@ +package com.jero.modules.todoCenter.entity; + +import lombok.Data; + +@Data +public class ParamsManifestTodoCenterEO { + /** + * 参数清单id + */ + private String id; + + /** + * 相关项目名称 + */ + private String projectName; + + /** + * 参数清单标题 + */ + private String title; + + /** + * 相关项目版本 + */ + private String projectVersion; + + /** + * 待发起数量 + */ + private Integer waitCollectNum; + + /** + * 待工程接口人处理数量（即待分配） + */ + private Integer waitSdtNum; + + /** + * 待填写数量 + */ + private Integer waitFillNum; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IParamsManifestTodoCenterService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IParamsManifestTodoCenterService.java new file mode 100644 index 000000000..feaf3b4c7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IParamsManifestTodoCenterService.java @@ -0,0 +1,10 @@ +package com.jero.modules.todoCenter.service; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 09:43 2022/10/11 + */ + +public interface IParamsManifestTodoCenterService { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java new file mode 100644 index 000000000..69089345d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java @@ -0,0 +1,13 @@ +package com.jero.modules.todoCenter.service.impl; + +import com.jero.modules.todoCenter.service.IParamsManifestTodoCenterService; +import org.springframework.stereotype.Service; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 09:43 2022/10/11 + */ +@Service +public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoCenterService { +} From 019c8b372b4fbd85d61a1c0dd8c8e4106d313d4e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 12 Oct 2022 10:53:00 +0800 Subject: [PATCH 002/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0-=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ParamsManifestEOMapper.java | 4 + .../mapper/xml/ParamsManifestEOMapper.xml | 23 ++ .../ParamsManifestTodoCenterController.java | 20 ++ .../entity/ParamsManifestTodoCenterEO.java | 11 +- .../IParamsManifestTodoCenterService.java | 6 + .../ParamsManifestTodoCenterServiceImpl.java | 296 ++++++++++++++++++ .../vo/ParamsManifestTodoCenterEOPage.java | 45 +++ 7 files changed, 402 insertions(+), 3 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ParamsManifestTodoCenterEOPage.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java index 97a6d0c9b..5d718889d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.cert.collect.entity.ParamsManifestEO; import com.jero.modules.cert.collect.vo.ParamsManifestVO; +import com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO; +import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,6 +26,8 @@ public interface ParamsManifestEOMapper extends BaseMapper { List listInfoAll(@Param("idList") List idList); + List listForTodoCenter(ParamsManifestTodoCenterEOPage paramsManifestTodoCenterEOPage); + ParamsManifestVO getProjectById(@Param("projectId") String projectId); List> labelListForProjectDetails(@Param("projectId") String projectId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 592058433..580843763 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -114,6 +114,29 @@ + + + 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 4bd2d95bd..92b05bd5e 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 @@ -150,13 +150,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl flowTypeList = new ArrayList<>(); - this.setFlowTypeList(flowTypeList); + flowTypeList.add(FlowTypeEnum.RWQRLC.getValue()); + flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue()); + flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue()); + flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue()); params.put("flowTypeList",flowTypeList); params.put("taskStatus", TaskStatusEnum.NOT_DONE.getValue()); params.put("currentUserId",currentUser.getId()); + params.put("qdqrFlowTypeValue",FlowTypeEnum.QDQR.getValue()); IPage page = new Page(pageNo, pageSize); - IPage result = this.baseMapper.queryPageList(page,params); + IPage result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params); this.disposeData(result.getRecords(),cut); return result; } From 24834ca67d752192e5d8f25264375b08af5e7249 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 14:37:34 +0800 Subject: [PATCH 017/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/feedbackInformation.vue | 8 +- .../processForm/regulatoryProcess/index.vue | 6 +- .../components/SentList.vue | 105 ++++++++++++++++-- .../components/dealtWith.vue | 89 ++++++++++++++- .../components/doneList.vue | 89 ++++++++++++++- .../components/SentList.vue | 61 +++++----- .../components/dealtWith.vue | 52 +++++++-- .../components/doneList.vue | 24 ++-- 8 files changed, 366 insertions(+), 68 deletions(-) diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 3b9722099..b41d9eb10 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -12,11 +12,11 @@ {{$t('feedbackPoint')+(index+1)}} @@ -163,7 +163,9 @@ } this.formInline = { ...this.formInline } }) - + if (this.$route.query.isDisabled) { + this.disabled = JSON.parse(this.$route.query.isDisabled) + } }, methods: { clickButtonToUpload(item, index) { diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 1695db0be..dfb95253c 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -19,7 +19,7 @@ :title="$t('feedbackInformation')" /> { this.lawsOpinionAssessmentResult() }) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 4b1f311a7..60815ffed 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -128,7 +128,7 @@ projectName: item.projectName, projectNameId: item.projectNameId, targetMarket: item.targetMarket, - studioEngineer: item.studioEngineer, + studioEngineer: item.studioEngineer } }) window.open(newUrl.href, '_blank') @@ -146,18 +146,18 @@ let query = {} if (row.flowType == '1') { query = { - taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.actiProcInstId, - prcType:row.flowType, - prcNum:row.prcNum, - isTrue:false, + taskDefinitionKey: row.taskDefinitionKey, + taskIds: row.taskIds, + prcType: row.flowType, + prcNum: row.prcNum, + isTrue: false } let newUrl = this.$router.resolve({ path: '/handshakeProcess', query: query }) window.open(newUrl.href, '_blank') - }else if(row.flowType == '10'){ + } else if (row.flowType == '10') { let newUrl = this.$router.resolve({ path: '/ProjectDetails', query: { @@ -165,11 +165,98 @@ projectName: row.projectName, projectNameId: row.projectNameId, targetMarket: row.targetMarket, - studioEngineer:row.studioEngineer, - type:'102', + studioEngineer: row.studioEngineer, + type: '102' } }) window.open(newUrl.href, '_blank') + } else if (row.flowType == '2') { + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + projectLibraryId: row.projectLibraryId, + id: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + TaskKey: row.designTaskDefinitionKey, + isDisplay: false, + flowType: 2, + Sponsor: 'designInitiatorName', + personLiable: 'designDutyName', + typeOfDeliverables: 'designDeliverableTypeName', + deliverableTemplate: 'designDeliverableTemplate', + DueDate: 'designDueDate', + remarks: 'designRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.designTaskDetailId, + PersonChargeFeedback: row.designPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } else if (row.flowType == '3') { + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + studioEngineer: row.studioEngineer, + projectLibraryId: row.projectLibraryId, + serialNumber: row.serialNumber, + TaskKey: row.prehomoTaskDefinitionKey, + flowType: 3, + isDisplay: false, + id: row.projectLibraryId, + Sponsor: 'prehomoInitiatorName', + personLiable: 'prehomoDutyName', + typeOfDeliverables: 'prehomoDeliverableTypeName', + deliverableTemplate: 'prehomoDeliverableTemplate', + DueDate: 'prehomoDueDate', + remarks: 'prehomoRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.prehomoTaskDetailId, + PersonChargeFeedback: row.prehomoPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } else if (row.flowType == '4') { + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + id: row.projectLibraryId, + projectLibraryId: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + projectTaskInventoryId: row.projectLawsInventoryId, + TaskKey: row.verifyTaskDefinitionKey, + flowType: 4, + isDisplay: false, + Sponsor: 'verifyInitiatorName', + personLiable: 'verifyDutyName', + typeOfDeliverables: 'verifyDeliverableTypeName', + deliverableTemplate: 'verifyDeliverableTemplate', + DueDate: 'verifyDueDate', + remarks: 'verifyRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.verifyTaskDetailId, + PersonChargeFeedback: row.verifyPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index e394f8ab1..f2612c647 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -140,7 +140,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.actiProcInstId, + taskIds:row.taskIds, prcType:row.flowType, prcNum:row.prcNum, isTrue:true, @@ -163,6 +163,93 @@ } }) window.open(newUrl.href, '_blank') + }else if(row.flowType == '2'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + projectLibraryId:row.projectLibraryId, + id: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + TaskKey: row.designTaskDefinitionKey, + isDisplay: true, + flowType: 2, + Sponsor: 'designInitiatorName', + personLiable: 'designDutyName', + typeOfDeliverables: 'designDeliverableTypeName', + deliverableTemplate: 'designDeliverableTemplate', + DueDate: 'designDueDate', + remarks: 'designRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.designTaskDetailId, + PersonChargeFeedback: row.designPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '3'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + studioEngineer: row.studioEngineer, + projectLibraryId:row.projectLibraryId, + serialNumber: row.serialNumber, + TaskKey: row.prehomoTaskDefinitionKey, + flowType: 3, + isDisplay: true, + id: row.projectLibraryId, + Sponsor: 'prehomoInitiatorName', + personLiable: 'prehomoDutyName', + typeOfDeliverables: 'prehomoDeliverableTypeName', + deliverableTemplate: 'prehomoDeliverableTemplate', + DueDate: 'prehomoDueDate', + remarks: 'prehomoRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.prehomoTaskDetailId, + PersonChargeFeedback: row.prehomoPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '4'){ + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + id: row.projectLibraryId, + projectLibraryId: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + projectTaskInventoryId: row.projectLawsInventoryId, + TaskKey: row.verifyTaskDefinitionKey, + flowType: 4, + isDisplay: true, + Sponsor: 'verifyInitiatorName', + personLiable: 'verifyDutyName', + typeOfDeliverables: 'verifyDeliverableTypeName', + deliverableTemplate: 'verifyDeliverableTemplate', + DueDate: 'verifyDueDate', + remarks: 'verifyRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.verifyTaskDetailId, + PersonChargeFeedback: row.verifyPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index a96826a35..e59b17add 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -147,7 +147,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.actiProcInstId, + taskIds:row.taskIds, prcType:row.flowType, prcNum:row.prcNum, isTrue:false, @@ -170,6 +170,93 @@ } }) window.open(newUrl.href, '_blank') + }else if(row.flowType == '2'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + projectLibraryId:row.projectLibraryId, + id: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + TaskKey: row.designTaskDefinitionKey, + isDisplay: false, + flowType: 2, + Sponsor: 'designInitiatorName', + personLiable: 'designDutyName', + typeOfDeliverables: 'designDeliverableTypeName', + deliverableTemplate: 'designDeliverableTemplate', + DueDate: 'designDueDate', + remarks: 'designRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.designTaskDetailId, + PersonChargeFeedback: row.designPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '3'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + studioEngineer: row.studioEngineer, + projectLibraryId:row.projectLibraryId, + serialNumber: row.serialNumber, + TaskKey: row.prehomoTaskDefinitionKey, + flowType: 3, + isDisplay: false, + id: row.projectLibraryId, + Sponsor: 'prehomoInitiatorName', + personLiable: 'prehomoDutyName', + typeOfDeliverables: 'prehomoDeliverableTypeName', + deliverableTemplate: 'prehomoDeliverableTemplate', + DueDate: 'prehomoDueDate', + remarks: 'prehomoRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.prehomoTaskDetailId, + PersonChargeFeedback: row.prehomoPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '4'){ + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + id: row.projectLibraryId, + projectLibraryId: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + projectTaskInventoryId: row.projectLawsInventoryId, + TaskKey: row.verifyTaskDefinitionKey, + flowType: 4, + isDisplay: false, + Sponsor: 'verifyInitiatorName', + personLiable: 'verifyDutyName', + typeOfDeliverables: 'verifyDeliverableTypeName', + deliverableTemplate: 'verifyDeliverableTemplate', + DueDate: 'verifyDueDate', + remarks: 'verifyRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.verifyTaskDetailId, + PersonChargeFeedback: row.verifyPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index d267539e6..b6cb4b7f2 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -36,20 +36,21 @@ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index e4897b8da..d94f03ff6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -47,7 +47,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'standardInformation', + dataIndex: 'serialNumber', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 @@ -55,28 +55,28 @@ { title: this.$t('taskType'), align: 'center', - dataIndex: 'taskType', + dataIndex: 'flowTypeShow', ellipsis: true, width: 170 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'Sponsor', + dataIndex: 'createBy', ellipsis: true, width: 170 }, { title: this.$t('TaskCutOffTime'), align: 'center', - dataIndex: 'TaskCutOffTime', + dataIndex: 'endTime', ellipsis: true, width: 170 }, { title: this.$t('taskStatus'), align: 'center', - dataIndex: 'taskStatus', + dataIndex: 'statusShow', ellipsis: true, width: 170 }, @@ -91,19 +91,19 @@ selectedRowKeys: [], pageSize: 10, pageNo: 1, - url:{ - list:'', + url: { + list: '' }, total: 0, queryParam: {} } }, methods: { - standardInformationClick(item){ + standardInformationClick(item) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId, + id: item.projectLawsInventoryId } }) window.open(newUrl.href, '_blank') @@ -118,8 +118,38 @@ this.pageNo = 1 this.getList() }, - ProcessingClick(val) { - + ProcessingClick(row){ + row.router = this.$route.path + let query = {} + if (row.flowType == '5') { + query = { + prcId:row.actiProcInstId, + taskIds:row.taskIds, + prcType:row.flowType, + router:row.router, + taskDefinitionKey:row.taskDefinitionKey, + isDisabled:false + } + let newUrl = this.$router.resolve({ + path: '/regulatoryProcessReview', + query: query + }) + window.open(newUrl.href, '_blank') + } else if (row.flowType == '6') { + query = { + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.taskIds, + prcType:row.flowType, + prcId:row.actiProcInstId, + router:row.router, + isDisabled:false, + } + let newUrl = this.$router.resolve({ + path: '/evaluationProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 48ee20e1d..cfd23fd79 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -46,7 +46,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'standardInformation', + dataIndex: 'serialNumber', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, width: 170 @@ -54,35 +54,35 @@ { title: this.$t('taskType'), align: 'center', - dataIndex: 'taskType', + dataIndex: 'flowTypeShow', ellipsis: true, width: 170 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'Sponsor', + dataIndex: 'createBy', ellipsis: true, width: 170 }, { title: this.$t('CurrentProcessor'), align: 'center', - dataIndex: 'CurrentProcessor', - ellipsis: true, - width: 170 - }, - { - title: this.$t('TaskCutOffTime'), - align: 'center', - dataIndex: 'TaskCutOffTime', + dataIndex: 'assigneeName', ellipsis: true, width: 170 }, + // { + // title: this.$t('TaskCutOffTime'), + // align: 'center', + // dataIndex: 'TaskCutOffTime', + // ellipsis: true, + // width: 170 + // }, { title: this.$t('taskStatus'), align: 'center', - dataIndex: 'taskStatus', + dataIndex: 'statusShow', ellipsis: true, width: 170 }, From b6aa2d857c8db1b8ed9a9fc3b9a9e41fef171e86 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 18 Oct 2022 15:15:50 +0800 Subject: [PATCH 018/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?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 --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 +++++ .../jero/modules/project/enums/OperatorTypeEnum.java | 5 +++++ .../jero/modules/todoCenter/entity/ProcessInfoEO.java | 6 ++++++ .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 8 ++++++-- .../service/impl/ProcessInfoDetailEOServiceImpl.java | 10 ++++++++-- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index b14b0fb2a..351bc7440 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1222,3 +1222,8 @@ CREATE TABLE `laws_weilai`.`process_info_detail` ( -- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境 ALTER TABLE `laws_weilai`.`process_info_detail` ADD COLUMN `end_time` datetime NULL COMMENT '截止时间' AFTER `flow_type`; + +-- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境 +ALTER TABLE `laws_weilai`.`process_info` + ADD COLUMN `prc_num` varchar(64) NULL COMMENT '流程编号' AFTER `status`, + ADD COLUMN `prc_name` varchar(255) NULL COMMENT '流程名称' AFTER `prc_num`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index b46414b02..731d28c0f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -41,6 +41,11 @@ public enum OperatorTypeEnum { ADD_LAWS_OPINION_GATHER("添加法规意见收集数据","addLawsOpinionGather"), UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT("更新法规意见收集数据收集结果","updateLawsOpinionGatherGatherResult"), + + /** + * 流程信息明细表 + */ + UPDATE_PROCESS_INFO_DETAIL_BY_TASK_ID("根据taskId更新流程信息明细表","updateProcessInfoDetailByTaskId"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java index ccabb9d6d..9c3de82f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java @@ -94,6 +94,12 @@ public class ProcessInfoEO implements Serializable { @ApiModelProperty(value = "任务状态") private java.lang.String status; + @ApiModelProperty(value = "流程编号") + private String prcNum; + + @ApiModelProperty(value = "流程名称") + private String prcName; + /**流程类型展示字段*/ @TableField(exist = false) private String flowTypeShow; 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 a1f4e52dc..4db4fd1d9 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 @@ -104,7 +104,9 @@ pi.end_time, (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_id, (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_definition_key, - pi.STATUS + pi.STATUS, + pi.prc_num, + pi.prc_name FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id @@ -143,7 +145,9 @@ (select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time, '' as task_id, '' as task_definition_key, - pi.STATUS + pi.STATUS, + pi.prc_num, + pi.prc_name FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index 46869984f..f52d0a182 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -3,10 +3,9 @@ package com.jero.modules.todoCenter.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; -import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; -import com.jero.modules.project.entity.ProjectTaskInventoryEO; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; @@ -148,6 +147,13 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ProcessInfoDetailEO::getStatus,taskStatus); + updateWrapper.eq(ProcessInfoDetailEO::getTaskId,taskId); + this.update(updateWrapper); } return new Result<>().success("调用成功！"); } From 25bb71d6da98209c1fd532e1084bc1b15234507d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 15:26:13 +0800 Subject: [PATCH 019/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 4 ++-- .../projectRegulationTasks/components/dealtWith.vue | 10 +++++----- .../projectRegulationTasks/components/doneList.vue | 4 ++-- .../regulatoryAssessmentTasks/components/SentList.vue | 2 +- .../regulatoryAssessmentTasks/components/dealtWith.vue | 2 +- .../regulatoryAssessmentTasks/components/doneList.vue | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 60815ffed..97ec00d3f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -137,7 +137,7 @@ let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId + id: item.bussDocumentLibraryId } }) window.open(newUrl.href, '_blank') @@ -147,7 +147,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey: row.taskDefinitionKey, - taskIds: row.taskIds, + taskIds: row.taskId, prcType: row.flowType, prcNum: row.prcNum, isTrue: false diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index f2612c647..120ae077e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -130,7 +130,7 @@ let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId, + id: item.bussDocumentLibraryId, } }) window.open(newUrl.href, '_blank') @@ -140,7 +140,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.taskIds, + taskIds:row.taskId, prcType:row.flowType, prcNum:row.prcNum, isTrue:true, @@ -165,7 +165,7 @@ window.open(newUrl.href, '_blank') }else if(row.flowType == '2'){ query = { - taskIds:row.taskIds, + taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, projectLibraryId:row.projectLibraryId, @@ -194,7 +194,7 @@ window.open(newUrl.href, '_blank') }else if(row.flowType == '3'){ query = { - taskIds:row.taskIds, + taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, studioEngineer: row.studioEngineer, @@ -223,7 +223,7 @@ window.open(newUrl.href, '_blank') }else if(row.flowType == '4'){ query = { - taskIds: row.taskIds, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, projectLibraryId: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index e59b17add..8dbb42c71 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -137,7 +137,7 @@ let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId, + id: item.bussDocumentLibraryId, } }) window.open(newUrl.href, '_blank') @@ -147,7 +147,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.taskIds, + taskIds:row.taskId, prcType:row.flowType, prcNum:row.prcNum, isTrue:false, diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index b6cb4b7f2..f248720dd 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -110,7 +110,7 @@ let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId + id: item.bussDocumentLibraryId } }) window.open(newUrl.href, '_blank') diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index d94f03ff6..1ca7c4a9a 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -103,7 +103,7 @@ let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId + id: item.bussDocumentLibraryId } }) window.open(newUrl.href, '_blank') diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index cfd23fd79..57ba97a6d 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -109,7 +109,7 @@ let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId, + id: item.bussDocumentLibraryId, } }) window.open(newUrl.href, '_blank') From d41c073cec00702f09d996955e4a21b37d74db2c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 15:48:03 +0800 Subject: [PATCH 020/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/toDoCenter/taskConfirmation/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index f1794a7f9..d03a64f9b 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -8,8 +8,8 @@
{{$t('RelatedItems')}}
- + @@ -17,8 +17,8 @@
{{$t('standardInformation')}}
- + From f23800cda7ba433baf876fbd5482fa69348f7c22 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 15:50:46 +0800 Subject: [PATCH 021/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toDoCenter/regulatoryAssessmentTasks/index.vue | 4 ++-- .../taskConfirmation/components/batchProcessing.vue | 3 +-- .../src/views/toDoCenter/taskConfirmation/index.vue | 10 +++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index ff7f8b869..4c024a4f6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -8,8 +8,8 @@
{{$t('standardInformation')}}
- + diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue index 45cdf79eb..15f1ca777 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue @@ -127,8 +127,7 @@ this.taskIds = [] this.projectLawsInventoryIds = [] this.selectedRowKeys.forEach(res => { - res.taskIds = res.actiProcInstId - this.taskIds.push(res.taskIds) + this.taskIds.push(res.taskId) this.projectLawsInventoryIds.push(res.projectLawsInventoryId) }) this.confirmLoading = false diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index d03a64f9b..ef1311a8a 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -215,11 +215,11 @@ let query = {} if (row.flowType == '1') { query = { - taskDefinitionKey: row.taskDefinitionKey, - taskIds: row.actiProcInstId, - prcType: row.flowType, - prcNum: row.prcNum, - isTrue: true + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.taskId, + prcType:row.flowType, + prcNum:row.prcNum, + isTrue:true, } let newUrl = this.$router.resolve({ path: '/handshakeProcess', From 5090ac5620726099bedd00f288acd3b8f3fd39e1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 18 Oct 2022 15:56:54 +0800 Subject: [PATCH 022/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E3=80=81=E5=B7=B2=E5=8F=91=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 6 +++++- .../service/impl/ProcessInfoDetailEOServiceImpl.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) 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 4db4fd1d9..ff3ea66ae 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 @@ -76,7 +76,11 @@ pi.flow_type, createBy.username as "create_by", pi.end_time, - pi.status + (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} limit 1) as task_id, + (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} limit 1) as task_definition_key, + pi.status, + pi.prc_num, + pi.prc_name FROM process_info pi left join project_library_base plb on plb.id = pi.project_library_id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index f52d0a182..5b793755e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -152,6 +152,7 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(ProcessInfoDetailEO::getStatus,taskStatus); + updateWrapper.set(ProcessInfoDetailEO::getSubmitTime,new Date()); updateWrapper.eq(ProcessInfoDetailEO::getTaskId,taskId); this.update(updateWrapper); } From 4cdeda04d92bf3e5e6c0f93647848766ca769786 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 17:04:51 +0800 Subject: [PATCH 023/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/toDoCenter/taskConfirmation/index.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index ef1311a8a..cb80eca13 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -181,8 +181,7 @@ window.open(newUrl.href, '_blank') }, batchProcessingForm() { - this.pageNo = 1 - this.queryProcess() + this.getList() }, batchProcessingClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { @@ -215,11 +214,11 @@ let query = {} if (row.flowType == '1') { query = { - taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.taskId, - prcType:row.flowType, - prcNum:row.prcNum, - isTrue:true, + taskDefinitionKey: row.taskDefinitionKey, + taskIds: row.taskId, + prcType: row.flowType, + prcNum: row.prcNum, + isTrue: true } let newUrl = this.$router.resolve({ path: '/handshakeProcess', From 5f0e1ad8d0b24f36ad447dea70a4a64f9a92b660 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 09:10:22 +0800 Subject: [PATCH 024/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 6 +++--- .../projectRegulationTasks/components/dealtWith.vue | 6 +++--- .../projectRegulationTasks/components/doneList.vue | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 97ec00d3f..6a8b06604 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -180,7 +180,7 @@ studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, TaskKey: row.designTaskDefinitionKey, - isDisplay: false, + isDisplay: true, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -209,7 +209,7 @@ serialNumber: row.serialNumber, TaskKey: row.prehomoTaskDefinitionKey, flowType: 3, - isDisplay: false, + isDisplay: true, id: row.projectLibraryId, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -239,7 +239,7 @@ projectTaskInventoryId: row.projectLawsInventoryId, TaskKey: row.verifyTaskDefinitionKey, flowType: 4, - isDisplay: false, + isDisplay: true, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 120ae077e..5a738fbd5 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -173,7 +173,7 @@ studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, TaskKey: row.designTaskDefinitionKey, - isDisplay: true, + isDisplay: false, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -202,7 +202,7 @@ serialNumber: row.serialNumber, TaskKey: row.prehomoTaskDefinitionKey, flowType: 3, - isDisplay: true, + isDisplay: false, id: row.projectLibraryId, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -232,7 +232,7 @@ projectTaskInventoryId: row.projectLawsInventoryId, TaskKey: row.verifyTaskDefinitionKey, flowType: 4, - isDisplay: true, + isDisplay: false, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 8dbb42c71..afc8dfaf8 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -180,7 +180,7 @@ studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, TaskKey: row.designTaskDefinitionKey, - isDisplay: false, + isDisplay: true, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -209,7 +209,7 @@ serialNumber: row.serialNumber, TaskKey: row.prehomoTaskDefinitionKey, flowType: 3, - isDisplay: false, + isDisplay: true, id: row.projectLibraryId, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -239,7 +239,7 @@ projectTaskInventoryId: row.projectLawsInventoryId, TaskKey: row.verifyTaskDefinitionKey, flowType: 4, - isDisplay: false, + isDisplay: true, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', From b8f5bb3ecd59d61cf1f3417fec7b6c84686a530a Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 09:13:45 +0800 Subject: [PATCH 025/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 12 ++++++------ .../projectRegulationTasks/components/dealtWith.vue | 12 ++++++------ .../projectRegulationTasks/components/doneList.vue | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 6a8b06604..199d80b69 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -179,8 +179,8 @@ id: row.projectLibraryId, studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, - TaskKey: row.designTaskDefinitionKey, - isDisplay: true, + TaskKey: row.taskDefinitionKey, + isDisplay: false, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -207,9 +207,9 @@ studioEngineer: row.studioEngineer, projectLibraryId: row.projectLibraryId, serialNumber: row.serialNumber, - TaskKey: row.prehomoTaskDefinitionKey, + TaskKey: row.taskDefinitionKey, flowType: 3, - isDisplay: true, + isDisplay: false, id: row.projectLibraryId, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -237,9 +237,9 @@ studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, projectTaskInventoryId: row.projectLawsInventoryId, - TaskKey: row.verifyTaskDefinitionKey, + TaskKey: row.taskDefinitionKey, flowType: 4, - isDisplay: true, + isDisplay: false, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 5a738fbd5..1810a9b97 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -172,8 +172,8 @@ id: row.projectLibraryId, studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, - TaskKey: row.designTaskDefinitionKey, - isDisplay: false, + TaskKey: row.taskDefinitionKey, + isDisplay: true, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -200,9 +200,9 @@ studioEngineer: row.studioEngineer, projectLibraryId:row.projectLibraryId, serialNumber: row.serialNumber, - TaskKey: row.prehomoTaskDefinitionKey, + TaskKey: row.taskDefinitionKey, flowType: 3, - isDisplay: false, + isDisplay: true, id: row.projectLibraryId, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -230,9 +230,9 @@ studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, projectTaskInventoryId: row.projectLawsInventoryId, - TaskKey: row.verifyTaskDefinitionKey, + TaskKey: row.taskDefinitionKey, flowType: 4, - isDisplay: false, + isDisplay: true, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index afc8dfaf8..160c7c486 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -179,8 +179,8 @@ id: row.projectLibraryId, studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, - TaskKey: row.designTaskDefinitionKey, - isDisplay: true, + TaskKey: row.taskDefinitionKey, + isDisplay: false, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -207,9 +207,9 @@ studioEngineer: row.studioEngineer, projectLibraryId:row.projectLibraryId, serialNumber: row.serialNumber, - TaskKey: row.prehomoTaskDefinitionKey, + TaskKey: row.taskDefinitionKey, flowType: 3, - isDisplay: true, + isDisplay: false, id: row.projectLibraryId, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -237,9 +237,9 @@ studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, projectTaskInventoryId: row.projectLawsInventoryId, - TaskKey: row.verifyTaskDefinitionKey, + TaskKey: row.taskDefinitionKey, flowType: 4, - isDisplay: true, + isDisplay: false, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableTypeName', From 4cd7973c76b94fe9b5fff77d46c03f3895f2b63d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 09:21:07 +0800 Subject: [PATCH 026/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryAssessmentTasks/components/dealtWith.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 1ca7c4a9a..7a68c579a 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -124,9 +124,10 @@ if (row.flowType == '5') { query = { prcId:row.actiProcInstId, - taskIds:row.taskIds, + taskIds:row.taskId, prcType:row.flowType, router:row.router, + prcNum:row.prcNum, taskDefinitionKey:row.taskDefinitionKey, isDisabled:false } @@ -138,8 +139,9 @@ } else if (row.flowType == '6') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.taskIds, + taskIds:row.taskId, prcType:row.flowType, + prcNum:row.prcNum, prcId:row.actiProcInstId, router:row.router, isDisabled:false, From 730c3256bb12d6dcbdddbb495cf780413f56ca29 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 10:29:52 +0800 Subject: [PATCH 027/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SentList.vue | 18 +++++-- .../components/dealtWith.vue | 48 ++++++++++++------- .../components/doneList.vue | 18 +++++-- 3 files changed, 60 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 199d80b69..ee8dbc592 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -171,8 +171,12 @@ }) window.open(newUrl.href, '_blank') } else if (row.flowType == '2') { + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds: row.taskIds, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, projectLibraryId: row.projectLibraryId, @@ -200,8 +204,12 @@ }) window.open(newUrl.href, '_blank') } else if (row.flowType == '3') { + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds: row.taskIds, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, studioEngineer: row.studioEngineer, @@ -229,8 +237,12 @@ }) window.open(newUrl.href, '_blank') } else if (row.flowType == '4') { + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds: row.taskIds, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, projectLibraryId: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 1810a9b97..7e5df27af 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -121,16 +121,16 @@ projectName: item.projectName, projectNameId: item.projectNameId, targetMarket: item.targetMarket, - studioEngineer:item.studioEngineer, + studioEngineer: item.studioEngineer } }) window.open(newUrl.href, '_blank') }, - standardInformationClick(item){ + standardInformationClick(item) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.bussDocumentLibraryId, + id: item.bussDocumentLibraryId } }) window.open(newUrl.href, '_blank') @@ -139,18 +139,18 @@ let query = {} if (row.flowType == '1') { query = { - taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.taskId, - prcType:row.flowType, - prcNum:row.prcNum, - isTrue:true, + taskDefinitionKey: row.taskDefinitionKey, + taskIds: row.taskId, + prcType: row.flowType, + prcNum: row.prcNum, + isTrue: true } let newUrl = this.$router.resolve({ path: '/handshakeProcess', query: query }) window.open(newUrl.href, '_blank') - }else if(row.flowType == '10'){ + } else if (row.flowType == '10') { let newUrl = this.$router.resolve({ path: '/ProjectDetails', query: { @@ -158,17 +158,21 @@ projectName: row.projectName, projectNameId: row.projectNameId, targetMarket: row.targetMarket, - studioEngineer:row.studioEngineer, - type:'102', + studioEngineer: row.studioEngineer, + type: '102' } }) window.open(newUrl.href, '_blank') - }else if(row.flowType == '2'){ + } else if (row.flowType == '2') { + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds:row.taskId, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, - projectLibraryId:row.projectLibraryId, + projectLibraryId: row.projectLibraryId, id: row.projectLibraryId, studioEngineer: row.studioEngineer, serialNumber: row.serialNumber, @@ -192,13 +196,17 @@ query: query }) window.open(newUrl.href, '_blank') - }else if(row.flowType == '3'){ + } else if (row.flowType == '3') { + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds:row.taskId, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, studioEngineer: row.studioEngineer, - projectLibraryId:row.projectLibraryId, + projectLibraryId: row.projectLibraryId, serialNumber: row.serialNumber, TaskKey: row.taskDefinitionKey, flowType: 3, @@ -221,7 +229,11 @@ query: query }) window.open(newUrl.href, '_blank') - }else if(row.flowType == '4'){ + } else if (row.flowType == '4') { + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { taskIds: row.taskId, actiProcInstId: row.actiProcInstId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 160c7c486..6b0459add 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -171,8 +171,12 @@ }) window.open(newUrl.href, '_blank') }else if(row.flowType == '2'){ + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds:row.taskIds, + taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, projectLibraryId:row.projectLibraryId, @@ -200,8 +204,12 @@ }) window.open(newUrl.href, '_blank') }else if(row.flowType == '3'){ + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds:row.taskIds, + taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, studioEngineer: row.studioEngineer, @@ -229,8 +237,12 @@ }) window.open(newUrl.href, '_blank') }else if(row.flowType == '4'){ + row.taskId = row.taskId + '' + if (row.taskId.length > 30) { + row.taskId = '' + } query = { - taskIds: row.taskIds, + taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, projectLibraryId: row.projectLibraryId, From 798b91e851eb768d438e97508f8e51176257682d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 10:50:46 +0800 Subject: [PATCH 028/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processForm/taskListProcess/index.vue | 41 ++++++++++++------- .../components/SentList.vue | 4 ++ .../components/dealtWith.vue | 4 ++ .../components/doneList.vue | 4 ++ 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 92f24d749..26060f554 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -324,14 +324,19 @@ putAction(this.url.dreSubmit, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - - this.$router.push({ - path: '/ProjectDetails', - query: { - type: '103', - ...this.$route.query - } - }) + if (this.$route.query.router) { + this.$router.push({ + path: '/projectRegulationTasks' + }) + } else { + this.$router.push({ + path: '/ProjectDetails', + query: { + type: '103', + ...this.$route.query + } + }) + } // setTimeout(() => { // this.loading = false // window.close() @@ -375,13 +380,19 @@ if (res.success) { setTimeout(() => { this.loading = false - this.$router.push({ - path: '/ProjectDetails', - query: { - type: '103', - ...this.$route.query - } - }) + if (this.$route.query.router) { + this.$router.push({ + path: '/projectRegulationTasks' + }) + } else { + this.$router.push({ + path: '/ProjectDetails', + query: { + type: '103', + ...this.$route.query + } + }) + } }, 1000) } }) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index ee8dbc592..eb14bf25b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -144,6 +144,7 @@ }, viewClick(row) { let query = {} + row.router = this.$route.path if (row.flowType == '1') { query = { taskDefinitionKey: row.taskDefinitionKey, @@ -176,6 +177,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -209,6 +211,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -242,6 +245,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 7e5df27af..0b13ca53e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -137,6 +137,7 @@ }, ProcessingClick(row) { let query = {} + row.router = this.$route.path if (row.flowType == '1') { query = { taskDefinitionKey: row.taskDefinitionKey, @@ -169,6 +170,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -202,6 +204,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -235,6 +238,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 6b0459add..aca73eb2f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -144,6 +144,7 @@ }, viewClick(row) { let query = {} + row.router = this.$route.path if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, @@ -176,6 +177,7 @@ row.taskId = '' } query = { + router: row.router, taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -209,6 +211,7 @@ row.taskId = '' } query = { + router: row.router, taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -242,6 +245,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, From baed744ebf7ede22b29e3d30be1176a473a6591c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 10:54:37 +0800 Subject: [PATCH 029/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 12 ++++++------ .../projectRegulationTasks/components/dealtWith.vue | 12 ++++++------ .../projectRegulationTasks/components/doneList.vue | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index eb14bf25b..173df447b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -197,8 +197,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.designTaskDetailId, - PersonChargeFeedback: row.designPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', @@ -231,8 +231,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.prehomoTaskDetailId, - PersonChargeFeedback: row.prehomoPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', @@ -265,8 +265,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.verifyTaskDetailId, - PersonChargeFeedback: row.verifyPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 0b13ca53e..22a3cd251 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -190,8 +190,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.designTaskDetailId, - PersonChargeFeedback: row.designPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', @@ -224,8 +224,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.prehomoTaskDetailId, - PersonChargeFeedback: row.prehomoPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', @@ -258,8 +258,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.verifyTaskDetailId, - PersonChargeFeedback: row.verifyPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index aca73eb2f..193c0351a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -197,8 +197,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.designTaskDetailId, - PersonChargeFeedback: row.designPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', @@ -231,8 +231,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.prehomoTaskDetailId, - PersonChargeFeedback: row.prehomoPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', @@ -265,8 +265,8 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, - primaryKeyId: row.verifyTaskDetailId, - PersonChargeFeedback: row.verifyPersonChargeFeedback + primaryKeyId: row.primaryKeyId, + PersonChargeFeedback: row.PersonChargeFeedback } let newUrl = this.$router.resolve({ path: '/taskListProcess', From 8839414fbab630fd502820b09f3dcb780f070600 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 19 Oct 2022 11:21:15 +0800 Subject: [PATCH 030/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ojectTaskInventoryDetailEOServiceImpl.java | 43 +++++++- .../mapper/ProcessInfoEOMapper.java | 5 +- .../mapper/xml/ProcessInfoEOMapper.xml | 19 +++- .../service/IProcessInfoDetailEOService.java | 6 ++ .../impl/ProcessInfoDetailEOServiceImpl.java | 14 +++ .../impl/ProcessInfoEOServiceImpl.java | 36 ++++++- .../modules/todoCenter/vo/ProcessInfoVO.java | 101 ++++++++++++++++++ 7 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 9201fba57..882059144 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; @@ -14,6 +15,7 @@ import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.MsgTypeEnum; import com.jero.modules.project.enums.SendMsgFlagEnum; +import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IFeedbackHistoryService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; @@ -21,6 +23,8 @@ import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; +import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -61,6 +65,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl createByList = new ArrayList<>(); List projectTaskInventoryFeedbackEOList = new ArrayList<>(); + List processInfoDetailEOList = new ArrayList<>(); String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber(); for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOAddList) { @@ -138,6 +147,17 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> { boolean flag = true; @@ -195,6 +218,15 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl processInfoDetailUpdateWrap= new LambdaUpdateWrapper(); + processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId()); + processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus()); + this.processInfoDetailEOService.update(processInfoDetailUpdateWrap); + } } /** @@ -205,8 +237,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = this.baseMapper.selectById(id); + removeById(id); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,id); List list = this.projectTaskInventoryFeedbackEOService.list(queryWrapper); if(CollectionUtils.isNotEmpty(list)){ @@ -216,6 +249,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl processInfoDetailRemoveWrap = new QueryWrapper<>(); + processInfoDetailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskId,projectTaskInventoryDetailEO.getTaskId()); + this.processInfoDetailEOService.remove(processInfoDetailRemoveWrap); + } } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java index a7fc3b188..5c746561b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java @@ -5,6 +5,7 @@ import java.util.Map; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.todoCenter.entity.ProcessInfoEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.todoCenter.vo.ProcessInfoVO; /** * @Description: 流程信息表 @@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProcessInfoEOMapper extends BaseMapper { - IPage queryPageList(IPage page,Map params); + IPage queryPageList(IPage page, Map params); - IPage queryProjectProcessTodoTaskListList(IPage page,Map params); + IPage queryProjectProcessTodoTaskListList(IPage page,Map params); } 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 ff3ea66ae..8c9e1df41 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 @@ -62,7 +62,7 @@ - SELECT pi.id, pi.project_library_id, @@ -80,7 +80,10 @@ (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} limit 1) as task_definition_key, pi.status, pi.prc_num, - pi.prc_name + pi.prc_name, + plb.project_name_id, + plb.target_market, + plb.studio_engineer FROM process_info pi left join project_library_base plb on plb.id = pi.project_library_id @@ -91,7 +94,7 @@ order by pi.create_time desc - select temp.* from ( SELECT pi.id, @@ -110,7 +113,10 @@ (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_definition_key, pi.STATUS, pi.prc_num, - pi.prc_name + pi.prc_name, + plb.project_name_id, + plb.target_market, + plb.studio_engineer FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id @@ -151,7 +157,10 @@ '' as task_definition_key, pi.STATUS, pi.prc_num, - pi.prc_name + pi.prc_name, + plb.project_name_id, + plb.target_market, + plb.studio_engineer FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java index fc14c3569..f72da7cba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java @@ -67,4 +67,10 @@ public interface IProcessInfoDetailEOService extends IService processCall(JSONObject jsonObject); + + /** + * 批量插入dre工程师的待办任务 + * @param processInfoDetailEOList + */ + void batchInsertDreUserTask(List processInfoDetailEOList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index 5b793755e..89f5ae0d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -158,4 +158,18 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl().success("调用成功！"); } + + @Override + public void batchInsertDreUserTask(List processInfoDetailEOList) { + processInfoDetailEOList.forEach(detail -> { + QueryWrapper removeWrap = new QueryWrapper<>(); + removeWrap.lambda().eq(ProcessInfoDetailEO::getUserId,detail.getUserId()); + removeWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,detail.getFlowType()); + removeWrap.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,detail.getActiProcInstId()); + removeWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,detail.getTaskDefinitionKey()); + this.remove(removeWrap); + }); + + this.saveBatch(processInfoDetailEOList); + } } 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 92b05bd5e..7bc7a9b8c 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 @@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.project.enums.TaskStatusEnum; +import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; @@ -18,6 +20,7 @@ import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.mapper.ProcessInfoEOMapper; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; +import com.jero.modules.todoCenter.vo.ProcessInfoVO; import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -43,6 +46,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params); + IPage result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params); this.disposeData(result.getRecords(),cut); return result; } @@ -180,7 +185,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryPageList(page,params); + IPage result = this.baseMapper.queryPageList(page,params); this.disposeData(result.getRecords(),cut); return result; } @@ -200,7 +205,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryPageList(page,params); + IPage result = this.baseMapper.queryPageList(page,params); this.disposeData(result.getRecords(),cut); return result; } @@ -213,9 +218,9 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl datas,String cut){ + public void disposeData(List datas, String cut){ if(CollectionUtils.isNotEmpty(datas)){ - List processInfoIdList = datas.stream().map(ProcessInfoEO::getId).distinct().collect(Collectors.toList()); + List processInfoIdList = datas.stream().map(ProcessInfoVO::getId).distinct().collect(Collectors.toList()); QueryWrapper processInfoDetailQueryWrap = new QueryWrapper<>(); processInfoDetailQueryWrap.lambda().in(ProcessInfoDetailEO::getProcessInfoId,processInfoIdList); @@ -270,6 +275,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl taskIdList = datas.stream().map(ProcessInfoVO::getTaskId).distinct().collect(Collectors.toList()); + List taskInventoryDetailList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(taskIdList)){ + QueryWrapper taskInventoryDetailQueryWrap = new QueryWrapper<>(); + taskInventoryDetailQueryWrap.lambda().in(ProjectTaskInventoryDetailEO::getTaskId,taskIdList); + taskInventoryDetailList = this.projectTaskInventoryDetailEOService.list(taskInventoryDetailQueryWrap); + } + List finalTaskInventoryDetailList = taskInventoryDetailList; + List sysUserList = this.sysUserService.querySysUserListByIdList(userIdList); datas.forEach(data -> { @@ -306,6 +320,18 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(data.getTaskId(), taskInventoryDetail.getTaskId())) { + flag = true; + } + return flag; + }).map(ProjectTaskInventoryDetailEO::getId).collect(Collectors.joining(",")); + data.setPrimaryKeyId(primaryKeyId); + } }); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java new file mode 100644 index 000000000..89626d3c6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java @@ -0,0 +1,101 @@ +package com.jero.modules.todoCenter.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * 流程信息表VO类 + */ +@Data +public class ProcessInfoVO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + private String id; + + /**创建人*/ + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + + /**更新人*/ + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + + /**所属部门*/ + private String sysOrgCode; + + /**项目库id*/ + private String projectLibraryId; + + /**法规清单id*/ + private String projectLawsInventoryId; + + /**文档库id/标准id*/ + private String bussDocumentLibraryId; + + /**流程实例id*/ + private String actiProcInstId; + + /**流程类型*/ + private String flowType; + + /**截止日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date endTime; + + /**任务状态*/ + private String status; + + /**流程编号**/ + private String prcNum; + + /**流程名称*/ + private String prcName; + + /**流程类型展示字段*/ + private String flowTypeShow; + + /**任务状态展示字段*/ + private String statusShow; + + /**上一个操作人 用户id*/ + private String lastAssignee; + private String lastAssigneeName; + + /**当前操作人/代理人 用户id*/ + private String assignee; + private String assigneeName; + + /**标准编号*/ + private String serialNumber; + /**标准标题*/ + private String title; + /**项目名称*/ + private String projectName; + /**年份*/ + private String yearName; + /**待办id*/ + private String taskId; + /**任务节点定义key*/ + private String taskDefinitionKey; + /**项目名称id*/ + private String projectNameId; + /**目标市场*/ + private String targetMarket; + /**studio*/ + private String studioEngineer; + /**任务清单明细表id，任务清单明细数据与待办中心明细表 是taskId一对一的关系**/ + private String primaryKeyId; +} From 3fefe0198d8ad2dca2369210ba36042c3cf991f1 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 19 Oct 2022 14:46:06 +0800 Subject: [PATCH 031/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluatorFeedback.vue | 25 ++++- .../components/evaluatorFeedbackList.vue | 95 +++++++++++++++++-- .../processForm/evaluationProcess/index.vue | 6 +- .../components/SentList.vue | 36 ++++++- .../components/doneList.vue | 36 ++++++- .../regulatoryAssessmentTasks/index.vue | 5 +- 6 files changed, 186 insertions(+), 17 deletions(-) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index ef8d4b8d1..901df1907 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -156,12 +156,12 @@ -
+
{{$t('sponsorReview')}}
- +
@@ -175,6 +175,18 @@
+ + +
+
+ {{$t('reviewComments')}} +
+
+ {{formInline.approvalOpinion}} +
+
+ +
@@ -259,7 +271,8 @@ }, disabled: false, uploadIndex: '', - dataList: [] + dataList: [], + isTrue:false, } }, mounted() { @@ -283,8 +296,14 @@ }) if (this.$route.query.taskDefinitionKey == 'pgrqr') { this.disabled = false + if (this.$route.query.isDisabled) { + this.disabled = JSON.parse(this.$route.query.isDisabled) + } } else { this.disabled = true + if (this.$route.query.isDisabled) { + this.isTrue = JSON.parse(this.$route.query.isDisabled) + } } }, methods: { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 3b8473872..ec8a35034 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -282,6 +282,81 @@ ellipsis: true, scopedSlots: { customRender: 'sponsorFeedback' } } + ], + columnsOne: [ + { + title: this.$t('clauseNo'), + dataIndex: 'itemNum', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('clauseName'), + dataIndex: 'itemName', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('clauseContent'), + dataIndex: 'itemContent', + align: 'center', + width: 280, + scopedSlots: { customRender: 'clauseContent' } + }, + { + title: this.$t('evaluationMethod'), + dataIndex: 'evaluationMethodsName', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('complianceResults'), + dataIndex: 'complianceResult', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'Results' } + }, + { + title: this.$t('nameTechnicalDocument'), + dataIndex: 'technicalFileName', + align: 'center', + width: 280, + ellipsis: true + }, + { + title: this.$t('chapter'), + dataIndex: 'section', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('opinion'), + dataIndex: 'opinion', + align: 'center', + width: 180, + ellipsis: true + }, + { + title: this.$t('enclosure'), + dataIndex: 'accessoryFile', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'accessoryFile' } + }, + { + title: this.$t('sponsorFeedback'), + dataIndex: 'sponsorFeedback', + align: 'center', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'sponsorFeedbackIndex' } + } ] } }, @@ -306,10 +381,18 @@ }, computed: { columns() { - if (this.$route.query.taskDefinitionKey == 'pgrqr') { - return this.columnsTwo + let disabled = false + if (this.$route.query.isDisabled) { + disabled = JSON.parse(this.$route.query.isDisabled) + } + if (disabled) { + return this.columnsOne } else { - return this.columnsThree + if (this.$route.query.taskDefinitionKey == 'pgrqr') { + return this.columnsTwo + } else { + return this.columnsThree + } } } }, @@ -345,14 +428,14 @@ this.$message.warning(this.$t('PleaseCompleteList')) return } - Object.keys(this.dataSource[i]).forEach(res=>{ + Object.keys(this.dataSource[i]).forEach(res => { if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') { this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“') this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘') } }) } - if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + if (this.$route.query.taskDefinitionKey == 'pgrqr') { let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') for (let i = 0; i < this.dataSource.length; i++) { this.dataSource[i].feedbackTime = feedbackTime @@ -361,7 +444,7 @@ callBack && callBack(this.dataSource) }, preservationData(callBack) { - if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + if (this.$route.query.taskDefinitionKey == 'pgrqr') { let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') for (let i = 0; i < this.dataSource.length; i++) { this.dataSource[i].feedbackTime = feedbackTime diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 7f592203a..caf22adff 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -26,7 +26,7 @@ :title="$t('evaluatorFeedback')" /> {{$t('standardInformation')}}
+ v-model="queryParam.serialNumber"> @@ -21,7 +21,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.taskType"> + v-model="queryParam.flowType"> @@ -81,7 +81,6 @@ value: '6' } ], - taskStatusList: [], tabActive: this.$t('toDoProcess') } }, From f6d498e0bf89991f1d9e88c35c517410dd61d3f5 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 19 Oct 2022 19:43:20 +0800 Subject: [PATCH 032/108] update --- .../impl/ProcessInfoDetailEOServiceImpl.java | 3 ++ .../impl/ProcessInfoEOServiceImpl.java | 28 +++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index 89f5ae0d2..cd0617cd6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -18,6 +18,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 流程信息明细表 @@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProcessInfoDetailEOServiceImpl extends ServiceImpl implements IProcessInfoDetailEOService { /** 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 7bc7a9b8c..3663525d1 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 @@ -32,6 +32,8 @@ import java.util.*; 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; /** * @Description: 流程信息表 @@ -40,6 +42,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProcessInfoEOServiceImpl extends ServiceImpl implements IProcessInfoEOService { @Autowired @@ -305,18 +308,21 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl { - boolean flag = false; - for (String assignee : assigneeArr) { - if (StringUtils.equals(assignee, sysUser.getId())) { - flag = true; + //如果流程没有结束，才可以展示当前处理人。 + if(!StringUtils.equals(data.getStatus(),TodoCenterStatusEnum.COMPLETED.getValue())){ + if(StringUtils.isNotEmpty(data.getAssignee())){ + String[] assigneeArr = data.getAssignee().split(","); + String currentUserName = sysUserList.stream().filter(sysUser -> { + boolean flag = false; + for (String assignee : assigneeArr) { + if (StringUtils.equals(assignee, sysUser.getId())) { + flag = true; + } } - } - return flag; - }).map(SysUser::getUsername).collect(Collectors.joining(",")); - data.setAssigneeName(currentUserName); + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + data.setAssigneeName(currentUserName); + } } } data.setProjectName(data.getProjectName() + "-" + data.getYearName()); From a9615d9d03816a1170d85af15c6fbf6cac2277ba Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 20 Oct 2022 09:15:14 +0800 Subject: [PATCH 033/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SentList.vue | 16 ++++ .../components/doneList.vue | 19 ++++- .../components/SentList.vue | 16 ++++ .../components/doneList.vue | 85 +++++++++++-------- 4 files changed, 100 insertions(+), 36 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 173df447b..66e4ff628 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -12,6 +12,8 @@ > + {{$t('monitoringProcess')}} {{$t('view')}} @@ -120,6 +122,17 @@ this.getList() }, methods: { + monitoringProcessClick(row) { + let newUrl = this.$router.resolve({ + path: '/processDetails', + query: { + prcNum: row.prcNum, + prcType: row.flowType, + prcId: row.actiProcInstId + } + }) + window.open(newUrl.href, '_blank') + }, RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', @@ -332,4 +345,7 @@ margin-top: 20px; } + .text-operation { + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 193c0351a..7b70d0870 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -12,9 +12,11 @@ > + {{$t('monitoringProcess')}} {{$t('view')}} - + {{text}} @@ -120,6 +122,17 @@ this.getList() }, methods: { + monitoringProcessClick(row){ + let newUrl = this.$router.resolve({ + path: '/processDetails', + query: { + prcNum: row.prcNum, + prcType:row.flowType, + prcId:row.actiProcInstId, + } + }) + window.open(newUrl.href, '_blank') + }, RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', @@ -331,5 +344,7 @@ text-align: right; margin-top: 20px; } - + .text-operation{ + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index b74e14c5c..4ca82fb5b 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -12,6 +12,8 @@ > + {{$t('monitoringProcess')}} {{$t('view')}} @@ -106,6 +108,17 @@ } }, methods: { + monitoringProcessClick(row) { + let newUrl = this.$router.resolve({ + path: '/processDetails', + query: { + prcNum: row.prcNum, + prcType: row.flowType, + prcId: row.actiProcInstId + } + }) + window.open(newUrl.href, '_blank') + }, standardInformationClick(item) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', @@ -207,4 +220,7 @@ margin-top: 20px; } + .text-operation { + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 113af5d43..2b30f7c8b 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -12,6 +12,8 @@ > + {{$t('monitoringProcess')}} {{$t('view')}} @@ -36,13 +38,14 @@ @@ -206,4 +220,7 @@ margin-top: 20px; } + .text-operation { + margin-right: 8px; + } \ No newline at end of file From f5933dd36d692c43a569ccbfeb1e78cbb8676c78 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 20 Oct 2022 11:37:57 +0800 Subject: [PATCH 034/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 ++ .../mapper/ParamsCollectManifestEOMapper.java | 2 + .../xml/ParamsCollectManifestEOMapper.xml | 4 + .../ParamsManifestTodoCenterServiceImpl.java | 88 +++++++++++++------ 4 files changed, 76 insertions(+), 25 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 351bc7440..330771cdf 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1219,6 +1219,13 @@ CREATE TABLE `laws_weilai`.`process_info_detail` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程信息明细表' ROW_FORMAT = Dynamic; +-- 参数项收集清单 添加索引 2022-10-14 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_collect_manifest` + ADD INDEX `index_pcm_nio_number`(`nio_number`) USING BTREE, + ADD INDEX `index_pcm_state`(`state`) USING BTREE, + ADD INDEX `index_pcm_sdt_dre`(`sdt`, `dre`) USING BTREE, + ADD INDEX `index_pcm_manifest_id`(`params_manifest_id`) USING BTREE; + -- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境 ALTER TABLE `laws_weilai`.`process_info_detail` ADD COLUMN `end_time` datetime NULL COMMENT '截止时间' AFTER `flow_type`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index 1166ad6d3..76eedb79c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -18,6 +18,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); + List listInfoOfTodoCenter(); + List> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); // 查询控件类型为 标题的 参数项 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 9a10df792..026244f6a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -80,6 +80,10 @@ order by del_flag desc, add_flag desc, change_flag desc, nio_number asc + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java index 14f39623b..6606cf1fa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java @@ -71,29 +71,50 @@ public interface IProcessInfoEOService extends IService { Result processCall(JSONObject jsonObject); /** - * 待办任务列表 + * 项目流程-待办任务列表 * @param params * @return */ - IPage todoTaskList(Map params); + IPage projectProcessTodoTaskList(Map params); /** - * 已办任务列表 + * 项目流程-已办任务列表 * @param params * @return */ - IPage doneProcess(Map params); + IPage projectProcessDoneProcess(Map params); /** - * 已发任务列表 + * 项目流程-已发任务列表 * @param params * @return */ - IPage issuedProcess(Map params); + IPage projectProcessIssuedProcess(Map params); /** * 法规清单变更，清除对应待办中心数据。 * @param params */ void change(Map params); + + /** + * 法规评估-待办任务列表 + * @param params + * @return + */ + IPage lawsAssessTodoTaskList(Map params); + + /** + * 法规评估-已办任务列表 + * @param params + * @return + */ + IPage lawsAssessDoneProcess(Map params); + + /** + * 法规评估-已发任务列表 + * @param params + * @return + */ + IPage lawsAssessIssuedProcess(Map params); } 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 1122d636f..c27cdb968 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 @@ -99,6 +99,10 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl ids) { removeByIds(ids); + + QueryWrapper detailRemoveWrap = new QueryWrapper<>(); + detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProcessInfoId,ids); + this.processInfoDetailEOService.remove(detailRemoveWrap); } /** @@ -150,7 +154,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl params) { + public IPage projectProcessTodoTaskList(Map params) { Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); String cut = (String) params.get("cut"); @@ -174,7 +178,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl params) { + public IPage projectProcessDoneProcess(Map params) { Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); String cut = (String) params.get("cut"); @@ -188,13 +192,13 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryPageList(page,params); + IPage result = this.baseMapper.queryProjectProcessPageList(page,params); this.disposeData(result.getRecords(),cut); return result; } @Override - public IPage issuedProcess(Map params) { + public IPage projectProcessIssuedProcess(Map params) { Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); String cut = (String) params.get("cut"); @@ -208,7 +212,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryPageList(page,params); + IPage result = this.baseMapper.queryProjectProcessPageList(page,params); this.disposeData(result.getRecords(),cut); return result; } @@ -274,14 +278,82 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl processInfoEOList = this.list(processInfoQueryWrap); if(CollectionUtils.isNotEmpty(processInfoEOList)){ List processInfoIdList = processInfoEOList.stream().map(ProcessInfoEO::getId).distinct().collect(Collectors.toList()); - QueryWrapper detailRemoveWrap = new QueryWrapper<>(); + /*QueryWrapper detailRemoveWrap = new QueryWrapper<>(); detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProcessInfoId,processInfoIdList); - this.processInfoDetailEOService.remove(detailRemoveWrap); + this.processInfoDetailEOService.remove(detailRemoveWrap);*/ this.deleteByIds(processInfoIdList); } } } + @Override + public IPage lawsAssessTodoTaskList(Map params) { + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + String cut = (String) params.get("cut"); + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + params.put("createBy",currentUser.getId()); + params.put("queryType","todoProcess"); + + List flowTypeList = new ArrayList<>(); + flowTypeList.add(FlowTypeEnum.FGYJSJLC.getValue()); + flowTypeList.add(FlowTypeEnum.FGJSPG.getValue()); + params.put("flowTypeList",flowTypeList); + params.put("currentUserId",currentUser.getId()); + params.put("taskStatus", TaskStatusEnum.NOT_DONE.getValue()); + + IPage page = new Page(pageNo, pageSize); + IPage result = this.baseMapper.queryLawsAssessPageList(page,params); + this.disposeData(result.getRecords(),cut); + return result; + } + + @Override + public IPage lawsAssessDoneProcess(Map params) { + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + String cut = (String) params.get("cut"); + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + params.put("createBy",currentUser.getId()); + params.put("queryType","doneProcess"); + + List flowTypeList = new ArrayList<>(); + flowTypeList.add(FlowTypeEnum.FGYJSJLC.getValue()); + flowTypeList.add(FlowTypeEnum.FGJSPG.getValue()); + params.put("flowTypeList",flowTypeList); + params.put("currentUserId",currentUser.getId()); + params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue()); + + IPage page = new Page(pageNo, pageSize); + IPage result = this.baseMapper.queryLawsAssessPageList(page,params); + this.disposeData(result.getRecords(),cut); + return result; + } + + @Override + public IPage lawsAssessIssuedProcess(Map params) { + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + String cut = (String) params.get("cut"); + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + params.put("createBy",currentUser.getId()); + params.put("queryType","issuedProcess"); + + List flowTypeList = new ArrayList<>(); + flowTypeList.add(FlowTypeEnum.FGYJSJLC.getValue()); + flowTypeList.add(FlowTypeEnum.FGJSPG.getValue()); + params.put("flowTypeList",flowTypeList); + params.put("currentUserId",currentUser.getId()); + + IPage page = new Page(pageNo, pageSize); + IPage result = this.baseMapper.queryLawsAssessPageList(page,params); + this.disposeData(result.getRecords(),cut); + return result; + } + public void setFlowTypeList(List flowTypeList){ flowTypeList.add(FlowTypeEnum.QDQR.getValue()); flowTypeList.add(FlowTypeEnum.RWQRLC.getValue()); @@ -290,6 +362,11 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl datas, String cut){ if(CollectionUtils.isNotEmpty(datas)){ List processInfoIdList = datas.stream().map(ProcessInfoVO::getId).distinct().collect(Collectors.toList()); From 844be1fc64d151b8ca3e73e765366e4e06e3e1e4 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 21 Oct 2022 11:25:16 +0800 Subject: [PATCH 037/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryAssessmentTasks/components/SentList.vue | 2 +- .../regulatoryAssessmentTasks/components/dealtWith.vue | 2 +- .../regulatoryAssessmentTasks/components/doneList.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 4ca82fb5b..8e70048dc 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -46,7 +46,7 @@ dataSource: [], loading: false, url: { - list: '' + list: '/todoCenter/lawsAssess/issuedProcess' }, columns: [ { diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 7a68c579a..054326850 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -92,7 +92,7 @@ pageSize: 10, pageNo: 1, url: { - list: '' + list: '/todoCenter/lawsAssess/todoTaskList' }, total: 0, queryParam: {} diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 2b30f7c8b..7656d4ffc 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -103,7 +103,7 @@ total: 0, queryParam: {}, url: { - list: '' + list: '/todoCenter/lawsAssess/doneProcess' } } }, From 4e235565a3585ba0e43fdf79a739990268bfb87a Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 21 Oct 2022 11:27:51 +0800 Subject: [PATCH 038/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryAssessmentTasks/components/SentList.vue | 3 +++ .../regulatoryAssessmentTasks/components/dealtWith.vue | 3 +++ .../regulatoryAssessmentTasks/components/doneList.vue | 3 +++ 3 files changed, 9 insertions(+) diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 8e70048dc..4fe67c660 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -107,6 +107,9 @@ queryParam: {} } }, + mounted() { + this.getList() + }, methods: { monitoringProcessClick(row) { let newUrl = this.$router.resolve({ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 054326850..e12a22a1b 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -98,6 +98,9 @@ queryParam: {} } }, + mounted() { + this.getList() + }, methods: { standardInformationClick(item) { let newUrl = this.$router.resolve({ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 7656d4ffc..10309f1ff 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -107,6 +107,9 @@ } } }, + mounted() { + this.getList() + }, methods: { monitoringProcessClick(row) { let newUrl = this.$router.resolve({ From 84205f832844262e41734083ee39854326a1a616 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 21 Oct 2022 13:44:43 +0800 Subject: [PATCH 039/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 5 ++++- .../projectRegulationTasks/components/dealtWith.vue | 5 ++++- .../projectRegulationTasks/components/doneList.vue | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 66e4ff628..227033dbd 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -21,7 +21,10 @@ {{text}} - {{text}} + + {{text}} + + --
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 22a3cd251..da56168b1 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -19,7 +19,10 @@ {{text}} - {{text}} + + {{text}} + + --
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 7b70d0870..7681f074b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -18,10 +18,15 @@ @click="viewClick(record)">{{$t('view')}} - {{text}} + + {{text}} + - {{text}} + + {{text}} + + --
From 5265f070fdc1a64e641328427186d821990973b4 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 21 Oct 2022 15:36:54 +0800 Subject: [PATCH 040/108] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reviewedByThePersonInCharge.vue | 20 ++++++++++++++++--- .../components/taskCirculationHistory.vue | 2 +- .../processForm/processDetails/index.vue | 5 ++++- .../components/SentList.vue | 14 ++++++------- .../components/doneList.vue | 14 ++++++------- .../components/SentList.vue | 14 ++++++------- .../components/doneList.vue | 14 ++++++------- 7 files changed, 50 insertions(+), 33 deletions(-) diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index fc760921f..d6b425ba9 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -72,7 +72,7 @@ - +
* @@ -88,16 +88,30 @@
+ +
+
+ {{$t('feedbackFromTheEngineer')}} +
+ + + {{formInline.engineerFeedbackContent}}lsdk fjlsdk说的翻开历史大家饭卡里说的发精神独立开发就收到分厘卡电视机反倒是风口浪尖是发流口水的房间第三方 + 代课老师发决定是否考虑的健身房了多少积分独立思考就点十六分就的说服力士大夫但是 + + +
+
- + {{$t('Deliverables')}}
- + diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 8c64c8228..145539870 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -80,7 +80,7 @@ methods: { getList() { let query = { - actiProcInstId: this.$route.query.actiProcInstId + actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId } this.loading = true getAction('/wkflow/processHistoryEO/list', query).then((res) => { diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue index 875ca81b0..f3ab23d05 100644 --- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue +++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue @@ -15,6 +15,7 @@
+
@@ -22,6 +23,7 @@ @@ -167,6 +286,7 @@ text-overflow: ellipsis; white-space: nowrap; } + /*.top-admin {*/ /* font-size: 16px;*/ /* font-family: Blue Sky Noto;*/ From 8d630e4777a5839332fc51b2f29f0da97962e1b0 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 21 Oct 2022 17:04:12 +0800 Subject: [PATCH 045/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ojectTaskInventoryDetailEOServiceImpl.java | 10 +-- .../mapper/xml/ProcessInfoEOMapper.xml | 4 +- .../impl/ProcessInfoEOServiceImpl.java | 62 ++++++++++--------- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 882059144..144f559e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -222,10 +222,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl processInfoDetailUpdateWrap= new LambdaUpdateWrapper(); - processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId()); - processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus()); - this.processInfoDetailEOService.update(processInfoDetailUpdateWrap); + if(taskInventoryDetailById != null){ + LambdaUpdateWrapper processInfoDetailUpdateWrap= new LambdaUpdateWrapper(); + processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId()); + processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus()); + this.processInfoDetailEOService.update(processInfoDetailUpdateWrap); + } } } 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 a4c8fd37d..78c88a657 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 @@ -148,8 +148,8 @@ pi.acti_proc_inst_id, pni.project_name, pyni.year_name, - pli.serial_number, - pli.title, + '--' as serial_number, + '' as title, pi.flow_type, createBy.username AS "create_by", (select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time, 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 bfbac3a96..f25a0ac1b 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 @@ -510,38 +510,40 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl taskInventoryQueryWrap = new QueryWrapper<>(); - taskInventoryQueryWrap.and(queryWrap -> { - queryWrap.lambda().in(ProjectTaskInventoryEO::getDesignPId,complianceProcessPrcIdList) - .or().in(ProjectTaskInventoryEO::getPrehomoPId,complianceProcessPrcIdList) - .or().in(ProjectTaskInventoryEO::getVerifyPId,complianceProcessPrcIdList); - }); - //查询出符合性流程相关的任务清单信息。 - List taskInventoryList = this.projectTaskInventoryEOService.list(taskInventoryQueryWrap); + if(CollectionUtils.isNotEmpty(complianceProcessPrcIdList)){ + QueryWrapper taskInventoryQueryWrap = new QueryWrapper<>(); + taskInventoryQueryWrap.and(queryWrap -> { + queryWrap.lambda().in(ProjectTaskInventoryEO::getDesignPId,complianceProcessPrcIdList) + .or().in(ProjectTaskInventoryEO::getPrehomoPId,complianceProcessPrcIdList) + .or().in(ProjectTaskInventoryEO::getVerifyPId,complianceProcessPrcIdList); + }); + //查询出符合性流程相关的任务清单信息。 + List taskInventoryList = this.projectTaskInventoryEOService.list(taskInventoryQueryWrap); - datas.forEach(data -> { - boolean designFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()); - boolean preHomoFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue()); - boolean verifyFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()); - String personChargeFeedback = taskInventoryList.stream().filter(taskInventory -> { - boolean flag = false; - if(designFlowFlag){ - if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getDesignPId())){ - flag = true; + datas.forEach(data -> { + boolean designFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()); + boolean preHomoFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue()); + boolean verifyFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()); + String personChargeFeedback = taskInventoryList.stream().filter(taskInventory -> { + boolean flag = false; + if(designFlowFlag){ + if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getDesignPId())){ + flag = true; + } + }else if(preHomoFlowFlag){ + if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getPrehomoPId())){ + flag = true; + } + }else if(verifyFlowFlag){ + if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getVerifyPId())){ + flag = true; + } } - }else if(preHomoFlowFlag){ - if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getPrehomoPId())){ - flag = true; - } - }else if(verifyFlowFlag){ - if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getVerifyPId())){ - flag = true; - } - } - return flag; - }).map(ProjectTaskInventoryEO::getDesignPersonChargeFeedback).collect(Collectors.joining(",")); + return flag; + }).map(ProjectTaskInventoryEO::getDesignPersonChargeFeedback).collect(Collectors.joining(",")); - data.setPersonChargeFeedback(personChargeFeedback); - }); + data.setPersonChargeFeedback(personChargeFeedback); + }); + } } } From 3317565ebe331c9f931c8741d2b41110283f77e3 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 24 Oct 2022 09:52:33 +0800 Subject: [PATCH 046/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluatorFeedback.vue | 30 ++++++++++--------- .../components/evaluatorFeedbackList.vue | 4 ++- .../components/feedbackInformation.vue | 7 +++++ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 901df1907..66b4c56aa 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -156,7 +156,8 @@
-
+
{{$t('sponsorReview')}}
@@ -175,18 +176,18 @@
- - -
-
- {{$t('reviewComments')}} -
-
- {{formInline.approvalOpinion}} -
-
- - + + + + + + + + + + + +
@@ -272,7 +273,7 @@ disabled: false, uploadIndex: '', dataList: [], - isTrue:false, + isTrue: false } }, mounted() { @@ -462,4 +463,5 @@ white-space: normal; word-break: break-all; } + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index ec8a35034..e3cdc3930 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -74,7 +74,9 @@ -- - {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}} + {{$t('accord')}} + {{$t('nonConformity')}} + -- @@ -68,6 +69,7 @@ }]">
@@ -85,6 +87,7 @@ {max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' }]"> @@ -104,6 +107,7 @@ }]">
@@ -301,4 +305,7 @@ margin-left: 8px; cursor: pointer; } + ::v-deep .ant-input-disabled{ + color: #000F16; + } \ No newline at end of file From 744cea784da556d9f3731b452ec38902ddf97626 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 24 Oct 2022 15:00:20 +0800 Subject: [PATCH 047/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E9=93=BE=E6=8E=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationReport/components/modules/defaultTemplate.vue | 4 ++-- .../regulationReport/components/modules/industryTemplate.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 4797f1267..864332d2e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -359,8 +359,8 @@ ], link: [ { - max: 100, - message: this.$t('link') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 1000, + message: this.$t('link') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index 8d73e3bbe..f9ecf20f6 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -229,8 +229,8 @@ ], link: [ { - max: 100, - message: this.$t('link') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 1000, + message: this.$t('link') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], From 33343c438d2d2dfcb2c6adcea7fe76fbb34df66e Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 24 Oct 2022 15:47:58 +0800 Subject: [PATCH 048/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E9=93=BE=E6=8E=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationReport/components/modules/defaultTemplate.vue | 4 ++-- .../regulationReport/components/modules/industryTemplate.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 864332d2e..ac203237e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -359,8 +359,8 @@ ], link: [ { - max: 1000, - message: this.$t('link') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), + max: 5000, + message: this.$t('link') + this.$t('cannotExceed') + 5000 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index f9ecf20f6..d265772bf 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -229,8 +229,8 @@ ], link: [ { - max: 1000, - message: this.$t('link') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), + max: 5000, + message: this.$t('link') + this.$t('cannotExceed') + 5000 + this.$t('Characters'), trigger: 'blur' } ], From 826354dbdd1b55fe77688824d00601738580c9e7 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 24 Oct 2022 17:40:03 +0800 Subject: [PATCH 049/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E9=93=BE=E6=8E=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 16 +++++++-------- .../components/modules/industryTemplate.vue | 20 +++++++++---------- .../components/modules/releaseStandard.vue | 6 +++--- .../components/modules/solicitOpinions.vue | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index ac203237e..a16ec2490 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -331,29 +331,29 @@ ], productionCarImplementTime: [ { - max: 100, - message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], newCarImplementTime: [ { - max: 100, - message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], issueTime: [ { - max: 100, - message: this.$t('releaseDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], implementCar: [ { - max: 100, - message: this.$t('implementationModel') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('implementationModel') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index d265772bf..41b44678b 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -194,36 +194,36 @@ ], relatedAreasEn: [ { - max: 100, - message: this.$t('relatedFieldsEn') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('relatedFieldsEn') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], relatedAreasCn: [ { - max: 100, - message: this.$t('relatedFields') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('relatedFields') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], sourceCn: [ { - max: 100, - message: this.$t('source') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('source') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], sourceEn: [ { - max: 100, - message: this.$t('sourceEn') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('sourceEn') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], time: [ { - max: 100, - message: this.$t('date') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('date') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue index 8fe91d578..35bf4c0d1 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue @@ -20,7 +20,7 @@ Date: Mon, 24 Oct 2022 17:58:41 +0800 Subject: [PATCH 050/108] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E3=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E3=80=82=20=E7=BC=96=E8=BE=91=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E5=90=8C=E6=AD=A5=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IProjectLawsInventoryEOService.java | 7 + .../ProjectLawsInventoryEOServiceImpl.java | 17 +- .../ProjectProcessTodoCenterController.java | 7 + .../service/IProcessInfoDetailEOService.java | 9 + .../service/IProcessInfoEOService.java | 2 + .../impl/ProcessInfoDetailEOServiceImpl.java | 48 ++++ .../impl/ProcessInfoEOServiceImpl.java | 220 +++++++++++++++++- .../feginClient/WorkFlowFeignClient.java | 8 + .../impl/WorkFlowFeignClientImpl.java | 9 + 9 files changed, 322 insertions(+), 5 deletions(-) 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 fde39e439..7554c278d 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 @@ -9,10 +9,13 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.system.entity.SysRole; +import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; +import com.jero.modules.todoCenter.entity.ProcessInfoEO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; import java.util.Map; @@ -149,4 +152,8 @@ public interface IProjectLawsInventoryEOService extends IService expediting(JSONObject json); List getRoleByUserId(String projectLibraryId,String cut); + + void addProcessInfo(ProcessInfoEO processInfoEO, String projectLibraryId, Date endTime); + + void addProcessInfoDetail(String processInfoId, List processInfoDetailEOList, Date endTime); } 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 6963ab4c5..c2b2098d7 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 @@ -576,9 +576,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoQueryWrap = new QueryWrapper<>(); @@ -8689,7 +8701,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList,Date endTime){ + @Override + public void addProcessInfoDetail(String processInfoId, List processInfoDetailEOList, Date endTime){ processInfoDetailEOList.forEach(detail -> { detail.setProcessInfoId(processInfoId); detail.setFlowType(FlowTypeEnum.QDQR.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProjectProcessTodoCenterController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProjectProcessTodoCenterController.java index 9213aa709..06a5f5d59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProjectProcessTodoCenterController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProjectProcessTodoCenterController.java @@ -47,4 +47,11 @@ public class ProjectProcessTodoCenterController { IPage page = this.processInfoEOService.projectProcessIssuedProcess(params); return Result.OK(page); } + + @AutoLog(value = "待办中心-法规评估-初始化历史数据") + @ApiOperation(value="待办中心-法规评估-初始化历史数据", notes="待办中心-法规评估-初始化历史数据") + @GetMapping(value = "/initHistoryData") + public Result initHistoryData(@RequestParam Map params) { + return this.processInfoEOService.initHistoryData(params); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java index f72da7cba..72124c3b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java @@ -2,6 +2,7 @@ package com.jero.modules.todoCenter.service; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -73,4 +74,12 @@ public interface IProcessInfoDetailEOService extends IService processInfoDetailEOList); + + /** + * 更新待办中心流程信息明细表，处理人 + * @param projectLawsInventoryEO + * @param pId + * @param flowType + */ + void updateProcessInfoDetailUserId(ProjectLawsInventoryEO projectLawsInventoryEO, String pId, String flowType); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java index 6606cf1fa..65fa57838 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java @@ -117,4 +117,6 @@ public interface IProcessInfoEOService extends IService { * @return */ IPage lawsAssessIssuedProcess(Map params); + + Result initHistoryData(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index cd0617cd6..feb2a195e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.mapper.ProcessInfoDetailEOMapper; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; +import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; +import com.jero.modules.wkflow.enums.FlowTypeEnum; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -175,4 +179,48 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,pId); + queryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,flowType); + List processInfoDetailEOList = this.list(queryWrapper); + if(CollectionUtils.isNotEmpty(processInfoDetailEOList)){ + for (ProcessInfoDetailEO processInfoDetailEO : processInfoDetailEOList) { + if(StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())){ + if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){ + //更新责任人的任务 + processInfoDetailEO.setUserId(projectLawsInventoryEO.getDesignDutyId()); + } + if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){ + //更新发起人的任务 + processInfoDetailEO.setUserId(projectLawsInventoryEO.getDesignInitiatorId()); + } + } + if(StringUtils.equals(flowType, FlowTypeEnum.PREHOMOQRLC.getValue())){ + if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){ + //更新责任人的任务 + processInfoDetailEO.setUserId(projectLawsInventoryEO.getPrehomoDutyId()); + } + if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){ + //更新发起人的任务 + processInfoDetailEO.setUserId(projectLawsInventoryEO.getPrehomoInitiatorId()); + } + } + + if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){ + //更新责任人的任务 + processInfoDetailEO.setUserId(projectLawsInventoryEO.getVerifyDutyId()); + } + if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){ + //更新发起人的任务 + processInfoDetailEO.setUserId(projectLawsInventoryEO.getVerifyInitiatorId()); + } + } + this.baseMapper.updateById(processInfoDetailEO); + } + } + } } 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 f25a0ac1b..282560b60 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 @@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.jero.modules.project.enums.OperatorTypeEnum; -import com.jero.modules.project.enums.RequestSourceEnum; -import com.jero.modules.project.enums.TaskStatusEnum; +import com.jero.modules.project.enums.*; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysUser; @@ -24,12 +26,15 @@ import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.todoCenter.vo.ProcessInfoVO; 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.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -55,6 +60,12 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl initHistoryData(Map params) { + /** + * disposeType：处理类型 + * value: + * 10：清单确认 + * 1：任务确认 + * 2：设计符合性 + * 3：prehomo确认 + * 4：验证符合性 + * 5：法规意见收集 + * 6：法规技术评估 + * 多个之间使用英文逗号分隔. + */ + String disposeType = (String) params.get("disposeType"); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //查询出所有的法规清单数据 + List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(); + //查询出所有项目库信息 + List projectLibraryBaseList = this.projectLibraryBaseService.list(); + + //1、清单确认 + if(StringUtils.contains(disposeType,FlowTypeEnum.QDQR.getValue())){ + this.initQdqr(projectLawsInventoryEOList,projectLibraryBaseList); + } + + //2.任务确认 + if(StringUtils.contains(disposeType,FlowTypeEnum.RWQRLC.getValue())){ + this.initRwqr(projectLawsInventoryEOList,projectLibraryBaseList); + } + + return Result.OK("初始化数据成功",disposeType); + } + + /** + * 初始化清单确认 + * @param projectLawsInventoryEOList + * @param projectLibraryBaseList + */ + public void initQdqr(List projectLawsInventoryEOList,List projectLibraryBaseList){ + Map> qdqrMap = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = false; + if (StringUtils.equals(lawsInventory.getInventoryAffirmStatus(), InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue())) { + flag = true; + } + return flag; + }).collect(Collectors.groupingBy(ProjectLawsInventoryEO::getProjectLibraryId)); + + if(!Objects.isNull(qdqrMap)){ + for (Map.Entry> map : qdqrMap.entrySet()) { + String projectLibraryId = map.getKey(); + ProjectLibraryBase projectLibraryBaseEO = projectLibraryBaseList.stream().filter(projectLibraryBase -> { + boolean flag = false; + if(StringUtils.equals(projectLibraryId,projectLibraryBase.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()).get(0); + + List processInfoDetailEOList = new ArrayList<>(); + + List qdqrLawsInventoryList = map.getValue(); + if(CollectionUtils.isNotEmpty(qdqrLawsInventoryList)){ + qdqrLawsInventoryList.forEach(projectLawsInventoryEO-> { + boolean homologationEngineerFlag = ( + StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus()) + || StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),"1") + ); + boolean regulationOwnerFlag = ( + StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus()) + || StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(),"1") + ); + + if(homologationEngineerFlag){ + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId()); + processInfoDetailEO.setUserId(projectLawsInventoryEO.getHomologationEngineerId()); + processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.HOMOLOGATION_ENGINEER_AUDIT.getKey()); + processInfoDetailEO.setEndTime(projectLawsInventoryEO.getInventoryAffirmDueDate()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setCreateBy(projectLibraryBaseEO.getStudioEngineer()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + + processInfoDetailEOList.add(processInfoDetailEO); + } + if(regulationOwnerFlag){ + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId()); + processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()); + processInfoDetailEO.setEndTime(projectLawsInventoryEO.getInventoryAffirmDueDate()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setCreateBy(projectLibraryBaseEO.getStudioEngineer()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + + processInfoDetailEOList.add(processInfoDetailEO); + } + }); + + //往待办中心添加数据。 + ProcessInfoEO processInfoEO = new ProcessInfoEO(); + this.projectLawsInventoryEOService.addProcessInfo(processInfoEO,projectLibraryId,null); + this.projectLawsInventoryEOService.addProcessInfoDetail(processInfoEO.getId(),processInfoDetailEOList,null); + } + } + } + } + + /** + * 初始化任务确认 + * @param projectLawsInventoryEOList + * @param projectLibraryBaseList + */ + public void initRwqr(List projectLawsInventoryEOList,List projectLibraryBaseList){ + List> rwqrResult = this.workFlowFeignClient.queryProcessInfoByPrcType(FlowTypeEnum.RWQRLC.getValue()); + if(CollectionUtils.isNotEmpty(rwqrResult)){ + for (Map rwqrMap : rwqrResult) { + List lawsInventoryList = projectLawsInventoryEOList.stream().filter(projectLawsInventory -> { + boolean flag = false; + if (StringUtils.equals((String) rwqrMap.get("projectLawsInventoryId"), projectLawsInventory.getId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(lawsInventoryList)){ + ProjectLawsInventoryEO projectLawsInventoryEO = lawsInventoryList.get(0); + + rwqrMap.put("projectLibraryId",projectLawsInventoryEO.getProjectLibraryId()); + rwqrMap.put("projectLawsInventoryId",projectLawsInventoryEO.getId()); + rwqrMap.put("standId",projectLawsInventoryEO.getStandId()); + + List> taskMapList = (List>)rwqrMap.get("taskMapList"); + if(CollectionUtils.isNotEmpty(taskMapList)){ + addProcessInfo(rwqrMap); + } + } + } + } + } + + public void addProcessInfo(Map params){ + String prcNum = (String) params.get("prcNum"); + String prcName = (String) params.get("prcName"); + String actiProcInstId = (String) params.get("actiProcInstId"); + String flowType = (String) params.get("flowType"); + String endTimeStr = ""; + String projectLibraryId = ""; + String projectLawsInventoryId = ""; + String standId = ""; + String createBy = (String) params.get("createBy"); + if(StringUtils.equals(flowType,FlowTypeEnum.RWQRLC.getValue())){ + projectLibraryId = (String) params.get("projectLibraryId"); + projectLawsInventoryId = (String) params.get("projectLawsInventoryId"); + standId = (String) params.get("standId"); + endTimeStr = (String) params.get("endTime"); + } + + ProcessInfoEO processInfoEO = new ProcessInfoEO(); + processInfoEO.setId(actiProcInstId); + processInfoEO.setProjectLibraryId(projectLibraryId); + processInfoEO.setProjectLawsInventoryId(projectLawsInventoryId); + processInfoEO.setActiProcInstId(actiProcInstId); + processInfoEO.setFlowType(flowType); + processInfoEO.setPrcNum(prcNum); + processInfoEO.setPrcName(prcName); + processInfoEO.setBussDocumentLibraryId(standId); + + //截止日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date endTime = new Date(); + try { + endTime = sdf.parse(endTimeStr); + } catch (ParseException e) { + e.printStackTrace(); + } + processInfoEO.setEndTime(endTime); + processInfoEO.setStatus(TodoCenterStatusEnum.LIST_TO_CONFIRM.getValue()); + processInfoEO.setCreateBy(createBy); + this.baseMapper.insert(processInfoEO); + + List> taskMapList = (List>)params.get("taskMapList"); + List processInfoDetailEOList = new ArrayList<>(); + for (Map taskMap : taskMapList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setActiProcInstId((String) taskMap.get("actiProcInstId")); + processInfoDetailEO.setTaskId((String) taskMap.get("taskId")); + processInfoDetailEO.setTaskDefinitionKey((String) taskMap.get("taskDefinitionKey")); + processInfoDetailEO.setUserId((String) taskMap.get("userId")); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + processInfoDetailEO.setProcessInfoId(processInfoEO.getId()); + processInfoDetailEO.setFlowType(flowType); + processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryId); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setCreateBy(createBy); + + processInfoDetailEOList.add(processInfoDetailEO); + } + + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); + } } 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 51070cea7..3782ef9f7 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 @@ -181,4 +181,12 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByPrcIds",method = RequestMethod.GET) Result deleteProcessInstanceByPrcIds(@RequestParam("prcIds") String prcIds); + + /** + * 根据流程类型，查询未完成的流程信息 + * @param prcType + * @return + */ + @RequestMapping(value = "/bat-wkflow/datas/bus-process-name/queryProcessInfoByPrcType",method = RequestMethod.GET) + List> queryProcessInfoByPrcType(@RequestParam("prcType") String prcType); } 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 e8db6f85e..3dcbeb659 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 @@ -196,4 +196,13 @@ public class WorkFlowFeignClientImpl{ public Result deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){ return workFlowFeignClient.deleteProcessInstance(taskId); } + + /** + * 根据流程类型，查询未完成的流程信息 + * @param prcType + * @return + */ + public List> queryProcessInfoByPrcType(String prcType) { + return workFlowFeignClient.queryProcessInfoByPrcType(prcType); + } } From 7aeaa58063281a3f3e5f45ff548c9e14a2b5888c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 24 Oct 2022 18:06:46 +0800 Subject: [PATCH 051/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationReport/components/modules/defaultTemplate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index a16ec2490..a03fa0a4a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -115,7 +115,7 @@ :disabled="disabled" :placeholder="$t('PleaseSelect')+$t('status')" :type="'radio'" - :triggerChange="false" :dictCode="'state'"/> + :triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4'"/> From 91af6e71c6cfe729d590f65b0015a1814a8e8440 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 25 Oct 2022 09:34:31 +0800 Subject: [PATCH 052/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tools/HeaderNotice.vue | 14 ++- .../src/views/dashboard/components/myNews.vue | 11 +- .../src/views/system/UserAnnouncementList.vue | 117 ++++++++++++++---- 3 files changed, 109 insertions(+), 33 deletions(-) diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index 8ff499e95..e3ea56c27 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -15,7 +15,7 @@ @@ -110,6 +110,11 @@ // clearInterval(this.timer) // }, methods: { + getText(str) { + let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 + //.replace(/\s/g, '') //这里是去除空格 + return words + }, loadData() { getAction(this.url.listCementByUser).then((res) => { if (res.success) { @@ -134,9 +139,12 @@ showAnnouncement(record) { getAction(this.url.readAllMsg, { ids: record.id }).then((res) => { }) + localStorage.setItem('msgContent', record.msgContent) this.$router.push({ - path: '/system/MessageDetails', - query: record + path: '/isps/userAnnouncement', + query: { + Date: Date.now() + } }) }, toMyAnnouncement() { diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue index f1d76361c..719748291 100644 --- a/jero-web/src/views/dashboard/components/myNews.vue +++ b/jero-web/src/views/dashboard/components/myNews.vue @@ -11,8 +11,8 @@
-
- {{item.titile}} +
+ {{item.msgContent}}
{{item.sendTime}} @@ -69,9 +69,12 @@ magClick(row) { getAction(this.url.readAllMsg, { ids: row.id }).then((res) => { }) + localStorage.setItem('msgContent', row.msgContent) this.$router.push({ - path: '/system/MessageDetails', - query: row + path: '/isps/userAnnouncement', + query: { + Date: Date.now() + } }) }, moreClick() { diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index cd35b34c8..fbb96c3d5 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -6,12 +6,12 @@
-
- {{this.$t('MessageTitle')}} +
+ {{this.$t('MessageContent')}}
+ :placeholder="$t('pleaseEnter')+$t('MessageContent')" + v-model="queryParam.msgContent">
@@ -63,18 +63,28 @@ :dataSource="dataSource" :scroll="{x: '100%'}" :pagination="ipagination" + :expandIconAsCell='false' + :expandIconColumnIndex="5" + :expandIcon="expandIcon" :loading="loading" + @expand="expandChange" @change="handleTableChange"> - + + {{text}} - + + {{msgCategoryQuery[text]}} - + +

+ + +

@@ -104,8 +114,8 @@ msgCategoryQuery: { '1': this.$t('SubscriptionNotification'), '2': this.$t('warningInformation'), - '3': this.$t('ForwardPush'), - '4': this.$t('CollectinguthenticationParameters'), + '3': this.$t('ForwardPush') + // '4': this.$t('CollectinguthenticationParameters'), // '6':this.$t('RegulationListConfirmationTask'), // '7':this.$t('RegulationListConfirmationNotification'), // '8':this.$t('RegulationTaskConfirmation'), @@ -115,39 +125,48 @@ // '12':this.$t('DesignComplianceNotification'), // '13':this.$t('PreHomoNotification'), // '14':this.$t('ValidationComplianceNotification'), - '15':this.$t('RegulationTaskConfirmationNotification'), - '17':this.$t('listConfirmation'), - '18':this.$t('taskAffirm'), - '19':this.$t('complianceConfirmation'), - '20':this.$t('collectionLegislativeComments'), - '21':this.$t('regulatoryAndTechnicalAssessment'), + // '15':this.$t('RegulationTaskConfirmationNotification'), + // '17':this.$t('listConfirmation'), + // '18':this.$t('taskAffirm'), + // '19':this.$t('complianceConfirmation'), + // '20':this.$t('collectionLegislativeComments'), + // '21':this.$t('regulatoryAndTechnicalAssessment'), }, columns: [ { - title: this.$t('MessageTitle'), - align: 'center', - dataIndex: 'titile', + title: this.$t('MessageContent'), + align: 'left', + dataIndex: 'msgContent', ellipsis: true, scopedSlots: { customRender: 'msgTitile' } }, { title: this.$t('Sponsor'), - align: 'center', + align: 'left', + ellipsis: true, dataIndex: 'initiator', - width: 200, + width: 200 }, { title: this.$t('MessageType'), - align: 'center', + align: 'left', + ellipsis: true, dataIndex: 'msgCategory', width: 200, scopedSlots: { customRender: 'msgCategory' } }, { title: this.$t('NotificationTime'), - align: 'center', + align: 'left', + ellipsis: true, width: 200, dataIndex: 'sendTime' + }, + { + title:'', + align: 'left', + ellipsis: true, + width: 50, } ], url: { @@ -161,7 +180,42 @@ formData: '' } }, + watch: { + $route: function(res) { + console.log(res) + this.loadData() + } + }, methods: { + expandIcon(props) { + if (props.expanded) { + return { + props.onExpand(props.record, e); + }}/>; + } else { + return { + props.onExpand(props.record, e); + }}/>; + } + }, + getQueryParams() { + //获取查询条件 + let sqp = {} + if (this.superQueryParams) { + sqp['superQueryParams'] = encodeURI(this.superQueryParams) + sqp['superQueryMatchType'] = this.superQueryMatchType + } + if (localStorage.getItem('msgContent')) { + this.queryParam.msgContent = localStorage.getItem('msgContent') + this.queryParam = { ...this.queryParam } + localStorage.removeItem('msgContent') + } + var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters) + param.field = this.getQueryField() + param.pageNo = this.ipagination.current + param.pageSize = this.ipagination.pageSize + return filterObj(param) + }, showAnnouncement(record) { putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => { if (res.success) { @@ -177,6 +231,13 @@ this.$refs.ShowAnnouncement.detail(record) } }, + expandChange(isTrue, val) { + if (isTrue) { + if (val.readFlag == '0') { + this.msgContentClick(val) + } + } + }, readAll() { var that = this if (this.selectedRowKeys.length > 0) { @@ -204,11 +265,12 @@ }, msgContentClick(row) { getAction(this.url.readAllMsg, { ids: row.id }).then((res) => { + // this.loadData() }) - this.$router.push({ - path: '/system/MessageDetails', - query: row - }) + // this.$router.push({ + // path: '/system/MessageDetails', + // query: row + // }) }, handleDel() { var that = this @@ -297,6 +359,9 @@ height: 38px; /*margin-top: 2px;*/ } + ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon{ + margin-right: 0; + } \ No newline at end of file From 70e016fd1fbb12f652aed52247de3f9382799eb0 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 25 Oct 2022 14:01:49 +0800 Subject: [PATCH 054/108] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=9D=E6=AD=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/enums/MessageType2Enum.java | 41 ++++++ .../common/constant/enums/MsgColorEnum.java | 32 +++++ .../mapper/xml/ParamsManifestEOMapper.xml | 2 +- .../ParamsCollectManifestEOServiceImpl.java | 125 +++++++++--------- .../feishu/service/IFeishuService.java | 4 + .../service/impl/FeishuServiceImpl.java | 83 ++++++++++++ .../jero/modules/feishu/vo/FeishuMsg2Vo.java | 20 +++ 7 files changed, 240 insertions(+), 67 deletions(-) create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageType2Enum.java create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MsgColorEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsg2Vo.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageType2Enum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageType2Enum.java new file mode 100644 index 000000000..bf4544532 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageType2Enum.java @@ -0,0 +1,41 @@ +package com.jero.common.constant.enums; + +public enum MessageType2Enum { + + + SUBSCRIPTION_NOTIFICATION("Subscription Notification","订阅通知"), + SHARE_FORWARD("Share Forward","转发推送"), + REGULATION_EARLY_WARNING("Regulation Early Warning","法规预警"), + REGULATION_LIST_CONFIRMATION("Regulation List Confirmation","法规清单确认"), + REGULATION_TASK_CONFIRMATION("Regulation Task Confirmation","法规任务确认"), + DESIGN_COMPLIANCE_CONFIRMATION("Design Compliance Confirmation","设计符合性确认"), + PRE_HOMO_CONFIRMATION("Pre-Homo Confirmation","Pre-Homo确认"), + VALIDATION_COMPLIANCE_CONFIRMATION("Validation Compliance Confirmation","验证符合性确认"), + REGULATION_OPINION_COLLECTION("Regulation Opinion Collection","法规意见收集"), + REGULATION_TECHNICAL_ASSESSMENT("Regulation Technical Assessment","法规技术评估"), + HOMO_PARAMETER_COLLECTION("Homo Parameter Collection","认证参数收集"); + + String en; + String cn; + + MessageType2Enum(String en, String cn) { + this.en = en; + this.cn = cn; + } + + public String getEn() { + return en; + } + + public void setEn(String en) { + this.en = en; + } + + public String getCn() { + return cn; + } + + public void setCn(String cn) { + this.cn = cn; + } +} diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MsgColorEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MsgColorEnum.java new file mode 100644 index 000000000..ba74f1908 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MsgColorEnum.java @@ -0,0 +1,32 @@ +package com.jero.common.constant.enums; + +public enum MsgColorEnum { + + GREEN("其他","green"), + RED("任务被拒绝","red"), + YELLOW("任务预期","yellow"); + + String label; + String value; + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + MsgColorEnum(String label, String value) { + this.label = label; + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 17aad26e9..bc90c0103 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -147,7 +147,7 @@ select tmp_tb.* from( select plb.id as project_id, - concat(pni.project_name,'-',pyni.year_name,' ',target_market) as project_name + concat(pni.project_name,'-',pyni.year_name,'-',target_market,'-',project_version) as project_name from project_library_base plb left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id = pyni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 34349bfc1..7e9ba3277 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; -import com.jero.common.constant.enums.CutEnum; -import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.constant.enums.ModuleEnum; -import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.constant.enums.*; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; @@ -40,6 +37,7 @@ import com.jero.modules.cert.template.enums.ParamsIsMustEnum; import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.ocr.service.WebSocketServer; @@ -1512,7 +1510,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestEOList = listByIds(Arrays.asList(paramsCollectManifestIdStr)); paramsCollectManifestEOList = paramsCollectManifestEOList.stream().sorted(Comparator.comparing(ParamsCollectManifestBaseEO::getNioNumber)).collect(Collectors.toList()); // 按NIO编号升序 - for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) { + for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) { // 判断参数项状态 if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState()) || CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState()) @@ -1543,19 +1541,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl afterUpdateEOList = listByIds(updateEOIdList); - List sdtList = afterUpdateEOList.stream() - .map(ParamsCollectManifestEO::getSdt) - .distinct() - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(sdtList)) { - throw new JeroBootException("没有可下发的工程接口人！"); - } - for (String sdt : sdtList) { + if (isSuccess) { + // 消息内容 + List afterUpdateEOList = listByIds(updateEOIdList); + List sdtList = afterUpdateEOList.stream() + .map(ParamsCollectManifestEO::getSdt) + .distinct() + .collect(Collectors.toList()); + if (CollectionUtil.isEmpty(sdtList)) { + throw new JeroBootException("没有可下发的工程接口人！"); + } + for (String sdt : sdtList) { - StringBuilder connectBuilder = new StringBuilder(); + /* StringBuilder connectBuilder = new StringBuilder(); connectBuilder.append("You are required to fill in "); for (int i = 0; i < afterUpdateEOList.size(); i++) { ParamsCollectManifestEO paramsCollectManifestEO = afterUpdateEOList.get(i); @@ -1563,19 +1561,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; - String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; - String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete"; + SysUser sysUser = sysUserService.getUserByName(sdt); + String[] thirdIds = new String[1]; + thirdIds[0] = sysUser.getThirdId(); + String urlParamsStr = parseUrlParams(paramsManifestEO); + String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr; + //String href = "the link,"; + //String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; + //String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete"; - // 发送系统消息 - SysAnnouncement sysAnnouncement = new SysAnnouncement(); + // 发送系统消息 + /* SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); @@ -1592,24 +1590,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; - String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; - String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete"; + //String href = "the link,"; + //String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; + //String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete"; // 发送系统消息 - SysAnnouncement sysAnnouncement = new SysAnnouncement(); + /*SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); @@ -1726,28 +1711,36 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getMsgOfIssueCollection(List> msgMapList, String cut, String operation) { List msgList = new ArrayList<>(); Map collectManifestStateEnumMap = CollectManifestStateEnum.toMap(cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java index a1999a118..7c38d96f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -1,6 +1,7 @@ package com.jero.modules.feishu.service; import com.alibaba.fastjson.JSONObject; +import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.feishu.vo.FeishuMsgVo; import java.io.IOException; @@ -62,4 +63,7 @@ public interface IFeishuService { * @param split */ void sendKnowledgeBaseTypeChargePersonCard(String[] split); + + void sendCard(String[] thirdIds, FeishuMsg2Vo feishuMsgVo) throws IOException; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index b3367fda2..401c17a05 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; @@ -674,4 +675,86 @@ public class FeishuServiceImpl implements IFeishuService { } } + /** + * 发送消息 + * @param thirdIds + * @param feishuMsgVo + */ + @Override + public void sendCard(String[] thirdIds, FeishuMsg2Vo feishuMsgVo) throws IOException { + String token = getTenantAccessToken(); + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + + String sendJson = "{\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"elements\": [\n" + + " {\n" + + " \"tag\": \"markdown\",\n" + + " \"content\": \"" + feishuMsgVo.getCnContentUpper() + "\"\n" + + " },\n" + + " {\n" + + " \"tag\": \"markdown\",\n" + + " \"content\": \"" + feishuMsgVo.getCnContentLower() + "\"\n" + + " },\n" + + " {\n" + + " \"tag\": \"hr\"\n" + + " },\n" + + " {\n" + + " \"tag\": \"markdown\",\n" + + " \"content\": \"" + feishuMsgVo.getEnContentUpper() + "\"\n" + + " },\n" + + " {\n" + + " \"tag\": \"markdown\",\n" + + " \"content\": \"" + feishuMsgVo.getEnContentLower() + "\"\n" + + " },\n" + + " {\n" + + " \"actions\": [\n" + + " {\n" + + " \"tag\": \"button\",\n" + + " \"text\": {\n" + + " \"content\": \"View\",\n" + + " \"tag\": \"plain_text\"\n" + + " },\n" + + " \"type\": \"primary\",\n" + + " \"url\": \"" + feishuMsgVo.getUrl() + "\"\n" + + " }\n" + + " ],\n" + + " \"tag\": \"action\"\n" + + " }\n" + + " ],\n" + + " \"header\": {\n" + + " \"template\": \"" + feishuMsgVo.getColor() + "\",\n" + + " \"title\": {\n" + + " \"content\": \"" + feishuMsgVo.getTitle() + "\",\n" + + " \"tag\": \"plain_text\"\n" + + " }\n" + + " }\n" + + "}"; + + JSONObject jsonObject = JSONObject.parseObject(sendJson.toString()); + + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + + paramsMap.put("user_ids", thirdIds); + + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if (!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsg2Vo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsg2Vo.java new file mode 100644 index 000000000..11d701482 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsg2Vo.java @@ -0,0 +1,20 @@ +package com.jero.modules.feishu.vo; + +import lombok.Data; + +@Data +public class FeishuMsg2Vo { + + private String title; //标题 + + private String color; //颜色 + + private String enContentUpper; //英文内容上部 + private String enContentLower; //英文内容下部 + + private String cnContentUpper; //中文内容上部 + private String cnContentLower; //中文内容下部 + + private String url; //回调的网址 + +} From 7978d74b757f01d1ef3317b16d66a4a89f3d0b8a Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 25 Oct 2022 14:07:54 +0800 Subject: [PATCH 055/108] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileCompareItemCommentServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index c3c39bd8a..2a5b0ced8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -393,7 +393,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl right_length ? i + left_length : i + right_length; } if (includeComments || StringUtils.isEmpty(selectIds)) { Row row = sheet.createRow(i); From 335014cc209832d705e4c1ee4c42ed74bab9256c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 25 Oct 2022 15:20:28 +0800 Subject: [PATCH 056/108] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 13 ++- .../feishu/service/IFeishuService.java | 9 ++ .../service/impl/FeishuServiceImpl.java | 87 +++++++++++++++++++ 3 files changed, 106 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e53b0e1b1..4b4a4189e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3272,13 +3272,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + // 示例 + StringBuilder contentSb = new StringBuilder(); + contentSb.append("{"); + contentSb.append("\"elements\": ["); + // 补充内容 + if (StrUtil.isNotEmpty(feishuMsgVo.getContent())){ + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + feishuMsgVo.getContent() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + }; + + + contentSb.append("{\"tag\": \"hr\"},"); + contentSb.append("{"); + contentSb.append("\"actions\": ["); + contentSb.append("{"); + contentSb.append("\"tag\": \"button\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"view\","); + contentSb.append("\"tag\": \"plain_text\""); + contentSb.append("},"); + contentSb.append("\"type\": \"primary\","); + contentSb.append("\"url\": \" "+ feishuMsgVo.getUrl() +" \""); + contentSb.append("}"); + contentSb.append("],"); + contentSb.append("\"tag\": \"action\""); + contentSb.append("}"); + contentSb.append("],"); + + + + contentSb.append("\"header\": {"); + contentSb.append("\"template\": \"green\","); + contentSb.append("\"title\": {"); + contentSb.append("\"content\": \" " + feishuMsgVo.getTitle() + " \","); + contentSb.append("\"tag\": \"plain_text\""); + contentSb.append("}"); + contentSb.append("}"); + contentSb.append("}"); + + JSONObject jsonObject = JSONObject.parseObject(contentSb.toString()); + +// String content = JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()).get("content").toString(); +// String contentReplaceAll = content.replaceAll("<", "\""); +// JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()).put("content",contentReplaceAll); +// JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()); +// jsonObject1.put("content",contentReplaceAll); +// +// +// JSONObject text = JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()); +// text.put("value",jsonObject1); + + + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + return tokenJson.get("msg").toString(); + } + /** * 翻译文本 * 参数： From dc38f9546f3d59fc97875d49a33f007cc5915864 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 25 Oct 2022 15:27:00 +0800 Subject: [PATCH 057/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 8 +++++-- .../components/modules/defaultTemplate.vue | 24 ++++++++++++------- .../components/modules/industryTemplate.vue | 24 ++++++++++++------- .../splitting/modules/SplitDetail.vue | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 487daf815..f5588cdff 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -604,7 +604,7 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, - tempSaveClick(){ + tempSaveClick() { }, submit(releaseStatus) { @@ -845,10 +845,14 @@ .box-input-index { width: calc(100% - 130px); display: inline-block; - height: 38px; + height: 48px; margin-right: 10px; } + /*::v-deep .box-input-index .ant-select-selection--multiple {*/ + /* height: 44px!important;*/ + /*}*/ + .itemOption { display: inline-block; width: 100%; diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index a03fa0a4a..1bca8ea51 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -9,10 +9,14 @@ :title="$t('title')">{{$t('title')}}
- + + + + +
@@ -24,10 +28,14 @@ :title="$t('englishTitle')">{{$t('englishTitle')}}
- + + + + +
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index 41b44678b..8fb6a1f6e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -9,10 +9,14 @@ :title="$t('title')">{{$t('title')}}
- + + + + + @@ -24,10 +28,14 @@ :title="$t('englishTitle')">{{$t('englishTitle')}} - + + + + + diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 0c5a95218..043fd45b1 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -266,7 +266,7 @@ form: {}, rules: { name: [ - { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' }, + // { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' }, { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' } ], itemName: [ From 9013aceb9e249ea5b4ee488fb6ab08707b63944a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 25 Oct 2022 15:49:28 +0800 Subject: [PATCH 058/108] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8,=20?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E9=9D=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/report/entity/LawsMonthlyReportWriteEO.java | 2 +- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 11892a582..3d91a9ccb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -122,7 +122,7 @@ public class LawsMonthlyReportWriteEO implements Serializable { /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") - @Dict(dicCode = "state") + @Dict(dicCode = "fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4") private java.lang.String state; /**用法*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index cb571424d..d2abd92d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -1050,10 +1050,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Tue, 25 Oct 2022 16:04:21 +0800 Subject: [PATCH 059/108] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=AF=BC=E5=87=BA=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...awsOpinionAssessmentResultEOServiceImpl.java | 13 +++++++++++-- ...EvaluationComplianceResultEOServiceImpl.java | 17 +++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index df0bd1d1a..8722fb974 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -191,14 +191,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { String ids = (String)params.get("ids"); String cut = (String)params.get("cut"); + String lawsTechnologyEvaluationId = (String)params.get("lawsTechnologyEvaluationId"); + if(StringUtils.isEmpty(lawsTechnologyEvaluationId)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("法规技术评估id为空，请检查！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("The lawsTechnologyEvaluationId is empty, please check!"); + } + } + LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = this.lawsTechnologyEvaluationEOService.queryById(lawsTechnologyEvaluationId); if(!StringUtils.isEmpty(ids)){ lawsTechnologyEvaluationComplianceResultEO.setIds(ids); @@ -187,12 +200,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){ title = "相关章节,问题说明,附件"; bottomTitle = "符合性结果："; - fileName = "评估结果" + ".xls"; + fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " 评估结果" + ".xls"; sheetName = "反馈结果"; }else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){ title = "Related section,Problem description,Accessory"; bottomTitle = "Compliance results:"; - fileName = "Evaluation results" + ".xls"; + fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " Evaluation results" + ".xls"; sheetName = "Feedback result"; } From 8c4f948a864956917a90d91682beeac73f638582 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 25 Oct 2022 16:24:27 +0800 Subject: [PATCH 060/108] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=A1=E6=AC=BE=E5=8F=B7=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 3 +++ .../split/service/impl/FileSplitItemsEOServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index aa02d7fe1..706a8ec55 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1203,3 +1203,6 @@ MODIFY COLUMN `content_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ALTER TABLE `laws_weilai`.`laws_monthly_report_write` MODIFY COLUMN `work_progress_cn` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'NIO工作进展中文' AFTER `content_en`, MODIFY COLUMN `work_progress_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'NIO工作进展英文' AFTER `work_progress_cn`; + +--文档拆分条款 条款号取消必填 2022-10-25 未同步生产环境 +UPDATE `laws_weilai`.`onl_cgform_field` SET `field_must_input` = '0' WHERE `id` = '0a455895498552bc709dff250b3364b1' \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index b7a5cb5fa..761fb4294 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -2653,7 +2653,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Tue, 25 Oct 2022 17:16:14 +0800 Subject: [PATCH 061/108] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B6=88=E6=81=AF(=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B6=88=E6=81=AF=E6=B2=A1=E5=86=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 180 +++++++++++++++--- 1 file changed, 150 insertions(+), 30 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7e9ba3277..07ed93543 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1280,13 +1280,103 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl projectLibraryBases = projectLibraryBaseMapper.queryById(paramsManifestEO.getProjectId()); + if (ObjectUtils.isNotEmpty(projectLibraryBases)) { + SysUser engineer = sysUserService.getById(projectLibraryBases.get(0).getCertificationEngineer()); + if (ObjectUtils.isNotEmpty(engineer)) { + engThirdIds[0] = engineer.getThirdId(); + } + + } + if (CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())) { + //通知认证工程师 + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn()); + feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"退回了参数NIO-"+ paramsCollectManifestEO.getNioNumber() +"，请及时处理"); + feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() + + "\n发起人: " + currentUser.getUsername() + + "\n截止时间: " + deadline); + feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" has returned the Parameter NIO-"+ paramsCollectManifestEO.getNioNumber() +". Please address it in a timely manner"); + feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() + + "\nInitiator: " + currentUser.getUsername() + + "\nDue Date: " + deadline); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色 + feishuService.sendCard(engThirdIds, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } else if (CollectManifestStateEnum.DRE_BACK.getValue().equals(paramsCollectManifestEO.getState())) { + + //通知认证工程师 + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn()); + feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"申请撤回参数NIO-"+ paramsCollectManifestEO.getNioNumber() +"，请及时处理"); + feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() + + "\n发起人: " + currentUser.getUsername() + + "\n截止时间: " + deadline); + feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" requested for withdrawing Parameter NIO-"+ paramsCollectManifestEO.getNioNumber() +". Please address it in a timely manner"); + feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() + + "\nInitiator: " + currentUser.getUsername() + + "\nDue Date: " + deadline); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色 + feishuService.sendCard(engThirdIds, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + //通知工程接口人 + SysUser sdtUser = sysUserService.getUserByName(paramsCollectManifestEO.getSdt()); + String[] SdtThirdIds = new String[1]; + if (ObjectUtils.isNotEmpty(sdtUser)) { + SdtThirdIds[0] = sdtUser.getThirdId(); + } + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn()); + feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"退回了参数NIO-"+ paramsManifestEO.getTitle() +"，请及时处理"); + feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() + + "\n发起人: " + currentUser.getUsername() + + "\n截止时间: " + deadline); + feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" has returned the Parameter NIO-"+ paramsManifestEO.getTitle() +". Please address it in a timely manner"); + feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() + + "\nInitiator: " + currentUser.getUsername() + + "\nDue Date: " + deadline); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色 + feishuService.sendCard(engThirdIds, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + + } + + } + } + return update; } @Override @@ -1439,13 +1529,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; - String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it."; - String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; - String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete"; + //String href = "the link,"; + //String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it."; + //String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; + //String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete"; // 发送系统消息 - SysAnnouncement sysAnnouncement = new SysAnnouncement(); + /*SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); @@ -1462,10 +1552,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getMsgOfIssueCollection(List> msgMapList, String cut, String operation) { List msgList = new ArrayList<>(); From 853bceb72bac1d97d3669d447b67d51122d2e618 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 25 Oct 2022 17:39:51 +0800 Subject: [PATCH 062/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- jero-web/src/components/tableCollection/index1.vue | 2 +- .../components/problemKnowledgeBaseAdd.vue | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a567b381f..0f1cd2343 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -703,7 +703,7 @@ } } if (res.db_field_name == 'paramsName') { - this.columns[index].width = 200 + this.columns[index].width = 300 this.columns[index].scopedSlots = { customRender: 'paramsName' } diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index d966a7fad..24c653458 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -526,7 +526,7 @@ } } if (res.db_field_name == 'paramsName') { - this.columns[index].width = 200 + this.columns[index].width = 300 this.columns[index].ellipsis = false this.columns[index].scopedSlots = { customRender: 'paramsName' diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index f5588cdff..16acba02c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -849,9 +849,10 @@ margin-right: 10px; } - /*::v-deep .box-input-index .ant-select-selection--multiple {*/ - /* height: 44px!important;*/ - /*}*/ + ::v-deep .box-input-index .ant-select-selection--multiple::-webkit-scrollbar { + /*height: 52px!important;*/ + display: block; + } .itemOption { display: inline-block; From f223ab39aa7df9cfdf1a0ee86d895139ba7318b8 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 09:11:44 +0800 Subject: [PATCH 063/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index be0b822e1..cc87c7e03 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -509,8 +509,8 @@ module.exports = { AddProcess: '添加流程', RelatedItems: '相关项目', Sponsor: '发起人', - CurrentProcessor: '当前处理人', - LastProcessor: '上一处理人', + CurrentProcessor: '当前操作人', + LastProcessor: '上一操作人', ProcessingTime: '办理时间', cutoffTime: '截止时间', ProcessStatus: '流程状态', From 58624887e79dc13fc50ca2f78192a69d810d807d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 09:36:23 +0800 Subject: [PATCH 064/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/processForm/handshakeProcess/index.vue | 4 ++-- .../views/processCenter/processForm/taskListProcess/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index a9d2d721e..387cf0d84 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -186,10 +186,10 @@ this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { if (res instanceof String) { - this.queryBy = JSON.parse(res) + this.queryBy = JSON.parse(res) || {} callback() } else { - this.queryBy = res + this.queryBy = res || {} callback() } }) diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 26060f554..891cd4aea 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -401,10 +401,10 @@ this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { if (res instanceof String) { - this.queryBy = JSON.parse(res) + this.queryBy = JSON.parse(res) || {} callback() } else { - this.queryBy = res + this.queryBy = res || {} callback() } }) From 6a205514f8e80e9663db847c4b51ad138f784519 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 10:05:22 +0800 Subject: [PATCH 065/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/batchProcessing.vue | 16 ++++++++++++++++ .../views/toDoCenter/taskConfirmation/index.vue | 3 +++ 2 files changed, 19 insertions(+) diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue index 15f1ca777..ec5e2708f 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue @@ -9,6 +9,17 @@ @ok="handleOk" @cancel="handleCancel" > + @@ -68,6 +79,7 @@ + @@ -138,6 +150,10 @@ this.$refs.ruleForm.clearValidate() }) }, + sendBackClick() { + this.formInline.flag = '1' + this.handleOk() + }, flagChange(event) { if (event.target.value == 3) { this.isTrue = true diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index cb80eca13..be713ee56 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -181,6 +181,7 @@ window.open(newUrl.href, '_blank') }, batchProcessingForm() { + this.selectedRowKeys = [] this.getList() }, batchProcessingClick() { @@ -202,10 +203,12 @@ } }, searchQuery() { + this.selectedRowKeys = [] this.pageNo = 1 this.getList() }, searchReset() { + this.selectedRowKeys = [] this.pageNo = 1 this.queryParam = {} this.getList() From 959dec533ddd20e9ecef4dcfc88192de73464ce6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 10:47:37 +0800 Subject: [PATCH 066/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 6 +++--- .../projectRegulationTasks/components/dealtWith.vue | 4 ++-- .../projectRegulationTasks/components/doneList.vue | 4 ++-- .../regulatoryAssessmentTasks/components/SentList.vue | 4 +++- .../regulatoryAssessmentTasks/components/dealtWith.vue | 4 +++- .../regulatoryAssessmentTasks/components/doneList.vue | 4 +++- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index c0b9b4839..2e445401c 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -21,10 +21,10 @@ {{text}} - - {{text}} + + {{text+'、'+record.title}} - -- + --
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 9d8712a97..5ea5b7b43 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -19,8 +19,8 @@ {{text}} - - {{text}} + + {{text+'、'+record.title}} -- diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index e915c0064..559e9f016 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -23,8 +23,8 @@ - - {{text}} + + {{text+'、'+record.title}} -- diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index f162279f5..fb13eae0c 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -18,7 +18,9 @@ @click="viewClick(record)">{{$t('view')}} - {{text}} + + {{text+'、'+record.title}} +
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index e12a22a1b..72e8ebf30 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -16,7 +16,9 @@ @click="ProcessingClick(record)">{{$t('Processing')}} - {{text}} + + {{text+'、'+record.title}} +
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 7617fae4f..efc218fae 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -18,7 +18,9 @@ @click="viewClick(record)">{{$t('view')}} - {{text}} + + {{text+'、'+record.title}} +
From e252bb2890832fd3d404cb23f2ebab5c62c5e8b2 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 11:43:23 +0800 Subject: [PATCH 067/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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 | 6 +++++- .../components/problemKnowledgeBaseListView.vue | 6 +++++- .../components/problemKnowledgeBaseRelease.vue | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 375192fd7..35b7746c7 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -96,9 +96,13 @@ {{item.standNumber}}
- + {{item.targetMarket_dicText}}
+
+ + {{item.showPermissions_dicText}} +
{{item.createTime}} diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 4c0f51f27..511849faa 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -38,9 +38,13 @@ {{queryForm.standNumber}}
- + {{queryForm.targetMarket_dicText}}
+
+ + {{queryForm.showPermissions_dicText}} +
{{queryForm.createTime}} diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 16bc05889..edf3c31da 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -65,6 +65,9 @@
{{item.contentOne}}
+
+ {{item.showPermissions_dicText}} +
{{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
@@ -322,11 +325,21 @@ .text-text-right { padding: 19px 19px; - width: calc(100% - 300px); + width: calc(100% - 420px); box-sizing: border-box; /*margin-left: 38px;*/ } + .text-text-right-text-Two { + width: 120px; + height: 100%; + text-align: center; + position: absolute; + right: 300px; + top: 50%; + transform: translate-Y(-50%); + } + .text-text-right-text-One { width: 120px; height: 100%; From f57772c78be34797f44c25f7ee91351aba7b559c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 26 Oct 2022 14:23:42 +0800 Subject: [PATCH 068/108] =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E5=90=8E,=20=E7=BC=96=E8=BE=91=E6=97=B6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 345 +++++++++++++++++- .../service/impl/FeishuServiceImpl.java | 72 +++- .../jero/modules/feishu/vo/FeishuMsgVo.java | 2 + 3 files changed, 389 insertions(+), 30 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 4b4a4189e..6640c4b1a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2980,13 +2980,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, List> dataList, + List fieldList, List fieldDateList, + List fieldFileList, List fieldPullList, + String cut,String flagTemp) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //调整dataList中map中字段顺序与表单中的一致 + Map mapNew = new LinkedHashMap<>(); + for (OnlCgformField onlCgformField : fieldList) { + for (Map.Entry entry : dataList.get(0).entrySet()) { + if (onlCgformField.getDbFieldName().equals(entry.getKey())) { + mapNew.put(entry.getKey(), entry.getValue()); + break; + } + } + } + dataList.remove(0); + dataList.add(mapNew); + Map mapTemp = new HashMap<>(); + mapCopy(map, mapTemp); + //时间类型的字段 + List fieldDate = fieldDateList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + //文件类型的字段 + List fieldFile = fieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + //下拉类型的字段 + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + //数据字典 + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //树形数据字典 + List categoryList = sysCategoryService.list(); + //下拉选处理数据字典 + for (Map.Entry entry : dataList.get(0).entrySet()) { + //下拉选处理数据字典 + dictItemCn(sysDictItems, entry, cut, fieldList,flagTemp); + treeDictItemCn(categoryList, entry, treeFieldList, cut,flagTemp); + } + for (Map.Entry entry : mapTemp.entrySet()) { + //下拉选处理数据字典 + dictItemCn(sysDictItems, entry, cut, fieldList,flagTemp); + treeDictItemCn(categoryList, entry, treeFieldList, cut,flagTemp); + } + + StringBuilder sb = new StringBuilder(); + dataList.get(0).entrySet().forEach(entry -> { + String key = entry.getKey(); + Object value = entry.getValue(); + //字段中文名 + List fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(key)).collect(Collectors.toList()); + + if (fields.size() != 0) { + String dbFieldTxt = fields.get(0).getDbFieldTxt(); + if("2".equals(flagTemp)){ + dbFieldTxt = fields.get(0).getDbFieldTxt(); + }else{ + dbFieldTxt = fields.get(0).getDbFieldTxt(); + } + dbFieldTxt = "" + dbFieldTxt + ""; + if (value == null) { + value = ""; + } + for (Map.Entry entryTemp : mapTemp.entrySet()) { + String keyTemp = entryTemp.getKey(); + Object valueTemp = entryTemp.getValue(); + if (valueTemp == null) { + valueTemp = ""; + } + if (!"create_time".equals(key) && !"update_time".equals(key)) { + if (key.equals(keyTemp)) { + if (fieldDate.contains(key)) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (ObjectUtils.isNotEmpty(value)) { + value = sdf.format(value); + } + if (ObjectUtils.isNotEmpty(valueTemp)) { + try { + valueTemp = sdf.format(sdf.parse((String) valueTemp)); + } catch (ParseException e) { + } + } + //处理时间类型字段 + if (ObjectUtils.isNotEmpty(value)) { + if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由\"" + value + "\"改为\"“" + valueTemp + "\","); + }else{ + sb.append(dbFieldTxt + "由\"" + value + "\"改为\"“" + valueTemp + "\","); + } + } else if (ObjectUtils.isEmpty(valueTemp)) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由\"" + value + "\"改为空" + ","); + }else{ + sb.append(dbFieldTxt + "由\"" + value + "\"改为空" + ","); + } + } + } else { + if (ObjectUtils.isNotEmpty(valueTemp)) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由空改为\"" + valueTemp + "\","); + }else{ + sb.append(dbFieldTxt + "由空改为\"" + valueTemp + "\","); + } + + } + } + + } else if (fieldFile.contains(key)) { + //处理文件类型字段 + List fileNameList = new ArrayList<>(); + List fileNameListTemp = new ArrayList<>(); + //之前的文件 + if (ObjectUtils.isNotEmpty(value)) { + List fileInfos = iOSSFileService.getFileInfosByConnectId((String) value); + fileNameList = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + } + //修改的文件 + if (ObjectUtils.isNotEmpty(valueTemp)) { + List fileInfosTemp = iOSSFileService.getFileInfos((String) valueTemp); + fileNameListTemp = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + } + + if (ObjectUtils.isNotEmpty(value)) { + boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListTemp); + + if (fileNameListTemp.size() != 0 && !checkDiffrent) { + if("2".equals(flagTemp)){ + //sysUser + sb.append(dbFieldTxt + "由\"" + StringUtils.join(fileNameList, ",") + "\"改为\"" + StringUtils.join(fileNameListTemp, ",") + "\","); + }else{ + sb.append(dbFieldTxt + "由\"" + StringUtils.join(fileNameList, ",") + "\"改为\"" + StringUtils.join(fileNameListTemp, ",") + "\","); + } + } else if (fileNameListTemp.size() == 0) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由\"" + StringUtils.join(fileNameList, ",") + "\"改为空" + ","); + }else{ + sb.append(dbFieldTxt + "由\"" + StringUtils.join(fileNameList, ",") + "\"改为空" + ","); + } + + } + } else { + if (fileNameListTemp.size() != 0) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由空改为\"" + StringUtils.join(fileNameListTemp, ",") + "\","); + }else{ + sb.append(dbFieldTxt + "由空改为\"" + StringUtils.join(fileNameListTemp, ",") + "\","); + } + + } + } + } else { +// if ("replace_standard".equals(key) || "corresponding_standard".equals(key)) { +// if (ObjectUtils.isNotEmpty(value)) { +// value = getReplaceStandardName(value); +// } +// if (ObjectUtils.isNotEmpty(valueTemp)) { +// valueTemp = getReplaceStandardName(valueTemp); +// } +// } + //其他类型(被代替标准不处理) + if (!"replaced_standard".equals(key)) { + if (ObjectUtils.isNotEmpty(value)) { + if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由\"" + value + "\"改为\"" + valueTemp + "\","); + }else{ + sb.append(dbFieldTxt + "由\"" + value + "\"改为\"" + valueTemp + "\","); + } + } else if (ObjectUtils.isEmpty(valueTemp)) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由\"" + value + "\"改为空" + ","); + }else{ + sb.append(dbFieldTxt + "由\"" + value + "\"改为空" + ","); + } + } + } else { + if (ObjectUtils.isNotEmpty(valueTemp)) { + if("2".equals(flagTemp)){ + sb.append(dbFieldTxt + "由空改为\"" + valueTemp + "\","); }else{ sb.append(dbFieldTxt + "由空改为\"" + valueTemp + "\","); } @@ -3114,20 +3310,34 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldFileList, List fieldPullList, String cut) { + List> dataListTemp = new ArrayList<>(); + for (Map stringObjectMap : dataList) { + Map mapT = new HashMap<>(); + mapCopy(stringObjectMap, mapT); + dataListTemp.add(mapT); + } + String technologyTerritoryNew = (String) dataList.get(0).get("technology_territory"); //1. 处理订阅的发送消息 //修改的内容 String flag ="1";//消息的标识(英文) StringBuilder sb = getUpdateInfo(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, null,flag); + String flagTemp ="2";//消息的标识(中文--消息采用卡片型式发送, 消息内容包含中英文, 所以此处需要获取消息的中文) + StringBuilder sbCn = getUpdateInfoCn(map, dataListTemp, fieldList, fieldDateList, fieldFileList, fieldPullList, null,flagTemp); //树形数据字典 List categoryList = sysCategoryService.list(); String sbStr = ""; if (ObjectUtils.isNotEmpty(sb)) { sbStr = sb.substring(0, sb.length() - 1); } + String sbStrCn = ""; + if (ObjectUtils.isNotEmpty(sbCn)) { + sbStrCn = sbCn.substring(0, sbCn.length() - 1); + } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String serialNumber = (String) dataList.get(0).get("serial_number"); String category = (String)map.get("lei4_bie2"); + String categoryCn = (String)map.get("lei4_bie2"); String technologyTerritory = (String) map.get("technology_territory"); if(StringUtils.isNotBlank(category)){ List dictItemList = sysDictItemServiceImpl.selectItemsAll(); @@ -3137,6 +3347,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl", "") + .replaceAll("","").replaceAll("\"", "<"); + feishuMsgVo.setContent(replaceAllCn); +// + iFeishuService.sendCardMsgDocument(userIdListUpdateFeishu.toArray(new String[]{}), feishuMsgVo); + // String contentInfoFei = "In the "+category + " " + serialNumber +" you subscribed to, "+sysUser.getUsername()+" changed the " + sbStr.toString();; // //跳转文档详情 // String url = backUrl + "/docManage/library/detail?id=" + id; -// FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); -// feishuMsgVo.setTitle(MessageTypeEnum.READ.getName()); -// feishuMsgVo.setUrl(url); -// String replaceAll = contentInfoFei.replaceAll("\"", "<"); -// feishuMsgVo.setContent(replaceAll); -// -// iFeishuService.sendCardMsgDocument(userIdListUpdateFeishu.toArray(new String[]{}), feishuMsgVo); - String contentInfoFei = "In the "+category + " " + serialNumber +" you subscribed to, "+sysUser.getUsername()+" changed the " + sbStr.toString();; - //跳转文档详情 - String url = backUrl + "/docManage/library/detail?id=" + id; - iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url); +// iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url); } catch (IOException e) { log.error("文档新增飞书消息推送失败"); } @@ -3939,6 +4158,64 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysDictItems, Map.Entry entry, String cut, List fieldList,String flagTemp) { + //通过dictField判断字段是否为下拉选(不为空则为下拉选) + List onlCgformFieldList = fieldList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + //数据字典中文 + List dictItemsCh = new ArrayList<>(); + List dictItemsEn = new ArrayList<>(); + for (OnlCgformField onlCgformField : onlCgformFieldList) { + if (FieldTypeEnum.PULL_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) + || FieldTypeEnum.PULL_MORE.getValue().equals(onlCgformField.getFieldShowType())) { + String value = (String) entry.getValue(); + if (StringUtils.isNotBlank(value) && onlCgformFieldList.size() != 0 && StringUtils.isNotBlank(onlCgformFieldList.get(0).getDictField())) { + for (String itemValue : value.split(",")) { + //字段的数据字典 + List dictItemList = sysDictItems.stream() + .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals(onlCgformFieldList.get(0).getDictField())) + .collect(Collectors.toList()); + if (dictItemList.size() != 0) { + List dictItems = dictItemList.stream() + .filter(e -> itemValue.equals(e.getItemValue())) + .collect(Collectors.toList()); + if (dictItems.size() != 0) { + List itemText = new ArrayList<>(); + if (CutEnum.CN.getValue().equals(cut)) { + itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + } else if(CutEnum.EN.getValue().equals(cut)) { + itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); + }else if("2".equals(flagTemp)){ + itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + } + dictItemsCh.addAll(itemText); + dictItemsEn.addAll(itemText); + } + } + } + } + } + } + + + if (onlCgformFieldList.size() != 0 && StringUtils.isNotBlank(onlCgformFieldList.get(0).getDictField())) { + if(FieldTypeEnum.PULL_SINGLE.getValue().equals(onlCgformFieldList.get(0).getFieldShowType()) + || FieldTypeEnum.PULL_MORE.getValue().equals(onlCgformFieldList.get(0).getFieldShowType())){ + if (CutEnum.CN.getValue().equals(cut)) { + entry.setValue(StringUtils.join(dictItemsCh, ",")); + } else if(CutEnum.EN.getValue().equals(cut)){ + entry.setValue(StringUtils.join(dictItemsEn, ",")); + }else if("2".equals(flagTemp)){ + entry.setValue(StringUtils.join(dictItemsEn, ",")); + } + } + } + } @Override @@ -4963,6 +5240,34 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList, Map.Entry entry, List treeFieldList, String cut,String flagTemp) { + List treeFields = treeFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + String key = entry.getKey(); + if (treeFields.contains(entry.getKey())) { + String value = StringUtils.valueOf(entry.getValue()); + if (StringUtils.isNotBlank(value)) { + List idList = Arrays.asList(value.split(",")); + List sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); + List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); + List nameEnList = sysCategoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); + if (CutEnum.CN.getValue().equals(cut)) { + entry.setValue(StringUtils.join(nameList, ",")); + } else if(CutEnum.EN.getValue().equals(cut)){ + entry.setValue(StringUtils.join(nameEnList, ",")); + }else if("2".equals(flagTemp)){ + entry.setValue(StringUtils.join(nameList, ",")); + } + } + } + } @SneakyThrows diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 36b0d9597..f20cd3981 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -299,7 +300,7 @@ public class FeishuServiceImpl implements IFeishuService { StringBuilder contentSb = new StringBuilder(); contentSb.append("{"); contentSb.append("\"elements\": ["); - // 补充内容 + // 内容中文 if (StrUtil.isNotEmpty(feishuMsgVo.getContent())){ contentSb.append("{"); contentSb.append("\"tag\": \"div\","); @@ -309,6 +310,19 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("}"); contentSb.append("},"); }; + contentSb.append("{\"tag\": \"hr\"},"); + + //内容英文 + if (StrUtil.isNotEmpty(feishuMsgVo.getContentEn())){ + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + feishuMsgVo.getContentEn() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + }; + contentSb.append("{\"tag\": \"hr\"},"); @@ -341,15 +355,35 @@ public class FeishuServiceImpl implements IFeishuService { JSONObject jsonObject = JSONObject.parseObject(contentSb.toString()); -// String content = JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()).get("content").toString(); -// String contentReplaceAll = content.replaceAll("<", "\""); -// JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()).put("content",contentReplaceAll); -// JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()); -// jsonObject1.put("content",contentReplaceAll); -// -// -// JSONObject text = JSONObject.parseObject(JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()); -// text.put("value",jsonObject1); + String content = JSONObject.parseObject( + JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()).get("text").toString()) + .get("content").toString(); + String contentEn = JSONObject.parseObject( + JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(2).toString()).get("text").toString()) + .get("content").toString(); + + JSONObject elementTwo = + JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(1).toString()); + JSONObject elementFour = + JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(3).toString()); + JSONObject elementFive = + JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(4).toString()); + + //处理内容中的双引号(将尖括号替换成双引号) + JSONObject elementOne = getJsonObject(jsonObject, content); + JSONObject elementThree = getJsonObject(jsonObject, contentEn); + + JSONArray jsonArray = new JSONArray(); + jsonArray.add(elementOne); + jsonArray.add(elementTwo); + jsonArray.add(elementThree); + jsonArray.add(elementFour); + jsonArray.add(elementFive); + + jsonObject.put("elements",jsonArray); + + + // 设置请求参数 @@ -368,6 +402,24 @@ public class FeishuServiceImpl implements IFeishuService { return tokenJson.get("msg").toString(); } + @NotNull + private JSONObject getJsonObject(JSONObject jsonObject, String content) { + String contentReplaceAll = content.replaceAll("<", "\""); + + JSONObject jsonObject1 = JSONObject.parseObject( + JSONObject.parseObject( + JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()) + .get("text").toString()); + jsonObject1.put("content",contentReplaceAll); + + + JSONObject elementOne = + JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(0).toString()); + + elementOne.put("text",jsonObject1); + return elementOne; + } + /** * 翻译文本 * 参数： diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java index 0aee3596c..63c74a9a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java @@ -12,6 +12,8 @@ public class FeishuMsgVo { private String content; //内容 + private String contentEn; //内容英文 + private String taskType; //任务类型 private String regulationNo; //法规编号 From 658ca5ee5040cae2b2a3312ea3bd4feed25f09db Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 26 Oct 2022 14:26:16 +0800 Subject: [PATCH 069/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E3=80=82=20=E7=A6=85=E9=81=9361737?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProcessInfoEOMapper.xml | 38 ++- .../impl/ProcessInfoEOServiceImpl.java | 296 +++++++++++++++++- .../feginClient/WorkFlowFeignClient.java | 6 + .../impl/WorkFlowFeignClientImpl.java | 7 + 4 files changed, 333 insertions(+), 14 deletions(-) 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 78c88a657..72a3b386a 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 @@ -76,8 +76,8 @@ pi.flow_type, createBy.username as "create_by", pi.end_time, - (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} limit 1) as task_id, - (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} limit 1) as task_definition_key, + (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} order by submit_time desc limit 1) as task_id, + (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} order by submit_time desc limit 1) as task_definition_key, pi.status, pi.prc_num, pi.prc_name, @@ -216,8 +216,32 @@ pi.STATUS, pi.prc_num, pi.prc_name, - (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = #{params.taskStatus} limit 1) as task_id, - (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = #{params.taskStatus} limit 1) as task_definition_key, + ( + select + detail.task_id + from + process_info_detail detail + where detail.process_info_id = pi.id + and detail.user_id = #{params.currentUserId} + + and detail.`status` = #{params.taskStatus} + + order by detail.submit_time desc + limit 1 + ) as task_id, + ( + select + detail.task_definition_key + from + process_info_detail detail + where detail.process_info_id = pi.id + and detail.user_id = #{params.currentUserId} + + and detail.`status` = #{params.taskStatus} + + order by detail.submit_time desc + limit 1 + ) as task_definition_key, createBy.username AS "create_by", pi.acti_proc_inst_id, pi.create_time @@ -247,8 +271,10 @@ - and bdl.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%') - or bdl.title like CONCAT(CONCAT('%',#{params.serialNumber}),'%') + and ( + bdl.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%') + or bdl.title like CONCAT(CONCAT('%',#{params.serialNumber}),'%') + ) and pi.flow_type = #{params.flowType} 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 282560b60..0383bd391 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 @@ -7,6 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; @@ -66,6 +72,12 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(); //查询出所有项目库信息 @@ -587,9 +598,40 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl taskInventoryEOList = this.projectTaskInventoryEOService.list(); + + QueryWrapper taskInventoryDetailQueryWrap = new QueryWrapper<>(); + taskInventoryDetailQueryWrap.lambda().eq(ProjectTaskInventoryDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue()); + List taskInventoryDetailEOList = this.projectTaskInventoryDetailEOService.list(taskInventoryDetailQueryWrap); + + //3.设计符合性流程 + if(StringUtils.contains(disposeType,FlowTypeEnum.SJFHXSHLC.getValue())){ + this.initConformance(FlowTypeEnum.SJFHXSHLC.getValue(),projectLawsInventoryEOList,taskInventoryEOList,taskInventoryDetailEOList); + } + //4.prehomo流程 + if(StringUtils.contains(disposeType,FlowTypeEnum.PREHOMOQRLC.getValue())){ + this.initConformance(FlowTypeEnum.PREHOMOQRLC.getValue(),projectLawsInventoryEOList,taskInventoryEOList,taskInventoryDetailEOList); + } + //5.验证符合性流程 + if(StringUtils.contains(disposeType,FlowTypeEnum.YZFHXSCLC.getValue())){ + this.initConformance(FlowTypeEnum.YZFHXSCLC.getValue(),projectLawsInventoryEOList,taskInventoryEOList,taskInventoryDetailEOList); + } + //6.法规技术评估 + if(StringUtils.contains(disposeType,FlowTypeEnum.FGJSPG.getValue())){ + this.initFgjspg(); + } + //7.法规意见收集 + if(StringUtils.contains(disposeType,FlowTypeEnum.FGYJSJLC.getValue())){ + this.initFgyjsj(); + } + + //8.处理之前流程数据在发起的时候，在bus_process_new中没有任务数据 + if(StringUtils.contains(disposeType,"disposeBusProcessNew")){ + this.workFlowFeignClient.dispostHistoryBusProcessNewData(); + } return Result.OK("初始化数据成功",disposeType); } @@ -670,10 +712,10 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl projectLawsInventoryEOList,List projectLibraryBaseList){ - List> rwqrResult = this.workFlowFeignClient.queryProcessInfoByPrcType(FlowTypeEnum.RWQRLC.getValue()); + public void initRwqr(List projectLawsInventoryEOList){ + String flowType = FlowTypeEnum.RWQRLC.getValue(); + List> rwqrResult = this.workFlowFeignClient.queryProcessInfoByPrcType(flowType); if(CollectionUtils.isNotEmpty(rwqrResult)){ for (Map rwqrMap : rwqrResult) { List lawsInventoryList = projectLawsInventoryEOList.stream().filter(projectLawsInventory -> { @@ -690,16 +732,237 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl> taskMapList = (List>)rwqrMap.get("taskMapList"); if(CollectionUtils.isNotEmpty(taskMapList)){ - addProcessInfo(rwqrMap); + String status = TodoCenterStatusEnum.COMPLETED.getValue(); + for (Map taskMap : taskMapList) { + String deleteReason = (String) taskMap.get("deleteReason"); + if(StringUtils.isEmpty(deleteReason)){ + //如果是dre确认节点，将状态设置为询问，否则就是待确认。 + if(StringUtils.equals((String)taskMap.get("taskDefinitionKey"),"dreqr")){ + status = TodoCenterStatusEnum.INQUIRY.getValue(); + }else { + status = TodoCenterStatusEnum.LIST_TO_CONFIRM.getValue(); + } + break; + } + } + + rwqrMap.put("status",status); + this.addProcessInfo(rwqrMap); } } } } } + /** + * 初始化符合性流程 + * @param flowType + */ + public void initConformance(String flowType,List projectLawsInventoryEOList,List taskInventoryEOList,List taskInventoryDetailEOList){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List> conformanceResult = this.workFlowFeignClient.queryProcessInfoByPrcType(flowType); + if(CollectionUtils.isNotEmpty(conformanceResult)){ + for (Map conformanceMap : conformanceResult) { + String actiProcInstId = (String) conformanceMap.get("actiProcInstId"); + List taskInventoryListTemp = taskInventoryEOList.stream().filter(taskInventoryEO -> { + boolean flag = false; + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if (StringUtils.equals(taskInventoryEO.getDesignPId(), actiProcInstId)) { + flag = true; + } + }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){ + if (StringUtils.equals(taskInventoryEO.getPrehomoPId(), actiProcInstId)) { + flag = true; + } + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + if (StringUtils.equals(taskInventoryEO.getVerifyPId(), actiProcInstId)) { + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(taskInventoryListTemp)){ + List> taskMapList = (List>)conformanceMap.get("taskMapList"); + if(CollectionUtils.isNotEmpty(taskMapList)){ + for (Map taskMap : taskMapList) { + String taskId = (String) taskMap.get("taskId"); + String userId = ""; + for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailEOList) { + if(StringUtils.equals(taskId,projectTaskInventoryDetailEO.getTaskId())){ + userId = projectTaskInventoryDetailEO.getUserId(); + } + } + taskMap.put("userId",userId); + } + String endTimeStr = ""; + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue()) && taskInventoryListTemp.get(0).getDesignDueDate() != null){ + endTimeStr = sdf.format(taskInventoryListTemp.get(0).getDesignDueDate()); + }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue()) && taskInventoryListTemp.get(0).getPrehomoDueDate() != null){ + endTimeStr = sdf.format(taskInventoryListTemp.get(0).getPrehomoDueDate()); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue()) && taskInventoryListTemp.get(0).getVerifyDueDate() != null){ + endTimeStr = sdf.format(taskInventoryListTemp.get(0).getVerifyDueDate()); + } + + String projectLawsInventoryId = taskInventoryListTemp.get(0).getProjectLawsInventoryId(); + String projectLibraryId = ""; + String bussDocumentLibraryId = ""; + List projectLawsInventoryListTemp = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = false; + if (StringUtils.equals(lawsInventory.getId(), projectLawsInventoryId)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(projectLawsInventoryListTemp)){ + projectLibraryId = projectLawsInventoryListTemp.get(0).getProjectLibraryId(); + bussDocumentLibraryId = projectLawsInventoryListTemp.get(0).getStandId(); + } + conformanceMap.put("flowType",flowType); + conformanceMap.put("endTime",endTimeStr); + conformanceMap.put("projectLibraryId",projectLibraryId); + conformanceMap.put("projectLawsInventoryId",projectLawsInventoryId); + conformanceMap.put("bussDocumentLibraryId",bussDocumentLibraryId); + + String status = TodoCenterStatusEnum.COMPLETED.getValue(); + for (Map taskMap : taskMapList) { + String deleteReason = (String) taskMap.get("deleteReason"); + if(StringUtils.isEmpty(deleteReason)){ + //如果是发起人审查节点，状态应该为 待审核，否则就是待提交 + if(StringUtils.equals((String)taskMap.get("taskDefinitionKey"),"fqrsh")){ + status = TodoCenterStatusEnum.TO_AUDIT.getValue(); + }else { + status = TodoCenterStatusEnum.TO_SUBMIT.getValue(); + } + break; + } + } + conformanceMap.put("status",status); + + this.addProcessInfo(conformanceMap); + } + } + } + } + } + + /** + * 初始化法规技术评估 + */ + public void initFgjspg(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String flowType = FlowTypeEnum.FGJSPG.getValue(); + List> fgjspgResult = this.workFlowFeignClient.queryProcessInfoByPrcType(flowType); + if(CollectionUtils.isNotEmpty(fgjspgResult)){ + List lawsTechnologyEvaluationEOList = this.lawsTechnologyEvaluationEOService.list(); + List flowDetailEOList = this.lawsTechnologyEvaluationFlowDetailEOService.list(); + + for (Map fgjspgMap : fgjspgResult) { + List> taskMapList = (List>)fgjspgMap.get("taskMapList"); + if(CollectionUtils.isNotEmpty(taskMapList)){ + String standId = ""; + String endTimeStr = ""; + String actiProcInstId = (String) fgjspgMap.get("actiProcInstId"); + + List flowDetailEOListTemp = flowDetailEOList.stream().filter(flowDetailEO -> { + boolean flag = false; + if (StringUtils.equals(actiProcInstId, flowDetailEO.getActiProcInstId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(flowDetailEOListTemp)){ + String lawsTechnologyEvaluationId = flowDetailEOListTemp.get(0).getLawsTechnologyEvaluationId(); + List technologyEvaluationEOListTemp = lawsTechnologyEvaluationEOList.stream().filter(lawsTechnologyEvaluation -> { + boolean flag = false; + if (StringUtils.equals(lawsTechnologyEvaluationId, lawsTechnologyEvaluation.getId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(technologyEvaluationEOListTemp)){ + standId = technologyEvaluationEOListTemp.get(0).getStandId(); + endTimeStr = sdf.format(technologyEvaluationEOListTemp.get(0).getEndTime()); + } + } + + fgjspgMap.put("standId",standId); + fgjspgMap.put("endTime",endTimeStr); + fgjspgMap.put("flowType",flowType); + + String status = TodoCenterStatusEnum.COMPLETED.getValue(); + for (Map taskMap : taskMapList) { + String deleteReason = (String) taskMap.get("deleteReason"); + if(StringUtils.isEmpty(deleteReason)){ + //如果是发起人审查节点，状态应该为 待审核，否则就是待提交 + if(StringUtils.equals((String)taskMap.get("taskDefinitionKey"),"fqrsc")){ + status = TodoCenterStatusEnum.TO_AUDIT.getValue(); + }else { + status = TodoCenterStatusEnum.TO_SUBMIT.getValue(); + } + break; + } + } + fgjspgMap.put("status",status); + this.addProcessInfo(fgjspgMap); + } + } + } + } + + /** + * 初始化法规意见收集 + */ + public void initFgyjsj(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String flowType = FlowTypeEnum.FGYJSJLC.getValue(); + List> fgyjsjResult = this.workFlowFeignClient.queryProcessInfoByPrcType(flowType); + + if(CollectionUtils.isNotEmpty(fgyjsjResult)){ + List lawsOpinionGatherEOList = this.lawsOpinionGatherEOService.list(); + for (Map fgyjsjMap : fgyjsjResult) { + List> taskMapList = (List>)fgyjsjMap.get("taskMapList"); + if(CollectionUtils.isNotEmpty(taskMapList)){ + String standId = ""; + String endTimeStr = ""; + String actiProcInstId = (String) fgyjsjMap.get("actiProcInstId"); + List lawsOpinionGatherTempList = lawsOpinionGatherEOList.stream().filter(lawsOpinionGatherEO -> { + boolean flag = false; + if (StringUtils.equals(lawsOpinionGatherEO.getActiProcInstId(), actiProcInstId)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(lawsOpinionGatherTempList)){ + standId = lawsOpinionGatherTempList.get(0).getStandId(); + endTimeStr = sdf.format(lawsOpinionGatherTempList.get(0).getEndTime()); + } + fgyjsjMap.put("standId",standId); + fgyjsjMap.put("endTime",endTimeStr); + fgyjsjMap.put("flowType",flowType); + + String status = TodoCenterStatusEnum.COMPLETED.getValue(); + for (Map taskMap : taskMapList) { + String deleteReason = (String) taskMap.get("deleteReason"); + if(StringUtils.isEmpty(deleteReason)){ + //如果还有没提交的任务 + status = TodoCenterStatusEnum.TO_SUBMIT.getValue(); + break; + } + } + fgyjsjMap.put("status",status); + this.addProcessInfo(fgyjsjMap); + } + } + } + } + public void addProcessInfo(Map params){ String prcNum = (String) params.get("prcNum"); String prcName = (String) params.get("prcName"); @@ -709,12 +972,21 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl> queryProcessInfoByPrcType(@RequestParam("prcType") String prcType); + + /** + * 处理历史数据-之前的数据发起的时候在busProcessNew中没有待办信息 + */ + @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/dispostHistoryBusProcessNewData",method = RequestMethod.GET) + Result dispostHistoryBusProcessNewData(); } 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 3dcbeb659..e0ab1dc66 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 @@ -205,4 +205,11 @@ public class WorkFlowFeignClientImpl{ public List> queryProcessInfoByPrcType(String prcType) { return workFlowFeignClient.queryProcessInfoByPrcType(prcType); } + + /** + * 处理历史数据-之前的数据发起的时候在busProcessNew中没有待办信息 + */ + public Result dispostHistoryBusProcessNewData() { + return workFlowFeignClient.dispostHistoryBusProcessNewData(); + } } From 6794e56cfe216f507df1d6da4c47e6fa667d08fa Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 26 Oct 2022 14:33:21 +0800 Subject: [PATCH 070/108] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ParamsCollectManifestEOMapper.java | 4 +- .../xml/ParamsCollectManifestEOMapper.xml | 6 +- .../IParamsCollectManifestEOService.java | 4 + .../ParamsCollectManifestEOServiceImpl.java | 149 ++++++++++++++++++ .../cert/collect/task/ScheduledTask.java | 30 ++++ .../main/java/com/jero/LawNioApplication.java | 2 + 6 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/task/ScheduledTask.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index 76eedb79c..140f9c0c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -26,4 +26,6 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper listInfoOfTitle(@Param("paramsManifestId") String paramsManifestId); IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); - } + + List queryByParamManifestId(@Param("paramsManifestId") String paramsManifestIdString); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 0b45b9351..8c30b86c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -108,4 +108,8 @@ order by del_flag desc, add_flag desc, change_flag desc, nio_number asc - \ No newline at end of file + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 16249bc07..0266ae8dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -164,4 +164,8 @@ public interface IParamsCollectManifestEOService extends IService updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO); + + //监控参数收集任务的截止时间，并根据时间段发送飞书 + void checkDeadline(); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 07ed93543..8e105fc78 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -2871,4 +2871,153 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("state", ManifestStateEnum.COLLECTING.getValue()); + List manifestEOS = paramsManifestEOService.list(queryWrapper); + for (ParamsManifestEO manifestEO : manifestEOS) { + //项目名称 + ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId()); + if (ObjectUtils.isNotEmpty(projectInfo)) { + //url + String urlParamsStr = parseUrlParams(manifestEO); + String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr; + //查出对应清单 + List collectManifestEOS = paramsCollectManifestEOMapper.queryByParamManifestId(manifestEO.getId()); + Map> seven = new HashMap<>(); + Map> three = new HashMap<>(); + Map> today = new HashMap<>(); + for (ParamsCollectManifestEO collectManifestEO : collectManifestEOS) { + String thirdId = null; + if (CollectManifestStateEnum.WAIT_SDT.getValue().equals(collectManifestEO.getState()) + ||CollectManifestStateEnum.DRE_BACK.getValue().equals(collectManifestEO.getState())) { + //工程接口人 + if (ObjectUtils.isNotEmpty(collectManifestEO.getSdt())) { + SysUser sdt = sysUserService.getUserByName(collectManifestEO.getSdt()); + if (ObjectUtils.isNotEmpty(sdt)) { + thirdId = sdt.getThirdId(); + } + } + + } else if (CollectManifestStateEnum.WAIT_FILL.getValue().equals(collectManifestEO.getState()) + ||CollectManifestStateEnum.CERT_BACK.getValue().equals(collectManifestEO.getState())) { + //填写人 + if (ObjectUtils.isNotEmpty(collectManifestEO.getDre())) { + SysUser dre = sysUserService.getUserByName(collectManifestEO.getDre()); + if (ObjectUtils.isNotEmpty(dre)) { + thirdId = dre.getThirdId(); + } + } + } + //截止时间 + if (ObjectUtils.isNotEmpty(thirdId) && ObjectUtils.isNotEmpty(collectManifestEO.getDeadline())) { + String deadline =sdf.format(collectManifestEO.getDeadline()); + //判断日期 + int days = 0; + try { + days = (int) (sdf.parse(deadline).getTime() - sdf.parse(now).getTime()) / (24 * 60 * 60 * 1000); + } catch (Exception e) { + e.printStackTrace(); + throw new JeroBootException("时间获取失败"); + } + if (days == 7) { + deadlineDateMap(seven, collectManifestEO, thirdId); + } else if (days == 3) { + deadlineDateMap(three, collectManifestEO, thirdId); + } else if (now.equals(deadline)) { + deadlineDateMap(today, collectManifestEO, thirdId); + } + + } + } + + String title = MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn(); + String cnContentLower = "项目: " + projectInfo.getProjectName() + + "\n发起人: 系统"; + String enContentLower = "Project: " + projectInfo.getProjectName() + + "\nInitiator: system"; + if (!seven.isEmpty()) { + for (String key : seven.keySet()) { + String[] thirds = new String[1]; + thirds[0] = key; + List stringList = seven.get(key); + String join = StringUtils.join(stringList, ","); + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper("您参与填写的参数"+ join +"，还有7天到期，请及时查看处理"); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper("The parameter "+ join +" you filled in will expire in 7 days. Please check and address it in a timely manner"); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirds, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } + } + if (!three.isEmpty()) { + for (String key : three.keySet()) { + String[] thirds = new String[1]; + thirds[0] = key; + List stringList = three.get(key); + String join = StringUtils.join(stringList, ","); + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper("您参与填写的参数"+ join +"，还有3天到期，请及时查看处理"); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper("The parameter "+ join +" you filled in will expire in 3 days. Please check and address it in a timely manner"); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirds, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } + } + if (!today.isEmpty()) { + for (String key : today.keySet()) { + String[] thirds = new String[1]; + thirds[0] = key; + List stringList = today.get(key); + String join = StringUtils.join(stringList, ","); + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper("您参与填写的参数"+ join +"，将于今天到期，请及时查看处理"); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper("The parameter "+ join +" you filled in will expire today. Please check and address it in a timely manner"); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirds, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } + } + } + } + + } + + private void deadlineDateMap(Map> today, ParamsCollectManifestEO collectManifestEO, String thirdId) { + List stringList = today.get(thirdId); + if (ObjectUtils.isEmpty(stringList)) { + stringList = new ArrayList<>(); + stringList.add("NIO-" + collectManifestEO.getNioNumber()); + today.put(thirdId, stringList); + } else { + stringList.add("NIO-" + collectManifestEO.getNioNumber()); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/task/ScheduledTask.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/task/ScheduledTask.java new file mode 100644 index 000000000..91fb719d8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/task/ScheduledTask.java @@ -0,0 +1,30 @@ +package com.jero.modules.cert.collect.task; + +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class ScheduledTask { + + @Autowired + private IParamsCollectManifestEOService paramsCollectManifestEOServicea; + + /** + * 监控参数收集任务的截止时间，并根据时间段发送飞书 + */ + //@Scheduled(cron = "0 30 14 * * ?") + @Scheduled(cron = "0 0 0 */1 * ?") + public void checkTime() { + log.info("-----checkDeadline-----begin-----------"); + + paramsCollectManifestEOServicea.checkDeadline(); + + log.info("-----checkDeadline------end-----------"); + } + + +} diff --git a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java index 207380e88..87c4ee8cb 100644 --- a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java +++ b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java @@ -11,6 +11,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.core.env.Environment; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.socket.server.standard.ServerEndpointExporter; import java.net.InetAddress; @@ -25,6 +26,7 @@ import java.net.UnknownHostException; @SpringBootApplication @EnableEurekaClient @EnableFeignClients +@EnableScheduling public class LawNioApplication extends SpringBootServletInitializer { @Override From 0da3b191bc6aff78ce5dff1059cb7b0044d18f0e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 26 Oct 2022 14:52:16 +0800 Subject: [PATCH 071/108] =?UTF-8?q?61730=20=E9=A1=B9=E7=9B=AE=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E4=BB=BB=E5=8A=A1/=E6=B3=95=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E4=BB=BB=E5=8A=A1-=E5=BE=85=E5=8A=9E=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=88=AA=E6=AD=A2=E5=B0=8F=E4=BA=8E=E7=AD=89?= =?UTF-8?q?=E4=BA=8E=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessInfoEOServiceImpl.java | 20 +++++++++++++++++++ .../modules/todoCenter/vo/ProcessInfoVO.java | 2 ++ 2 files changed, 22 insertions(+) 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 0383bd391..203a27fe5 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 @@ -396,6 +396,14 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl datas, String cut){ if(CollectionUtils.isNotEmpty(datas)){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date currentDate = new Date(); + try { + currentDate = sdf.parse(sdf.format(currentDate)); + } catch (ParseException e) { + e.printStackTrace(); + } + List processInfoIdList = datas.stream().map(ProcessInfoVO::getId).distinct().collect(Collectors.toList()); QueryWrapper processInfoDetailQueryWrap = new QueryWrapper<>(); @@ -463,6 +471,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl sysUserList = this.sysUserService.querySysUserListByIdList(userIdList); + Date finalCurrentDate = currentDate; datas.forEach(data -> { if(StringUtils.isNotEmpty(data.getFlowType())){ data.setFlowTypeShow(FlowTypeEnum.getTextByValue(data.getFlowType(),cut)); @@ -512,6 +521,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Wed, 26 Oct 2022 14:59:22 +0800 Subject: [PATCH 072/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index cc87c7e03..7d8bf49aa 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1425,9 +1425,9 @@ module.exports = { filledBy:'待分配填写人', parameterToBeInitiated:'参数待发起', listTaskConfirmation:'清单任务确认', - completednum: '待填写数量', - filledBynum:'待分配填写人数量', - parameterToBeInitiatednum:'参数待发起数量', + completednum: '待填写', + filledBynum:'待分配填写人', + parameterToBeInitiatednum:'参数待发起', listToConfirm:'待确认', toSubmit:'待提交', toAudit:'待审核', From 6fbee100fba8593012392a0c26676cc7fb9c7894 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 15:14:14 +0800 Subject: [PATCH 073/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/ditu.png | Bin 0 -> 30410 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 jero-web/src/assets/ditu.png diff --git a/jero-web/src/assets/ditu.png b/jero-web/src/assets/ditu.png new file mode 100644 index 0000000000000000000000000000000000000000..c1c236dec4f1549a8cbea18d934251300c7529dd GIT binary patch literal 30410 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 EAI%KdZ~y=R literal 0 HcmV?d00001 From 128ea9778cd6c742387596500869cf17cc266986 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 26 Oct 2022 15:14:24 +0800 Subject: [PATCH 074/108] =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=A2=86=E5=9F=9F-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=87=E6=A1=A3=E6=98=AF=E5=8F=91=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 11 ++- .../feishu/service/IFeishuService.java | 9 ++ .../service/impl/FeishuServiceImpl.java | 87 ++++++++++++++++++- 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 6640c4b1a..5ee83f514 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -3354,6 +3354,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImplXXX对“GB 7258 进行了修改请及时查看”) //向订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息 + // 只有技术领域变更为订阅的技术领域这一种情况发消息, 假如订阅了技术领域A,编辑的文档的技术领域也是A,这时编辑的是其他的字段,这种情况不发消息 Map mapTemp = new HashMap<>(); mapTemp.put("domainId", map.get("technology_territory")); mapTemp.put("documentId", map.get("id")); @@ -3434,10 +3435,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + // 示例 + StringBuilder contentSb = new StringBuilder(); + contentSb.append("{"); + contentSb.append("\"elements\": ["); + // 内容中文 + if (StrUtil.isNotEmpty(feishuMsgVo.getContent())){ + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + feishuMsgVo.getContent() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + }; + contentSb.append("{\"tag\": \"hr\"},"); + + //内容英文 + if (StrUtil.isNotEmpty(feishuMsgVo.getContentEn())){ + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + feishuMsgVo.getContentEn() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + }; + contentSb.append("{\"tag\": \"hr\"},"); + contentSb.append("{"); + contentSb.append("\"actions\": ["); + contentSb.append("{"); + contentSb.append("\"tag\": \"button\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"view\","); + contentSb.append("\"tag\": \"plain_text\""); + contentSb.append("},"); + contentSb.append("\"type\": \"primary\","); + contentSb.append("\"url\": \" "+ feishuMsgVo.getUrl() +" \""); + contentSb.append("}"); + contentSb.append("],"); + contentSb.append("\"tag\": \"action\""); + contentSb.append("}"); + contentSb.append("],"); + + + + contentSb.append("\"header\": {"); + contentSb.append("\"template\": \"green\","); + contentSb.append("\"title\": {"); + contentSb.append("\"content\": \" " + feishuMsgVo.getTitle() + " \","); + contentSb.append("\"tag\": \"plain_text\""); + contentSb.append("}"); + contentSb.append("}"); + contentSb.append("}"); + + JSONObject jsonObject = JSONObject.parseObject(contentSb.toString()); // 设置请求参数 JSONObject paramsMap = new JSONObject(); From c7632736227b3e37d50ef5500251c7d5a2d4baab Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 26 Oct 2022 15:31:12 +0800 Subject: [PATCH 075/108] =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=A2=86=E5=9F=9F--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E6=A1=A3=E5=8F=91=E9=A3=9E=E4=B9=A6?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 5ee83f514..f1effd533 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2208,9 +2208,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Wed, 26 Oct 2022 15:37:52 +0800 Subject: [PATCH 076/108] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF--?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=8B=B1=E6=96=87=E4=B8=8B=E7=9A=84=E6=A8=AA?= =?UTF-8?q?=E6=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/feishu/service/impl/FeishuServiceImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index e37d166a0..9aa482c6f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -325,7 +325,6 @@ public class FeishuServiceImpl implements IFeishuService { - contentSb.append("{\"tag\": \"hr\"},"); contentSb.append("{"); contentSb.append("\"actions\": ["); contentSb.append("{"); @@ -366,8 +365,6 @@ public class FeishuServiceImpl implements IFeishuService { JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(1).toString()); JSONObject elementFour = JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(3).toString()); - JSONObject elementFive = - JSONObject.parseObject(JSONArray.parseArray(jsonObject.get("elements").toString()).get(4).toString()); //处理内容中的双引号(将尖括号替换成双引号) JSONObject elementOne = getJsonObject(jsonObject, content); @@ -378,7 +375,6 @@ public class FeishuServiceImpl implements IFeishuService { jsonArray.add(elementTwo); jsonArray.add(elementThree); jsonArray.add(elementFour); - jsonArray.add(elementFive); jsonObject.put("elements",jsonArray); // 设置请求参数 @@ -439,9 +435,6 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("},"); }; - - - contentSb.append("{\"tag\": \"hr\"},"); contentSb.append("{"); contentSb.append("\"actions\": ["); contentSb.append("{"); From 9f104c564a49cb9e6ceaf16caddddaf204eca5aa Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 15:47:20 +0800 Subject: [PATCH 077/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/dealtWith.vue | 10 ++++++++-- .../regulatoryAssessmentTasks/components/dealtWith.vue | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 5ea5b7b43..7e7b36dc4 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -11,6 +11,9 @@ :columns="columns" > + + {{text}} + {{$t('Processing')}} @@ -85,7 +88,8 @@ align: 'center', dataIndex: 'endTime', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'endTime' } }, { title: this.$t('taskStatus'), @@ -327,5 +331,7 @@ text-align: right; margin-top: 20px; } - + .activeRed{ + color: red; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 72e8ebf30..d80515b5a 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -15,6 +15,9 @@ {{$t('Processing')}} + + {{text}} + {{text+'、'+record.title}} @@ -204,5 +207,7 @@ text-align: right; margin-top: 20px; } - + .activeRed{ + color: red; + } \ No newline at end of file From 385d9fc9934b1c3c444a7c47a021fba5a1bbc015 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 15:48:26 +0800 Subject: [PATCH 078/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryAssessmentTasks/components/dealtWith.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index d80515b5a..eba3c634c 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -76,7 +76,8 @@ align: 'center', dataIndex: 'endTime', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'endTime' } }, { title: this.$t('taskStatus'), From bf2b51820d12d8ade4d1af1c6ba48c8f81f75692 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 26 Oct 2022 15:52:05 +0800 Subject: [PATCH 079/108] =?UTF-8?q?61777-=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index cefc08e86..0b39ff36e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -712,17 +712,19 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl flowDetailQueryWrap = new QueryWrapper<>(); flowDetailQueryWrap.lambda().eq(LawsTechnologyEvaluationFlowDetailEO::getEvaluatorId,currentUser.getId()); List flowDetailEOList = this.lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailQueryWrap); - if(CollectionUtils.isNotEmpty(flowDetailEOList)){ - List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); - queryWrapper.and(query -> { - query.eq("create_by",currentUser.getUsername()); + + queryWrapper.and(query -> { + query.eq("create_by",currentUser.getUsername()); + if(CollectionUtils.isNotEmpty(flowDetailEOList)){ + List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); query.or(q -> { for (String lawsTechnologyEvaluationId : lawsTechnologyEvaluationIdList) { q.or().like("id",lawsTechnologyEvaluationId); } }); - }); - } + } + }); + } } From cf17a1a7a9916fe8be67f70c9f1ae1b5c61d8bb5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 26 Oct 2022 16:46:32 +0800 Subject: [PATCH 080/108] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=92=8C=E6=92=A4=E5=9B=9E--=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 21 ++- .../feishu/service/IFeishuService.java | 10 ++ .../service/impl/FeishuServiceImpl.java | 127 ++++++++++++++++++ 3 files changed, 156 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 6af72e8d9..4df36d4e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -29,6 +29,7 @@ import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.jero.modules.dummy.service.IDummyReadEOService; import com.jero.modules.dummy.vo.VirtualCreaterVo; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysAnnouncement; @@ -366,6 +367,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl dummyInventoryInfoEOList = iDummyInventoryInfoEOService.list(lambdaQueryWrapper); String contentLog = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows：" + "
"; String contentLogFeishu = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows：" + " "; + String contentLogFeishuTemp = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows：" + " "; if(dummyContentChangeEOList.size() == 0){ //没有添加过需要进行第一次添加 @@ -449,7 +451,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl serialNumberAddList,List serialNumberDeleteList) throws IOException; + /** * 翻译文本 * @param params diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 9aa482c6f..0092c6858 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -453,6 +453,133 @@ public class FeishuServiceImpl implements IFeishuService { + contentSb.append("\"header\": {"); + contentSb.append("\"template\": \"green\","); + contentSb.append("\"title\": {"); + contentSb.append("\"content\": \" " + feishuMsgVo.getTitle() + " \","); + contentSb.append("\"tag\": \"plain_text\""); + contentSb.append("}"); + contentSb.append("}"); + contentSb.append("}"); + + JSONObject jsonObject = JSONObject.parseObject(contentSb.toString()); + + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } + return tokenJson.get("msg").toString(); + } + /** + * 虚拟清单发布(飞书消息) + * @param userIds + * @param feishuMsgVo + * @return + * @throws IOException + */ + public String sendCardMsgVirtua(String[] userIds, FeishuMsgVo feishuMsgVo, + List serialNumberAddList,List serialNumberDeleteList) throws IOException { + String token = getTenantAccessToken(); + // 设置请求头 + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + token); + headerMap.put("Content-Type", "application/json; charset=utf-8"); + + // 示例 + StringBuilder contentSb = new StringBuilder(); + contentSb.append("{"); + contentSb.append("\"elements\": ["); + // 内容中文 + if (StrUtil.isNotEmpty(feishuMsgVo.getContent())){ + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + feishuMsgVo.getContent() + "\"\n,"); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + }; + if(ObjectUtils.isNotEmpty(serialNumberAddList)){ + int count = 1; + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + count + ". 新增文档: " + StringUtils.join(serialNumberAddList,",") + "\"\n,"); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + } + if(ObjectUtils.isNotEmpty(serialNumberDeleteList)){ + int count = 2; + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + count + ". 删除文档: " + StringUtils.join(serialNumberDeleteList,",") + "\"\n,"); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + } + contentSb.append("{\"tag\": \"hr\"},"); + + //内容英文 + if (StrUtil.isNotEmpty(feishuMsgVo.getContentEn())){ + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + feishuMsgVo.getContentEn() + "\"\n,"); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + }; + + if (ObjectUtils.isNotEmpty(serialNumberAddList)) { + int count = 1; + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + count + ". New regulations: " + StringUtils.join(serialNumberAddList,",") + "\"\n,"); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + } + if (ObjectUtils.isNotEmpty(serialNumberDeleteList)) { + int count = 2; + contentSb.append("{"); + contentSb.append("\"tag\": \"div\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"" + count + ". Remove regulations: " + StringUtils.join(serialNumberDeleteList,",") + "\"\n,"); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("},"); + } + + contentSb.append("{"); + contentSb.append("\"actions\": ["); + contentSb.append("{"); + contentSb.append("\"tag\": \"button\","); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"view\","); + contentSb.append("\"tag\": \"plain_text\""); + contentSb.append("},"); + contentSb.append("\"type\": \"primary\","); + contentSb.append("\"url\": \" "+ feishuMsgVo.getUrl() +" \""); + contentSb.append("}"); + contentSb.append("],"); + contentSb.append("\"tag\": \"action\""); + contentSb.append("}"); + contentSb.append("],"); + + + contentSb.append("\"header\": {"); contentSb.append("\"template\": \"green\","); contentSb.append("\"title\": {"); From 991b4ebec2b5d6eb576b39aa0b52be0eb69f3b38 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 26 Oct 2022 17:05:30 +0800 Subject: [PATCH 081/108] =?UTF-8?q?61701-=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E6=B3=95=E8=A7=84=E8=AF=84=E4=BC=B0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=A4=84=E7=90=86=E7=99=BB=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=A0=87=E8=AF=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysPermissionController.java | 49 ++++++++++++++++++- .../system/enums/SysPermissionEnum.java | 35 +++++++++++++ .../system/mapper/TodoCenterMapper.java | 14 ++++++ .../system/mapper/xml/TodoCenterMapper.xml | 21 ++++++++ 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 9668a5a92..f9b86374a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -5,13 +5,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.system.enums.SysPermissionEnum; +import com.jero.modules.system.mapper.TodoCenterMapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; -import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MD5Util; import com.jero.common.util.oConvertUtils; @@ -54,6 +55,9 @@ public class SysPermissionController { @Autowired private ISysDepartPermissionService sysDepartPermissionService; + @Autowired + private TodoCenterMapper todoCenterMapper; + /** * 加载数据节点 * @@ -641,6 +645,47 @@ public class SysPermissionController { if (isWWWHttpUrl(permission.getUrl())) { meta.put("url", permission.getUrl()); } + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + Map params = new HashMap<>(); + params.put("currentUserId",currentUser.getId()); + + List flowTypeList = new ArrayList<>(); + //项目法规任务 + if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_REGULATION_TASKS.getId())){ + flowTypeList.add("1"); + flowTypeList.add("2"); + flowTypeList.add("3"); + flowTypeList.add("4"); + flowTypeList.add("10"); + params.put("flowTypeList",flowTypeList); + //存在待办任务标识，true为有 + boolean existTaskFlag = false; + int result = todoCenterMapper.todoCenterTaskCount(params); + if(result > 0){ + existTaskFlag = true; + } + //查询当前登录用户是否有项目法规任务 + meta.put("existTask",existTaskFlag); + } + //法规评估任务 + if(StringUtils.equals(permission.getId(), SysPermissionEnum.REGULATORY_ASSESSMENT_TASKS.getId())){ + flowTypeList.add("5"); + flowTypeList.add("6"); + params.put("flowTypeList",flowTypeList); + int result = todoCenterMapper.todoCenterTaskCount(params); + boolean existTaskFlag = false; + if(result > 0){ + existTaskFlag = true; + } + meta.put("existTask",existTaskFlag); + } + //项目参数任务 + if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())){ + boolean existTaskFlag = false; + meta.put("existTask",existTaskFlag); + } json.put("meta", meta); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java new file mode 100644 index 000000000..951afcc20 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java @@ -0,0 +1,35 @@ +package com.jero.modules.system.enums; + +/** + * 菜单权限枚举类 + * @Author: wzj + * @Date: 2022/10/26 16:14 + **/ +public enum SysPermissionEnum { + + PROJECT_REGULATION_TASKS("项目法规任务","1580735287309119489",""), + REGULATORY_ASSESSMENT_TASKS("法规评估任务","1580735611793059842",""), + PROJECT_PARAMETER_TASKS("项目参数任务","1580735965892980738",""); + + private String name; + private String id; + private String value; + + private SysPermissionEnum(String name,String id, String value) { + this.name = name; + this.id = id; + this.value = value; + } + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + + public String getId() { + return id; + } +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java new file mode 100644 index 000000000..b6e0e59ca --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.system.mapper; + +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + +/** + * 待办中心mapper层 + * @Author: wzj + * @Date: 2022/10/26 16:41 + **/ +public interface TodoCenterMapper { + int todoCenterTaskCount(@Param("params") Map params); +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml new file mode 100644 index 000000000..29d53a4d9 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml @@ -0,0 +1,21 @@ + + + + + + From 494f41bb4f70711430194705c79f2c8cdf873e3c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 26 Oct 2022 17:09:33 +0800 Subject: [PATCH 082/108] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=8E=A8?= =?UTF-8?q?=E9=80=81--=E5=8F=91=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/enums/MessageTypeEnum.java | 34 ++++++++++++------- .../BussDocumentLibraryEOServiceImpl.java | 19 +++++++---- .../impl/DummyInventoryBaseEOServiceImpl.java | 4 +-- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java index 3181758a0..f9d101325 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java @@ -6,11 +6,11 @@ package com.jero.common.constant.enums; * @auth zhn */ public enum MessageTypeEnum { - READ("Subscription Notification","1"), - WARN("Early Warning","2"), - PUSH("Share / Forward","3"), - HOMO_TASK("Homo Parameter Task","4"), - TASK("Regulation Compliance Task", "5"), + READ("Subscription Notification","订阅通知","1"), + WARN("Regulation Early Warning","法规预警","2"), + PUSH("Share / Forward","转发推送","3"), + HOMO_TASK("Homo Parameter Task","","4"), + TASK("Regulation Compliance Task","", "5"), //REGULATION_LIST_CONFIRMATION_TASK("Regulation List Confirmation Task", "6"), // 清单确认任务 //REGULATION_LIST_CONFIRMATION_NOTIFICATION("Regulation List Confirmation Notification", "7"), // 清单确认通知 //REGULATION_TASK_CONFIRMATION_TASK("Regulation Task Confirmation", "8"), // 任务确认任务 @@ -21,19 +21,21 @@ public enum MessageTypeEnum { //DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知 //PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知 //VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知 - SYSTEMATIC_NOTIFICATION("Systematic Notification", "15"), // 系统通知 - LIST_CONFIRMATION("List Confirmation", "17"), // 清单确认 - TASK_CONFIRMATION("Task Confirmation", "18"), // 任务确认 - COMPLIANCE_CONFIRMATION("Compliance Confirmation", "19"), // 符合性确认 - COLLECTION_OF_LEGISLATIVE_COMMENTS("Collection of Legislative Comments", "20"), // 法规意见收集 - REGULATORY_AND_TECHNICAL_ASSESSMENT("Regulatory and technical assessment", "21"), // 法规技术评估 + SYSTEMATIC_NOTIFICATION("Systematic Notification","", "15"), // 系统通知 + LIST_CONFIRMATION("List Confirmation", "","17"), // 清单确认 + TASK_CONFIRMATION("Task Confirmation", "","18"), // 任务确认 + COMPLIANCE_CONFIRMATION("Compliance Confirmation","", "19"), // 符合性确认 + COLLECTION_OF_LEGISLATIVE_COMMENTS("Collection of Legislative Comments","", "20"), // 法规意见收集 + REGULATORY_AND_TECHNICAL_ASSESSMENT("Regulatory and technical assessment", "","21"), // 法规技术评估 ; String name; + String nameCn; String value; - private MessageTypeEnum(String name, String value) { + private MessageTypeEnum(String name,String nameCn, String value) { this.name = name; + this.nameCn = nameCn; this.value = value; } @@ -52,4 +54,12 @@ public enum MessageTypeEnum { public void setValue(String value) { this.value = value; } + + public String getNameCn() { + return nameCn; + } + + public void setNameCn(String nameCn) { + this.nameCn = nameCn; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index f1effd533..4353c9894 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2213,7 +2213,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Wed, 26 Oct 2022 17:19:32 +0800 Subject: [PATCH 083/108] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E8=BD=AC=E5=8F=91=E6=8E=A8=E9=80=81--=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProblemKnowledgeBaseEOServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 9ab7619ea..79bbdb54d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -18,6 +18,7 @@ import com.jero.modules.document.enums.SearchEnum; import com.jero.modules.document.utils.ReadPdfUtil; import com.jero.modules.document.utils.ReadWordUtil; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -886,7 +887,20 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl Date: Wed, 26 Oct 2022 17:41:28 +0800 Subject: [PATCH 084/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/PermissionList.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue index d87517f89..a47e4a910 100644 --- a/jero-web/src/views/system/PermissionList.vue +++ b/jero-web/src/views/system/PermissionList.vue @@ -56,7 +56,7 @@ {{$t('DataRules')}} - + {{$t('delete')}} @@ -187,6 +187,16 @@ } }, methods: { + isTrue(record) { + if (record.id == '1580735287309119489' || + record.id == '1580735611793059842' || + record.id == '1580735965892980738' || + record.id == '1580734309507805185' || + record.id == '1580762600394469378') { + return false + } + return true + }, loadData() { this.dataSource = [] getPermissionList().then((res) => { From 737305c62615b3d44004a557346119d0002bf7b2 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 26 Oct 2022 17:44:04 +0800 Subject: [PATCH 085/108] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B6=88=E6=81=AF(=E4=B8=8D=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 4 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 121 ++++++++++++++---- 2 files changed, 98 insertions(+), 27 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 8e105fc78..3a03f22b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -2939,9 +2939,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); - String msgContentEN = ""; - String msgTitle = ""; + //String msgContentEN = ""; + //String msgTitle = ""; String initiator = ""; + String evaluationTitle= jsonObject.getString("title"); + String endTime = jsonObject.getString("endTime"); //截止日期 + String title = MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getCn() + "/" + MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getEn(); + String cnContentUpper = ""; + String cnContentLower = ""; + String enContentUpper = ""; + String enContentLower = ""; if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_START_MSG.getValue())){ userIdList.add(jsonObject.getString("evaluationId")); - String endTime = jsonObject.getString("endTime"); //截止日期 + //String endTime = jsonObject.getString("endTime"); //截止日期 //您收到GB 7258 的法规技术评估流程任务，请及时查看处理。 - msgContentEN = "You recieved the Regulatory and technical assessment of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner."; - msgTitle = "You have a Regulatory and technical assessment task to complete"; + //msgContentEN = "You recieved the Regulatory and technical assessment of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner."; + //msgTitle = "You have a Regulatory and technical assessment task to complete"; String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id SysUser currentUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); initiator = currentUser.getUsername(); + cnContentUpper = "您好，请及时查看处理此项任务，谢谢！"; + cnContentLower = "编号：" + serialNumber + + "\n标题: " + evaluationTitle + + "\n发起人: " + initiator + + "\n截止时间: " + endTime; + enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!"; + enContentLower = "Regulation No :" + serialNumber + + "\nTitle: " + evaluationTitle + + "\nInitiator: " + initiator + + "\nDue Date: " + endTime; }else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){ String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); userIdList.add(jsonObject.getString("initiatorUserId")); //XXX（人员账号）已提交GB 7258 的法规意见收集流程，请及时查看审核。 - msgContentEN = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time."; - msgTitle = "You have a Regulatory and technical assessment task to complete"; + //msgContentEN = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time."; + //msgTitle = "You have a Regulatory and technical assessment task to complete"; initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); + cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交评估结果，请审核"; + cnContentLower = "编号：" + serialNumber + + "\n标题: " + evaluationTitle + + "\n发起人: " + initiator + + "\n截止时间: " + endTime; + enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the assessment result. Please review it"; + enContentLower = "Regulation No :" + serialNumber + + "\nTitle: " + evaluationTitle + + "\nInitiator: " + initiator + + "\nDue Date: " + endTime; }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){ userIdList.add(jsonObject.getString("evaluationId")); //您提交的GB 7258 的法规技术评估流程已通过。 - msgContentEN = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed."; - msgTitle = "You have a Regulatory and technical assessment task completed"; + //msgContentEN = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed."; + //msgTitle = "You have a Regulatory and technical assessment task completed"; initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); + cnContentUpper = "您好，您提交的评估结果已通过"; + cnContentLower = "编号：" + serialNumber + + "\n标题: " + evaluationTitle + + "\n发起人: " + initiator + + "\n截止时间: " + endTime; + enContentUpper = "Hello! The assessment result you submitted has passed"; + enContentLower = "Regulation No :" + serialNumber + + "\nTitle: " + evaluationTitle + + "\nInitiator: " + initiator + + "\nDue Date: " + endTime; }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG.getValue())){ userIdList.add(jsonObject.getString("evaluationId")); //您提交的GB 7258 的法规技术评估流程已被退回，请及时查看处理。 - msgContentEN = "The regulatory and technical assessment process of "+serialNumber+" you submitted has been returned, Please check and address it in time."; - msgTitle = "You have a Regulatory and technical assessment task to complete"; + //msgContentEN = "The regulatory and technical assessment process of "+serialNumber+" you submitted has been returned, Please check and address it in time."; + //msgTitle = "You have a Regulatory and technical assessment task to complete"; initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); - }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())){ + cnContentUpper = "您好，您提交的评估结果被退回，请及时查看处理"; + cnContentLower = "编号：" + serialNumber + + "\n标题: " + evaluationTitle + + "\n发起人: " + initiator + + "\n截止时间: " + endTime; + enContentUpper = "\n" + + "Hello! The assessment result you submitted has been rejected. Please check and address it in a timely manner"; + enContentLower = "Regulation No :" + serialNumber + + "\nTitle: " + evaluationTitle + + "\nInitiator: " + initiator + + "\nDue Date: " + endTime; + }/*else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())){ userIdList = (List) jsonObject.get("userIdList"); //您GB 7258的法规技术评估流程将于明天结束，请及时查看处理 - msgContentEN = "The the Regulatory and technical assessment of "+serialNumber+" will expire tomorrow. Please check and address it in time."; - msgTitle = "You have a Regulatory and technical assessment task to complete"; + //msgContentEN = "The the Regulatory and technical assessment of "+serialNumber+" will expire tomorrow. Please check and address it in time."; + //msgTitle = "You have a Regulatory and technical assessment task to complete"; initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); - } + }*/ + List thirdIdList = new ArrayList<>(); + List sysUsers = sysUserService.listByIds(userIdList); + if (ObjectUtils.isNotEmpty(sysUsers)) { + thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + } //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink(); + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper(cnContentUpper); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper(enContentUpper); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } //系统内部跳转链接 - String href = "" + " View details" + ""; - String contentInfo = msgContentEN + " " + href; + //String href = "" + " View details" + ""; + //String contentInfo = msgContentEN + " " + href; - Map sendMessageMap = new HashMap<>(); - sendMessageMap.put("hrefFeishu",hrefFeishu); - sendMessageMap.put("contentInfo",contentInfo); + //Map sendMessageMap = new HashMap<>(); + //sendMessageMap.put("hrefFeishu",hrefFeishu); + //sendMessageMap.put("contentInfo",contentInfo); - SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsTechnologyEvaluationId,sendMessageMap,null, MessageTypeEnum.REGULATORY_AND_TECHNICAL_ASSESSMENT,initiator); + //SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsTechnologyEvaluationId,sendMessageMap,null, MessageTypeEnum.REGULATORY_AND_TECHNICAL_ASSESSMENT,initiator); } @Override From e61dadc20f4b83be38276a8c81513487f39680a1 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 17:47:20 +0800 Subject: [PATCH 086/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/menu/index.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/menu/index.js b/jero-web/src/components/menu/index.js index 6255cfdd4..f4cf57561 100644 --- a/jero-web/src/components/menu/index.js +++ b/jero-web/src/components/menu/index.js @@ -109,8 +109,10 @@ export default { props = { to: { path: menu.path } } } - const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title } - + const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title } + if (menu.meta && menu.meta.existTask) { + attrs.style = 'color:red' + } if (menu.children && menu.alwaysShow) { // 把有子菜单的 并且 父菜单是要隐藏子菜单的 // 都给子菜单增加一个 hidden 属性 @@ -162,7 +164,8 @@ export default { span slot = 'title' > { this.renderIcon(menu.meta.icon) } - < span title={menu.meta.title}> { menu.meta.title } < /span> + < span + title = { menu.meta.title } > { menu.meta.title } < /span> < /span> { itemArr From 0a84706ece8c11c18614c553e5f8096ca3ca72ea Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 26 Oct 2022 19:47:56 +0800 Subject: [PATCH 087/108] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...echnologyEvaluationFlowDetailEOMapper.java | 2 + ...TechnologyEvaluationFlowDetailEOMapper.xml | 9 +++- ...LawsTechnologyEvaluationEOServiceImpl.java | 47 +++++++++++-------- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java index da6be153c..f2c103e1f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java @@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper { + LawsTechnologyEvaluationFlowDetailEO queryByEvaluationId(@Param("lawsTechnologyEvaluationId") String lawsTechnologyEvaluationId); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml index 72cc2a9f6..c1fdf969b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml @@ -14,4 +14,11 @@ - \ No newline at end of file + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index df2810139..145ff7e00 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; +import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.*; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.MsgTypeEnum; @@ -55,6 +56,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.IOException; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -109,6 +111,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); //String msgContentEN = ""; //String msgTitle = ""; String initiator = ""; - String evaluationTitle= jsonObject.getString("title"); - String endTime = jsonObject.getString("endTime"); //截止日期 + String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId"); + LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = queryById(lawsTechnologyEvaluationId); + LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId); + String number = flowDetailEO.getPrcNum(); + String name = flowDetailEO.getPrcName(); + String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsTechnologyEvaluationEO.getEndTime()); + String title = MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getCn() + "/" + MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getEn(); String cnContentUpper = ""; String cnContentLower = ""; @@ -641,13 +650,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl Date: Thu, 27 Oct 2022 09:05:09 +0800 Subject: [PATCH 088/108] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/feishu/vo/FeishuMsgVo.java | 9 +++++++++ .../modules/warn/service/LawsWarnService.java | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java index 63c74a9a6..3544db025 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java @@ -28,5 +28,14 @@ public class FeishuMsgVo { private String assignee; //评估人 适用范围：责任人提交通知发起人（设计符合性，pre-homo符合性，验证符合性） + private String RegulationNo; //编号 + + private String documentTitle; //文档标题 + + private String NewTypeExecutionDate; //新车型实施日期 + + private String NewVehicleExecutionDate; //在产车实施日期 + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index beab9d1eb..b33146b0c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -13,6 +13,7 @@ import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; @@ -453,6 +454,22 @@ public class LawsWarnService { } }); String contentTemp = sysUser.getUsername() + " has pushed " + StringUtils.join(list, ",") + ", Please be reminded to check it out."; + + //XXX向您分享了法规预警信息。 + //XXX shared Regulation Early Warning infomation with you. + String contentInfoFei = sysUser.getUsername() +" shared Regulation Early Warning infomation with you.."; + String contentInfoFeiCn = sysUser.getUsername() +"向您分享了法规预警信息"; + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName()); + feishuMsgVo.setUrl(encode); + feishuMsgVo.setContentEn(contentInfoFei); + feishuMsgVo.setContent(contentInfoFeiCn); +// feishuMsgVo.setRegulationNo(); +// feishuMsgVo.setDocumentTitle(); +// feishuMsgVo.setNewTypeExecutionDate(); +// feishuMsgVo.setNewVehicleExecutionDate(); + +// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); } } catch (IOException e) { From 78f7d3e00898cc817d23aeb5e4ae436bf1d0f11f Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 27 Oct 2022 10:04:36 +0800 Subject: [PATCH 089/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/processCenter/components/feedbackInformation.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 070169538..5b427777a 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -33,6 +33,7 @@ }]"> @@ -53,6 +54,7 @@ }]">
From 04e6792f0b3c83fde46a40f9236eaaf92bb6b2e5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 10:07:13 +0800 Subject: [PATCH 090/108] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99=201.=20=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E8=A1=8C=202.=20?= =?UTF-8?q?=E6=96=B0=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E6=94=B9=E4=B8=BA=E3=80=80=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=203.=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=AF=B9=E9=BD=90(?= =?UTF-8?q?=E4=B8=AD=E6=96=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/enums/DictCodeReportEnum.java | 1 + .../LawsMonthlyReportWriteEOServiceImpl.java | 6 ++--- .../jero/modules/report/util/WordUtil.java | 26 +++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java index 5e6d09401..edb196464 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java @@ -10,6 +10,7 @@ public enum DictCodeReportEnum { APPLYCAR("适用车型","car_type"), APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"), STATE("状态","state"), + STATE_REPORT("状态","fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4"), USEMETHOD("用法","yong4_fa3"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index d2abd92d2..8da692939 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -891,9 +891,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 27 Oct 2022 10:14:41 +0800 Subject: [PATCH 091/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 1bca8ea51..e9fb33a95 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -164,7 +164,7 @@
{{$t('ImplementationDate')}} + :title="$t('releaseDate')">{{$t('releaseDate')}}
@@ -179,7 +179,7 @@
{{$t('vehicleInProductionDate')}} + :title="$t('implemenDate')">{{$t('implemenDate')}}
@@ -340,14 +340,14 @@ productionCarImplementTime: [ { max: 500, - message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + message: this.$t('implemenDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], newCarImplementTime: [ { max: 500, - message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], From 835c005f6c59bf6fdec29f1f7ee95e6811b3a2c0 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 27 Oct 2022 10:30:23 +0800 Subject: [PATCH 092/108] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=A8=A1=E5=9D=97=E6=B6=88=E6=81=AF=E5=AE=8C?= =?UTF-8?q?=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationRemindJob.java | 65 +++++++++++++++++-- ...LawsTechnologyEvaluationEOServiceImpl.java | 31 +++++++-- .../modules/project/enums/MsgTypeEnum.java | 2 + 3 files changed, 88 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java index 66cc0531d..e2cdfab4b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java @@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.job; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.exception.JeroBootException; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; @@ -52,14 +53,16 @@ public class LawsTechnologyEvaluationRemindJob implements Job { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //获取后一天的时间 - Calendar calendar=new GregorianCalendar(); - calendar.setTime(new Date()); - calendar.add(Calendar.DATE,1); - Date nextDay = calendar.getTime(); + //Calendar calendar=new GregorianCalendar(); + //calendar.setTime(new Date()); + //calendar.add(Calendar.DATE,1); + //Date nextDay = calendar.getTime(); - String nextDayStr = sdf.format(nextDay); + //String nextDayStr = sdf.format(nextDay); + + String now = sdf.format(new Date()); LawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> { - if(StringUtils.equals(nextDayStr,sdf.format(lawsTechnologyEvaluationEO.getEndTime()))){ + /*if(StringUtils.equals(nextDayStr,sdf.format(lawsTechnologyEvaluationEO.getEndTime()))){ String actiProcInstIds = flowDetailList.stream().filter(flowDetail -> { boolean flag = false; @@ -80,6 +83,56 @@ public class LawsTechnologyEvaluationRemindJob implements Job { this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); } } + }*/ + String endTime = sdf.format(lawsTechnologyEvaluationEO.getEndTime()); + int days = 0; + try { + days = (int) (sdf.parse(endTime).getTime() - sdf.parse(now).getTime()) / (24 * 60 * 60 * 1000); + } catch (Exception e) { + e.printStackTrace(); + throw new JeroBootException("日期转换错误"); + } + + if (days == 3) { + //到期前3天 + String actiProcInstIds = flowDetailList.stream().filter(flowDetail -> { + boolean flag = false; + if (StringUtils.equals(lawsTechnologyEvaluationEO.getId(), flowDetail.getLawsTechnologyEvaluationId())) { + flag = true; + } + return flag; + }).map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); + + if(StringUtils.isNotEmpty(actiProcInstIds)){ + List userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds); + if(CollectionUtils.isNotEmpty(userIdList)){ + JSONObject sendJsonObject = new JSONObject(); + sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue()); + sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId()); + sendJsonObject.put("userIdList",userIdList); + this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); + } + } + } else if (endTime.equals(now)){ + //当天 + String actiProcInstIds = flowDetailList.stream().filter(flowDetail -> { + boolean flag = false; + if (StringUtils.equals(lawsTechnologyEvaluationEO.getId(), flowDetail.getLawsTechnologyEvaluationId())) { + flag = true; + } + return flag; + }).map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); + + if(StringUtils.isNotEmpty(actiProcInstIds)){ + List userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds); + if(CollectionUtils.isNotEmpty(userIdList)){ + JSONObject sendJsonObject = new JSONObject(); + sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue()); + sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId()); + sendJsonObject.put("userIdList",userIdList); + this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); + } + } } }); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 145ff7e00..2b0022548 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -708,20 +708,43 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl) jsonObject.get("userIdList"); + + } else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue())) { + initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); + cnContentUpper = "您好，该任务将于今天到期，请尽快查看处理，谢谢！"; + cnContentLower = "编号：" + number + + "\n标题: " + name + + "\n发起人: " + initiator; + enContentUpper = "Hello! This task will expire today. Please check and address the task ASAP. Thank you!"; + enContentLower = "Regulation No :" + number + + "\nTitle: " + name + + "\nInitiator: " + initiator; + userIdList = (List) jsonObject.get("userIdList"); + + } /*else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())) { userIdList = (List) jsonObject.get("userIdList"); //您GB 7258的法规技术评估流程将于明天结束，请及时查看处理 //msgContentEN = "The the Regulatory and technical assessment of "+serialNumber+" will expire tomorrow. Please check and address it in time."; //msgTitle = "You have a Regulatory and technical assessment task to complete"; initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(); - }*/ + } */ List thirdIdList = new ArrayList<>(); List sysUsers = sysUserService.listByIds(userIdList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java index c78462df3..da4cfd16b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java @@ -40,6 +40,8 @@ public enum MsgTypeEnum { LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG("法规技术评估,发起人审核通过消息","lawsTechnologyEvaluationAuditAcceptedMsg"), LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG("法规技术评估，发起人审核拒绝消息","lawsTechnologyEvaluationAuditRejectedMsg"), LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG("法规技术评估到期前一天消息","lawsTechnologyEvaluationExpireRemindMsg"), + LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG("法规技术评估到期前三天消息","lawsTechnologyEvaluationExpireRemindThreeDaysBeforeMsg"), + LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG("法规技术评估到期当天消息","lawsTechnologyEvaluationExpireRemindTodayMsg"), ; String name; From ddc97405ccc05f56e8b665fcc89f28ad138fae9a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 10:57:00 +0800 Subject: [PATCH 093/108] =?UTF-8?q?=E9=A1=B5=E7=9C=89=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=9F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 2 +- .../java/com/jero/modules/report/util/WordUtil.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 8da692939..a2ac6c7c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -1257,7 +1257,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 27 Oct 2022 11:01:20 +0800 Subject: [PATCH 094/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/components/evaluatorFeedbackList.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index e3cdc3930..f611b6cbc 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -373,7 +373,11 @@ antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden' }) } - if (this.$route.query.taskDefinitionKey != 'pgrqr') { + let disabled = false + if (this.$route.query.isDisabled) { + disabled = JSON.parse(this.$route.query.isDisabled) + } + if (this.$route.query.taskDefinitionKey != 'pgrqr' && !disabled) { this.dataSource.forEach(res => { res.sponsorFeedback = '' }) From 54a63160b54080a5b83d7cf8fbe26479f4b59ac6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 27 Oct 2022 11:09:33 +0800 Subject: [PATCH 095/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationReport/components/RegulationMonthlyFill.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 2be197f75..7ea6a4afa 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -92,14 +92,14 @@ @click="viewClick(record)"> {{$t('view')}} + {{$t('edit')}} + {{$t('deleteLib')}} From 6580ac32acc400a5589c4313496853388547eee9 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 11:10:03 +0800 Subject: [PATCH 096/108] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 139 ++---------------- 1 file changed, 14 insertions(+), 125 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index a2ac6c7c5..2e6fb60b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -296,14 +296,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); + //新需求月报填写不设置去权限, 所有的人都可以查看-------------------------------------------------------------------------------------- //管理员查看全部数据,其余人只能查看自己的数据 - LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); - if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ - queryWrapper.in("create_by",currentUser.getUsername()); - } -// Page page = new Page(pageNo, pageSize); -// Page pageInfo = this.page(page, queryWrapper); +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); +// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ +// queryWrapper.in("create_by",currentUser.getUsername()); +// } + //------------------------------------------------------------------------------------- //所有的月报 @@ -439,119 +439,6 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp, -// Integer pageNo, -// Integer pageSize, -// HttpServletRequest req) { -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); -// queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); -// //管理员查看全部数据,其余人只能查看自己的数据 -// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); -// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ -// queryWrapper.in("create_by",currentUser.getUsername()); -// } -// Page page = new Page(pageNo, pageSize); -// Page pageInfo = this.page(page, queryWrapper); -// //法规月报id -// List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); -// List userIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); -// List userIds = new ArrayList<>(); -// for (String s : userIdList) { -// if(StringUtils.isNotBlank(s)){ -// if(s.contains(",")){ -// userIds.addAll(Arrays.asList(s.split(","))); -// }else{ -// userIds.add(s); -// } -// } -// } -// List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); -// List userList = new ArrayList<>(); -// for (JSONObject jsonObject : jsonObjects) { -// LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); -// userList.add(loginUser); -// } -// -// //获取章节目录 -// List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); -// -// //新征求意见清单模板 -// List newOpinionTemplateEOList = new ArrayList<>(); -// if(lawsMonthlyReportIdList.size() != 0){ -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); -// newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); -// } -// -// -// //新发布标准清单模板 -// List newStandardTemplateEOList = new ArrayList<>(); -// if(lawsMonthlyReportIdList.size() != 0){ -// LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); -// qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); -// newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); -// } -// -// -// for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { -// //处理法规联系人 -// lawsContact(userList, lawsMonthlyReportWriteEO,lawsMonthlyReportWriteEOTemp.getCut()); -// //处理章节目录 -// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ -// List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ -// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); -// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ -// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); -// } -// } -// //处理章节目录对应的一级目录 -// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapterOne())){ -// List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapterOne().equals(e.getId())).collect(Collectors.toList()); -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ -// lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); -// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ -// lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); -// } -// } -// -// if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ -// //新征求意见清单模板 -// List collect = newOpinionTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); -// lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect); -// -// }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ -// //新发布标准清单模板 -// List collect = newStandardTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); -// lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect); -// } -// -// //处理导出状态 -// String exportState = lawsMonthlyReportWriteEO.getExportState(); -// if(StringUtils.isNotBlank(exportState)){ -// if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){ -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName()); -// }else{ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn()); -// } -// }else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){ -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName()); -// }else{ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn()); -// } -// } -// } -// } -// return pageInfo; -// } private void lawsContact(List userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) { String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); @@ -588,12 +475,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); - if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ - wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); - } +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); +// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ +// wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); +// } + //---------------------------------------------------------------------------------------- List lawsMonthlyReportWriteEOS = this.list(wrapper); if(lawsMonthlyReportWriteEOS.size() == 0){ From b2100c360f9169d0f4442ee8f19d072574849ca3 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 27 Oct 2022 11:26:59 +0800 Subject: [PATCH 097/108] =?UTF-8?q?61842-=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=B7=B2=E5=8A=9E/=E5=B7=B2=E5=8F=91=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=8C=89=E7=85=A7=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 72a3b386a..5cd218e78 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 @@ -92,7 +92,7 @@ left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id LEFT JOIN sys_user createBy on createBy.id = pi.create_by - order by pi.end_time asc + order by pi.end_time desc From 60e585043f72ab20eb72af801594446634c00caa Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 27 Oct 2022 11:35:45 +0800 Subject: [PATCH 098/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluatorFeedback.vue | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 66b4c56aa..85420a896 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -15,7 +15,15 @@ {{$t('complianceResults')}}
- {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}} + + {{$t('accord')}} + + + {{$t('nonConformity')}} + + + -- +
{{$t('relevantSections')}}
- {{item.relatedSection}} + {{item.relatedSection ?item.relatedSection : '--'}}
{{$t('problemDescription')}}
- {{item.issueOrSuggest}} + {{item.issueOrSuggest ? item.issueOrSuggest :'--'}}
{{$t('relevantSections')}}
- {{item.relatedSection}} + {{item.relatedSection?item.relatedSection : '--'}}
@@ -132,7 +140,7 @@ :title="$t('problemDescription')">{{$t('problemDescription')}}
- {{item.issueOrSuggest}} + {{item.issueOrSuggest ? item.issueOrSuggest:'--'}}
From 7dc56839b4d018fe101d17de7ee8c7878cc434d7 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 27 Oct 2022 14:09:46 +0800 Subject: [PATCH 099/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/processForm/regulatoryProcess/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index dfb95253c..181c1f247 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -124,10 +124,16 @@ }) }, lawsOpinionAssessmentResult() { + let createBy = '' + if (this.$route.query.taskDefinitionKey == 'gcsfq' && this.disabled){ + createBy = '' + }else{ + createBy = this.userInfo().username + } getAction(this.url.list, { lawsOpinionGatherId: this.queryProject.id, actiProcInstId: this.$route.query.prcId, - createBy: this.userInfo().username + createBy: createBy }).then((res) => { if (res.success) { this.feedbackDataList = res.result || [] From 99364d52f34d0e4c74e59fdd374e4fb186fdff77 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 27 Oct 2022 14:11:33 +0800 Subject: [PATCH 100/108] =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86=E6=A0=87=E5=87=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E3=80=82=E6=8B=BC=E6=8E=A5=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=B1=95=E7=A4=BA=20=E4=B8=8E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProcessInfoEOMapper.xml | 147 ++++++++++-------- .../modules/todoCenter/vo/ProcessInfoVO.java | 7 +- 2 files changed, 85 insertions(+), 69 deletions(-) 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 5cd218e78..57501c8f3 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 @@ -73,6 +73,7 @@ pyni.year_name, pli.serial_number, pli.title, + plb.title_en, pi.flow_type, createBy.username as "create_by", pi.end_time, @@ -106,6 +107,7 @@ pyni.year_name, pli.serial_number, pli.title, + plb.title_en, pi.flow_type, createBy.username AS "create_by", pi.end_time, @@ -150,6 +152,7 @@ pyni.year_name, '--' as serial_number, '' as title, + '' as title_en, pi.flow_type, createBy.username AS "create_by", (select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time, @@ -206,85 +209,93 @@ order by temp.end_time asc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java index 75577e278..94a903a45 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java @@ -80,8 +80,10 @@ public class ProcessInfoVO implements Serializable { /**标准编号*/ private String serialNumber; - /**标准标题*/ + /**标准标题-中文*/ private String title; + /**标准标题-英文*/ + private String titleEn; /**项目名称*/ private String projectName; /**年份*/ @@ -102,4 +104,7 @@ public class ProcessInfoVO implements Serializable { private String personChargeFeedback; /**截止日期 过期标识：true为已经过期 false为没有过期**/ private boolean endTimePastDueFlag = false; + + /**标准信息**/ + private String standardInfo; } From ed5354b8a6cdd177f213767d314a90b0c91b5587 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 27 Oct 2022 14:15:39 +0800 Subject: [PATCH 101/108] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 6 +++--- .../projectRegulationTasks/components/dealtWith.vue | 11 ++++++----- .../projectRegulationTasks/components/doneList.vue | 6 +++--- .../views/toDoCenter/projectRegulationTasks/index.vue | 2 +- .../regulatoryAssessmentTasks/components/SentList.vue | 6 +++--- .../components/dealtWith.vue | 6 +++--- .../regulatoryAssessmentTasks/components/doneList.vue | 6 +++--- .../toDoCenter/regulatoryAssessmentTasks/index.vue | 2 +- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 2e445401c..a282c6bd0 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -21,8 +21,8 @@ {{text}} - - {{text+'、'+record.title}} + + {{text}} -- @@ -63,7 +63,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'serialNumber', + dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 7e7b36dc4..118d34cae 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -22,8 +22,8 @@ {{text}} - - {{text+'、'+record.title}} + + {{text}} -- @@ -64,7 +64,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'serialNumber', + dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, width: 170 @@ -331,7 +331,8 @@ text-align: right; margin-top: 20px; } - .activeRed{ - color: red; + + .activeRed { + color: red; } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 559e9f016..ec3a33458 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -23,8 +23,8 @@ - - {{text+'、'+record.title}} + + {{text}} -- @@ -69,7 +69,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'serialNumber', + dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, width: 170 diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index a97b542c2..bd405bd48 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -18,7 +18,7 @@ {{$t('standardInformation')}} + v-model="queryParam.standardInfo"> diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index fb13eae0c..03459bc80 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -18,8 +18,8 @@ @click="viewClick(record)">{{$t('view')}} - - {{text+'、'+record.title}} + + {{text}} @@ -54,7 +54,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'serialNumber', + dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index eba3c634c..f37f9d6b6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -19,8 +19,8 @@ {{text}} - - {{text+'、'+record.title}} + + {{text}} @@ -52,7 +52,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'serialNumber', + dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index efc218fae..febfb2bf7 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -18,8 +18,8 @@ @click="viewClick(record)">{{$t('view')}} - - {{text+'、'+record.title}} + + {{text}} @@ -51,7 +51,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'serialNumber', + dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, width: 170 diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index 3b8ff22f4..7849db357 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -9,7 +9,7 @@ {{$t('standardInformation')}} + v-model="queryParam.standardInfo"> From b511a20216dff73808f5baec0548be4c2daa2101 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 14:19:30 +0800 Subject: [PATCH 102/108] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=8E=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 28 +++++++++++++------ .../jero/modules/report/util/WordUtil.java | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 2e6fb60b0..cd0701450 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -611,10 +611,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, @@ -763,7 +764,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, List reportTitleOneList, @@ -799,12 +808,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList()); - + //二级目录按sort正序排序 + Collections.sort(reportTitleTwoList);//正序排序 for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) { int reportCount = 1; @@ -822,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList()); - + Collections.sort(reportTitleTwoList);//正序排序 for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) { int reportCount = 1; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index f4678b253..93fddedfd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -406,7 +406,7 @@ public class WordUtil { paragraph.setAlignment(ParagraphAlignment.CENTER); XWPFRun run = paragraph.createRun(); run.setText("NIO Internal"); - run.setFontSize(18); + run.setFontSize(12); run.setFontFamily("Blue Sky Standard Regular"); // run.setFontFamily("Blue Sky Noto Regular"); run.setBold(true); From 0b1313372089ce8a19e1122d8e799abc6d59dae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 27 Oct 2022 14:23:10 +0800 Subject: [PATCH 103/108] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareItemCommentServiceImpl.java | 104 +++++++++--------- 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index 2a5b0ced8..f7268d40f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -314,36 +314,38 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl 1) { - for (int j = 0; j < leftSplit.length; j++) { - if (ObjectUtils.isNotEmpty(leftSplit[j])) { - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - if (j > 0) { - Row row2 = sheet.getRow(j + i); - if (ObjectUtils.isEmpty(row2)) { - row2 = sheet.createRow(j + i); + if (StringUtils.isNotEmpty(text)){ + log.info("-------------- 开始开始拆分左侧图片、文字、表格 :" + text + "-----------------"); + String rowDataAndPath = getSplitContent(request, text); + log.info("-------------- 左侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +"-----------------"); + leftSplit = rowDataAndPath.split("---"); + if (leftSplit.length > 1) { + for (int j = 0; j < leftSplit.length; j++) { + if (ObjectUtils.isNotEmpty(leftSplit[j])) { + ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); + if (j > 0) { + Row row2 = sheet.getRow(j + i); + if (ObjectUtils.isEmpty(row2)) { + row2 = sheet.createRow(j + i); + } + log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3); + log.info("-------------- 左侧图片、表格 处理成功 -----------------"); + } else { + log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3); + log.info("-------------- 左侧图片、表格 处理成功 -----------------"); } - log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3); - log.info("-------------- 左侧图片、表格 处理成功 -----------------"); - } else { - log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3); - log.info("-------------- 左侧图片、表格 处理成功 -----------------"); } } + sarFileCompareExcelMergeCell.setLeftStart(i); + sarFileCompareExcelMergeCell.setLeftEnd(i + leftSplit.length - 1); + sarFileCompareExcelMergeCell.setRightStart(0); + sarFileCompareExcelMergeCell.setRightEnd(0); + mergeCells.add(sarFileCompareExcelMergeCell); + } else { + row.createCell(3).setCellValue(rowDataAndPath); } - sarFileCompareExcelMergeCell.setLeftStart(i); - sarFileCompareExcelMergeCell.setLeftEnd(i + leftSplit.length - 1); - sarFileCompareExcelMergeCell.setRightStart(0); - sarFileCompareExcelMergeCell.setRightEnd(0); - mergeCells.add(sarFileCompareExcelMergeCell); - } else { - row.createCell(3).setCellValue(rowDataAndPath); } } } @@ -354,34 +356,36 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl 1) { - for (int j = 0; j < rightSplit.length; j++) { - if (ObjectUtils.isNotEmpty(rightSplit[j])) { - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - if (j > 0) { - Row row2 = sheet.getRow(j + i); - if (ObjectUtils.isEmpty(row2)) { - row2 = sheet.createRow(j + i); + if (StringUtils.isNotEmpty(text)) { + log.info("-------------- 开始开始拆分右侧图片、文字、表格 :"+ text +" -----------------"); + String rowDataAndPath = getSplitContent(request, text); + log.info("-------------- 右侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +" -----------------"); + rightSplit = rowDataAndPath.split("---"); + if (rightSplit.length > 1) { + for (int j = 0; j < rightSplit.length; j++) { + if (ObjectUtils.isNotEmpty(rightSplit[j])) { + ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); + if (j > 0) { + Row row2 = sheet.getRow(j + i); + if (ObjectUtils.isEmpty(row2)) { + row2 = sheet.createRow(j + i); + } + log.info("-------------- 开始处理右侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7); + log.info("-------------- 右侧图片、表格 处理成功 -----------------"); + } else { + log.info("-------------- 开始处理右侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7); + log.info("-------------- 右侧图片、表格 处理成功 -----------------"); } - log.info("-------------- 开始处理右侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7); - log.info("-------------- 右侧图片、表格 处理成功 -----------------"); - } else { - log.info("-------------- 开始处理右侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7); - log.info("-------------- 右侧图片、表格 处理成功 -----------------"); } } + sarFileCompareExcelMergeCell.setRightStart(i); + sarFileCompareExcelMergeCell.setRightEnd(i + rightSplit.length - 1); + mergeCells.add(sarFileCompareExcelMergeCell); + } else { + row.createCell(7).setCellValue(rowDataAndPath); } - sarFileCompareExcelMergeCell.setRightStart(i); - sarFileCompareExcelMergeCell.setRightEnd(i + rightSplit.length - 1); - mergeCells.add(sarFileCompareExcelMergeCell); - } else { - row.createCell(7).setCellValue(rowDataAndPath); } } } From 73f67a1d3b4fdbfc138070dd26689ce5f717c908 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 14:51:43 +0800 Subject: [PATCH 104/108] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/report/util/WordUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 93fddedfd..f74979de8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -1292,7 +1292,7 @@ public class WordUtil { blank = ""; break; case "Enterprise": - blank = " "; + blank = " "; break; case "Vehicle": blank = " "; @@ -1301,7 +1301,7 @@ public class WordUtil { blank = "\r\n"; break; case "New Car Model": - blank = " "; + blank = " "; break; case "Models In Production": blank = ""; @@ -1316,10 +1316,10 @@ public class WordUtil { blank = ""; break; case "Draft": - blank = " "; + blank = " "; break; case "Public Notice": - blank = " "; + blank = " "; break; case "Release": blank = ""; @@ -1334,10 +1334,10 @@ public class WordUtil { blank = ""; break; case "Mandatory": - blank = " "; + blank = " "; break; case "Voluntary": - blank = " "; + blank = "\r\n"; break; case "Mandatory if fitted": blank = ""; From 5701e0e59f8682301d378d90a96edc169e8985aa Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 15:06:16 +0800 Subject: [PATCH 105/108] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9--?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E8=BE=B9=E8=B7=9D,=20=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=A2=84=E7=95=99=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 4 ++-- .../src/main/java/com/jero/modules/report/util/WordUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index cd0701450..877e7d373 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -832,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 27 Oct 2022 15:13:39 +0800 Subject: [PATCH 106/108] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProcessInfoEOMapper.xml | 225 +++++++++--------- .../impl/ProcessInfoEOServiceImpl.java | 1 + 2 files changed, 120 insertions(+), 106 deletions(-) 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 57501c8f3..546b830d8 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 @@ -19,81 +19,102 @@ - ( - pi.id IN ( - SELECT - pid.process_info_id - FROM - process_info_detail pid - - pid.user_id = #{params.currentUserId} - - and pid.status = #{params.taskStatus} - - - ) - ) and ( - pni.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%') - or pyni.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%') + temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%') + or temp.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%') ) - - and ( - pli.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%') - ) + + and temp.standard_info like CONCAT(CONCAT('%',#{params.standardInfo}),'%') - and pi.flow_type = #{params.flowType} + and temp.flow_type = #{params.flowType} - and pi.status = #{params.status} - - - and pi.flow_type in - - #{item} - - - - and pi.create_by = #{params.createBy} + and temp.status = #{params.status}