diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index d25f88f18..16ac8cb01 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -26,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -294,6 +291,7 @@ public class SysCategoryServiceImpl extends ServiceImpl 责任人接受之后,等待提交交付物 * 任务审查 -> 责任人提交交付物之后,认证工程师审查。 */ + LIST_CONFIRMATION("List Release","清单校核","List Release"), CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task Initiation"), TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Responsibilty Confirmation"), TASK_HANDLING ("Task handling","任务办理","Task Handling"), TASK_REVIEW ("Task Review","任务审查","Task Review"), + TASK_SS("Supplementary Submission","补充提交","Supplementary Submission"), // 责任人补充提交发起 ; String key; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 7cf8f9d4c..263506baa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -55,6 +55,7 @@ import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysRoleMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; @@ -65,6 +66,7 @@ import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; +import com.jero.modules.wkflow.service.IProcessHistoryEOService; import lombok.SneakyThrows; import org.apache.commons.io.FileUtils; import org.apache.poi.hssf.usermodel.*; @@ -143,6 +145,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl updateStatusBatch(JSONObject json) { String ids = json.getString("ids"); String flowStatus = json.getString("flowStatus"); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(StringUtils.isNotEmpty(ids)){ QueryWrapper pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(","))); @@ -849,6 +856,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { pciEo.setFlowStatus(flowStatus); + processHistoryEOService.add(pciEo.getId(),CertificationFlowNodeEnum.TASK_SS.getKey(),currentUser.getId(),null,null,null); }); this.updateBatchById(pciEoList); @@ -1146,11 +1154,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList = new ArrayList<>(); - + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { // 将数据的状态更新为:清单待校核,更新截止时间。等待认证工程师进行操作。 projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectCertificationInventoryEO.setInventoryVerifyEndTime(inventoryVerifyEndTime); + processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.LIST_CONFIRMATION.getKey(),currentUser.getId(),null,null,null); } this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue()); @@ -1443,12 +1452,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId()); + if (ObjectUtils.isNotEmpty(dutyTerritoryList)) { + queryWrapper.and(query -> { + for (String duty : dutyTerritoryList) { + query.or(q -> { + q.like("duty_territory", duty); + }); + } + }); + } + } IPage pageList = this.page(page, queryWrapper); this.disposeData(pageList.getRecords(),cut); List records = this.hearSort(projectCertificationInventoryEO, pageList.getRecords()); @@ -1882,6 +1906,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId()); + if (ObjectUtils.isNotEmpty(dutyTerritoryList)) { + queryWrapper.and(query -> { + for (String duty : dutyTerritoryList) { + query.or(q -> { + q.like("duty_territory", duty); + }); + } + }); + } + } if (StringUtils.isNotEmpty(designFlowStatusStr)) { String finalDesignFlowStatusStr = designFlowStatusStr.replaceAll("\\*",""); queryWrapper.and(query -> { @@ -13613,8 +13629,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl page = new Page(pageNo, pageSize); IPage pageList = this.page(page, queryWrapper); List result = pageList.getRecords(); - if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) { - //查当前用户Viewer对应责任领域 - List dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId()); - if (ObjectUtils.isNotEmpty(dutyTerritoryList)) { - result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList()); - } else { - result = new ArrayList<>(); - } - } + this.dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut()); this.dataDictDispose(result,projectLawsInventoryEO.getCut()); //表头排序 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/PhoneProcessHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/PhoneProcessHistoryEOController.java index c2271c9a6..3ff3afed5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/PhoneProcessHistoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/PhoneProcessHistoryEOController.java @@ -31,7 +31,7 @@ import java.util.Map; * @Date: 2022-05-18 * @Version: V1.0 */ -@Api(tags="流程历史表") +@Api(tags="phone流程历史表") @RestController @RequestMapping("/phone/wkflow/processHistoryEO") @Slf4j @@ -195,4 +195,17 @@ public class PhoneProcessHistoryEOController extends JeroController> queryCertificationProcessHistoryList(@RequestParam String id,@RequestParam String cut) { + List list = processHistoryEOService.queryCertificationProcessHistoryList(id,cut); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java index 5c9d6adcd..2455d8b9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java @@ -23,6 +23,18 @@ public interface IProcessHistoryEOService extends IService { */ void add(ProcessHistoryEO processHistoryEO); + + /** + * 添加历史记录 + * @param pid 流程实例ID + * @param tdKey 操作节点 + * @param opPersonId 操作人 + * @param opResult 操作结果 + * @param opinion 意见 + * @param file 附件id,多个之间使用英文逗号分隔 + */ + void add(String pid, String tdKey, String opPersonId, String opResult, String opinion, String file); + /** * 更新 * @@ -39,6 +51,8 @@ public interface IProcessHistoryEOService extends IService { */ void deleteById(String id); + void deleteByPId(String pids); + /** * 批量删除 * @@ -77,4 +91,6 @@ public interface IProcessHistoryEOService extends IService { * @return */ List queryComplianceProcessHistoryList(Map params); + + List queryCertificationProcessHistoryList(String id,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index a1708edf1..6589b78a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.project.enums.CertificationFlowNodeEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.project.enums.ReviewResultEnum; @@ -63,6 +64,27 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,pids.split(",")); + this.baseMapper.delete(queryWrapper); + } + } + /** * 批量删除 * @@ -190,11 +221,13 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl queryCertificationProcessHistoryList(String id,String cut) { + List processHistoryEOList = null; + if(StringUtils.isNotEmpty(id)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByAsc("create_time"); + queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, id); + processHistoryEOList = this.baseMapper.selectList(queryWrapper); + this.disposeData(processHistoryEOList, cut); + } + return processHistoryEOList; + + } } diff --git a/jero-web/public/index.html b/jero-web/public/index.html index cd9912069..9ff236148 100644 --- a/jero-web/public/index.html +++ b/jero-web/public/index.html @@ -5,7 +5,7 @@ - + 蔚来全球法规平台 diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 35abbfbc1..aac54112e 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -110,8 +110,8 @@ @click="titleClick(record)"> - @@ -148,9 +148,9 @@ - +