From adbcd211e482fb4998422c4b34a655ce91506d50 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 27 Sep 2022 17:44:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/examineInformation.vue | 7 +++++ .../processForm/handshakeProcess/index.vue | 28 +++++++++++-------- .../components/batchProcessing.vue | 3 ++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index e640eec56..385c860df 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -24,6 +24,9 @@ {{$t('inquiry')}} + + {{$t('sendBack')}} + @@ -106,6 +109,10 @@ title: { type: String, default: '' + }, + isSendBack:{ + type: Boolean, + default: false } }, components: { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 41fa34ad3..c19d1eb3c 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -31,6 +31,7 @@ v-if="isDisplay" isApprovalOpinion :title="titleName" + :isSendBack="isSendBackOne" ref="examineInformationRef" :url="url"/> @@ -145,6 +146,11 @@ return false } return true + }, + isSendBackOne() { + if (this.$route.query.taskDefinitionKey == 'zrrqr') { + return true + } } }, methods: { @@ -183,14 +189,14 @@ } }) }, - rejectCauseAdd(rejectCause,ids) { + rejectCauseAdd(rejectCause, ids) { let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') let query = { - rejectUserId:this.userInfo().id, - rejectTime:rejectTime, - rejectCause:rejectCause, - projectLawsInventoryId:ids, - rejectType:'1', + rejectUserId: this.userInfo().id, + rejectTime: rejectTime, + rejectCause: rejectCause, + projectLawsInventoryId: ids, + rejectType: '1' } postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { @@ -198,8 +204,8 @@ }, completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) - if (json.flag == '1'){ - this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) + if (json.flag == '1') { + this.rejectCauseAdd(value.approvalOpinion, this.queryBy.id) } Object.keys(json).forEach(res => { if (json[res] && typeof json[res] == 'string') { @@ -269,7 +275,7 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTaskDesign(value, res.result,true) + this.completeTaskDesign(value, res.result, true) } }) }, @@ -277,7 +283,7 @@ getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { }) }, - completeTaskDesign(value, taskId,isTrue) { + completeTaskDesign(value, taskId, isTrue) { value.reviewResult = 'launch' let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.operatorTime = operatorTime @@ -302,7 +308,7 @@ // this.$router.push({ // path: '/ProcessCenter' // }) - }else{ + } else { if (isTrue) { this.deleteProcessInstanceByTask(taskId) } diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue index 108dcf2d3..26af9622c 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue @@ -27,6 +27,9 @@ {{$t('inquiry')}} + + {{$t('sendBack')}} + From 0cf53352e6861c434edb96573b4110cac1a23569 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 18:02:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?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 --- .../tabComponents/processCenter/index.vue | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 0a37d733a..1d0c31769 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -70,6 +70,22 @@ {{prcTypeName[text]}} + + + {{record.serialNumber}} + + + {{record.prcNum}} + + + + + {{record.title}} + + + {{record.prcName}} + + {{$t('Processing')}} @@ -142,14 +158,16 @@ dataIndex: 'prcNum', align: 'center', width: 180, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'standard' } }, { title: this.$t('title'), dataIndex: 'prcName', align: 'center', width: 180, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'titleIndex' } }, { title: this.$t('ProcessType'), From 4f0cf1f6c8e239b866bb3cf7c35da25a8b5aeaf1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 28 Sep 2022 18:16:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?-=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E3=80=82?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=B8=BA=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectLibraryBase.java | 5 ++ .../service/IProjectLibraryBaseService.java | 2 + .../impl/ProjectLibraryBaseServiceImpl.java | 42 ++++++++- .../wkflow/controller/TaskController.java | 89 +++++++++++++++++++ .../modules/wkflow/entity/BusProcessName.java | 4 + 5 files changed, 139 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 46cdba5bb..d5cb571ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -105,4 +105,9 @@ public class ProjectLibraryBase implements Serializable { @TableField(exist = false) private String endTime; + + /**目标市场展示名称*/ + @TableField(exist = false) + private java.lang.String targetMarketName; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index d031986f3..f6f29e54c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -89,4 +89,6 @@ public interface IProjectLibraryBaseService extends IService void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map params); void checkData(String id, String cut); + + void disposeData(List records,String cut,boolean disposeTargetMarketFlag); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 783666259..2dd66c1b9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.enums.DictCodeEnum; @@ -17,8 +18,10 @@ import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; @@ -93,6 +96,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl queryById(String id) { List records = projectLibraryBaseMapper.queryById(id); - disposeData(records); + disposeData(records,"",false); for(ProjectLibraryBase projectLibraryBase: records){ if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); @@ -362,7 +368,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params); List records = result.getRecords(); - disposeData(records); + disposeData(records,"",false); for(ProjectLibraryBase projectLibraryBase: records){ if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); @@ -371,7 +377,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl records) { + @Override + public void disposeData(List records,String cut,boolean disposeTargetMarketFlag) { + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for (ProjectLibraryBase projectLibraryBase : records) { List sysUsers = new ArrayList<>(); //认证工程师多个id查询 @@ -402,6 +410,34 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl { + boolean flag = false; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, targetMarket.getValue())) { + flag = true; + } + } + return flag; + }).map(DictModel::getTextEn).collect(Collectors.joining(",")); + }else { + targetMarketName = targetMarketList.stream().filter(targetMarket -> { + boolean flag = false; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, targetMarket.getValue())) { + flag = true; + } + } + return flag; + }).map(DictModel::getText).collect(Collectors.joining(",")); + } + projectLibraryBase.setTargetMarketName(targetMarketName); + } + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java index 590fa4d09..67cd210d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java @@ -1,20 +1,31 @@ package com.jero.modules.wkflow.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectNameInfoEO; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.project.service.IProjectNameInfoEOService; +import com.jero.modules.project.service.IProjectYearNameInfoEOService; import com.jero.modules.wkflow.entity.BusMes; import com.jero.modules.wkflow.entity.BusProcessName; import com.jero.modules.wkflow.entity.BusProcessNew; import com.jero.modules.wkflow.entity.TaskCommonQuery; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.feginClient.impl.TaskFeignClientImpl; import com.jero.modules.wkflow.page.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.utils.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,6 +33,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Api(tags="待办任务") @@ -31,6 +43,14 @@ public class TaskController { @Autowired private TaskFeignClientImpl taskFeignClient; + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; + @Autowired + private IProjectNameInfoEOService projectNameInfoEOService; + @Autowired + private IProjectYearNameInfoEOService projectYearNameInfoEOService; /** * 通用接口 @@ -75,6 +95,7 @@ public class TaskController { List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); Page pageInfo = new Page(); if(busProcessNames!=null){ + this.disposeTaskToConfirm(busProcessNames,taskCommonQuery); pageInfo.setList(list1); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(busProcessNames.size())); @@ -89,6 +110,74 @@ public class TaskController { return pageInfo; } + + /** + * 处理任务确认流程回显数据 + * @param busProcessNames + */ + public void disposeTaskToConfirm(List busProcessNames,TaskCommonQuery taskCommonQuery){ + List projectLawsInventoryIdList = busProcessNames.stream().filter(busProcessName -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getPrcType(), FlowTypeEnum.RWQRLC.getValue())){ + flag = true; + } + return flag; + }).map(BusProcessName::getProjectLawsInventoryId).distinct().collect(Collectors.toList()); + List projectLibraryBaseList = new ArrayList<>(); + List projectLawsInventoryEOList = new ArrayList<>(); + + if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ + QueryWrapper lawsInventoryQueryWrap = new QueryWrapper<>(); + lawsInventoryQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrap); + + List projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLibraryIdList)){ + QueryWrapper libraryBaseQueryWrap = new QueryWrapper<>(); + libraryBaseQueryWrap.lambda().in(ProjectLibraryBase::getId,projectLibraryIdList); + projectLibraryBaseList = this.projectLibraryBaseService.list(libraryBaseQueryWrap); + this.projectLibraryBaseService.disposeData(projectLibraryBaseList,taskCommonQuery.getCut(),true); + } + for (BusProcessName busProcessName : busProcessNames) { + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getPrcType(),FlowTypeEnum.RWQRLC.getValue())){ + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + List projectLawsInventoryS = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getProjectLawsInventoryId(),lawsInventory.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLawsInventoryS) && CollectionUtils.isNotEmpty(projectLibraryBaseList)){ + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryS.get(0); + busProcessName.setSerialNumber(projectLawsInventoryEO.getSerialNumber()); + busProcessName.setTitle(projectLawsInventoryEO.getTitle()); + + List projectLibraryBaseS = projectLibraryBaseList.stream().filter(projectLibraryBase -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(projectLibraryBase.getId(), projectLawsInventoryEO.getProjectLibraryId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLibraryBaseS)){ + ProjectLibraryBase projectLibraryBase = projectLibraryBaseS.get(0); + ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()) + ); + ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()) + ); + + busProcessName.setProjectName(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" +projectLibraryBase.getTargetMarketName()); + } + } + } + } + } + } + } + @AutoLog(value = "查询草稿") @ApiOperation(value="查询草稿", notes="查询草稿") @PostMapping("/queryTaskDraft") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java index 29eeb524d..2b5bb65a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java @@ -74,4 +74,8 @@ public class BusProcessName implements Serializable { private String handlingTime; private String projectLawsInventoryId; + + private String serialNumber; + + private String title; }