diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java index 5064a784..9ac6650b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java @@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.activiti.process.common.entity.CenterQueryVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.common.service.ProcessDraftService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -23,6 +24,9 @@ import javax.validation.Valid; @RequestMapping("/process/center") public class ProcessCenterController { + @Resource + private ProcessDraftService draftService; + @Resource private ActFlowCommonService actFlowCommonService; @@ -83,7 +87,6 @@ public class ProcessCenterController { @ApiOperation(value="流程中心-草稿", notes="流程中心-草稿") @GetMapping("/draftList") public Result draftList(@Valid CenterQueryVO centerQueryVO) { - // TODO - return Result.OK(); + return Result.OK(draftService.getDraftList(centerQueryVO)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessCenterListVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessCenterListVO.java new file mode 100644 index 00000000..3ab24bdf --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessCenterListVO.java @@ -0,0 +1,16 @@ +package com.jero.modules.activiti.process.common.entity; + +import lombok.Data; + +/** + * @author: Mzaxd + * @Date: 2023/10/12 13:52 + */ +@Data +public class ProcessCenterListVO { + + + + + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 674a1233..69ebc584 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -57,6 +57,7 @@ public class ActFlowCommonService { Map variables = customService.setVariables(businessId); // 第一个节点默认通过 variables.put("pass", true); + variables.put("createUser", UserUtils.getUserId()); // 启动流程 ProcessInstance processInstance = runtimeService.startProcessInstanceById(latestProcessDefinition.getId(), variables); // 流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessDraftService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessDraftService.java index ec9cca7a..cbab2930 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessDraftService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessDraftService.java @@ -1,8 +1,12 @@ package com.jero.modules.activiti.process.common.service; +import com.jero.modules.activiti.process.common.entity.CenterQueryVO; +import com.jero.modules.activiti.process.common.entity.ProcessCenterListVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author ThinkBook * @description 针对表【process_draft】的数据库操作Service @@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessDraftService extends IService { + List getDraftList(CenterQueryVO centerQueryVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessDraftServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessDraftServiceImpl.java index 8bae2678..08697590 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessDraftServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessDraftServiceImpl.java @@ -1,11 +1,17 @@ package com.jero.modules.activiti.process.common.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.activiti.process.common.entity.CenterQueryVO; +import com.jero.modules.activiti.process.common.entity.ProcessCenterListVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.common.mapper.ProcessDraftMapper; +import com.jero.modules.sys.utils.UserUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author ThinkBook * @description 针对表【process_draft】的数据库操作Service实现 @@ -15,6 +21,14 @@ import org.springframework.stereotype.Service; public class ProcessDraftServiceImpl extends ServiceImpl implements ProcessDraftService { + @Override + public List getDraftList(CenterQueryVO centerQueryVO) { + String userId = UserUtils.getUserId(); + LambdaQueryWrapper draftWrapper = new LambdaQueryWrapper<>(); + draftWrapper.eq(ProcessDraft::getCreateBy, userId); + List list = list(draftWrapper); + return null; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index e411ca2d..ae6173d1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java @@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.validation.Valid; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,7 +39,7 @@ public class ProcessESInitChangeController { @AutoLog(value = "企标立项变更流程-生成企标编号并返回") @ApiOperation(value="企标立项变更流程-生成企标编号并返回", notes="企标立项变更流程-生成企标编号并返回") @PostMapping("/getStandardNo") - public Result getStandardNo(@Valid @RequestBody ProcessEsInitChange esInitChange) { + public Result getStandardNo(@RequestBody ProcessEsInitChange esInitChange) { // 生成企标编号并返回 Map map = new HashMap<>(); map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode()); @@ -62,8 +61,9 @@ public class ProcessESInitChangeController { @RequestBody List esInitChangeList) { if (StrUtil.isBlank(taskId)) { initChangeService.saveToDraft(esInitChangeList); + } else { + initChangeService.saveToWait(taskId, esInitChangeList); } - initChangeService.saveToWait(taskId, esInitChangeList); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 300f8cbf..38b68bce 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; +import org.springframework.format.annotation.DateTimeFormat; /** * 企标计划 @@ -74,6 +74,8 @@ public class ProcessEsInitChange implements Serializable { /** * 截止日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date deadlineDate; /** @@ -124,7 +126,6 @@ public class ProcessEsInitChange implements Serializable { /** * 企业标准代号 */ - @NotBlank private String enStandardCode; /** @@ -135,13 +136,11 @@ public class ProcessEsInitChange implements Serializable { /** * 标准类别代号 */ - @NotBlank private String standardCategoryCode; /** * 年代号 */ - @NotBlank private String decadeCode; /** @@ -157,16 +156,22 @@ public class ProcessEsInitChange implements Serializable { /** * 草稿计划完成日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date draftPlannedCompleteDate; /** * 征求意见稿计划完成日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date solicitationDraftPlanCompleteDate; /** * 计划报批日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date planApprovalDate; /** @@ -207,11 +212,15 @@ public class ProcessEsInitChange implements Serializable { /** * 草稿完成日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date draftCompletionDate; /** * 提交草稿日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date draftSubmissionDate; /** @@ -222,21 +231,29 @@ public class ProcessEsInitChange implements Serializable { /** * 征求意见稿完成日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date solicitationDraftCompletionDate; /** * 评审日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date reviewDate; /** * 报批日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date approvalDate; /** * 发布日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date releaseDate; /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index f82e7af2..9192db3a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -54,7 +54,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl setVariables(ProcessEsInitChange initChange) { Map map = new HashMap<>(); // 设置流程中各个节点的人 - map.put("createUser", initChange.getCreateBy()); map.put("contactUser", initChange.getContactUser()); map.put("standardExpertList", Optional.ofNullable(initChange.getStandardExpert()).map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList())); map.put("mainDraftUserLeader", initChange.getMainDraftUserLeader()); @@ -94,7 +93,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream() -// .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) -// .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化 -// splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult())); -// } else { -// Map enMap = dictItemListAll.stream() -// .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) -// .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化 -// splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult())); -// } - splitInfoEO.setFileType(fileType); + SysUser sysUser = sysUserService.getById(splitInfoEO.getAuthor()); + splitInfoEO.setAuthor(sysUser.calcNameWorkNo()); + splitInfoEO.setFileType(sysDictService.queryDictTextByKey("process_manuscript", splitInfoEO.getFileType())); // 处理文档库id字段 根据编号和标题查询 -// List> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber()); -// if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { -// splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString()); -// } if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) { splitInfoEO.setFlag("1"); }else{