From 9bca6e2a6901d14b4647bf2afc9656b6a56dbfcb Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 12 Oct 2023 14:23:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=A7=A3=E6=9E=90Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessCenterController.java | 7 ++++-- .../common/entity/ProcessCenterListVO.java | 16 +++++++++++++ .../common/service/ProcessDraftService.java | 5 ++++ .../service/impl/ProcessDraftServiceImpl.java | 14 +++++++++++ .../entity/ProcessEsInitChange.java | 24 +++++++++++++++++-- .../impl/ProcessEsInitChangeServiceImpl.java | 2 +- 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessCenterListVO.java 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/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/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 300f8cbf..d48b54f9 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,11 +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 org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; @@ -74,6 +76,8 @@ public class ProcessEsInitChange implements Serializable { /** * 截止日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date deadlineDate; /** @@ -135,13 +139,11 @@ public class ProcessEsInitChange implements Serializable { /** * 标准类别代号 */ - @NotBlank private String standardCategoryCode; /** * 年代号 */ - @NotBlank private String decadeCode; /** @@ -157,16 +159,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 +215,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 +234,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..08adfee9 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 @@ -94,7 +94,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl Date: Thu, 12 Oct 2023 14:34:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E5=AD=98=E5=9C=A8Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessESInitChangeController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(); } From 98f37dcbdcdd0cd0b9a2c6960c51c1df42c650cd Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 12 Oct 2023 14:38:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?perf(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):?= =?UTF-8?q?=20=E5=AE=8C=E5=96=84=E5=88=97=E8=A1=A8=E9=A1=B5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/entity/SarFileSplitInfoEO.java | 3 +- .../impl/SarFileSplitInfoServiceImpl.java | 33 ++++--------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java index c6a734af..4e3906c2 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java @@ -77,7 +77,7 @@ public class SarFileSplitInfoEO implements Serializable { /**文本状态*/ @Excel(name = "文本状态", width = 15, dicCode = "file_type") -// @Dict(dicCode = "file_type") + @Dict(dicCode = "file_type") @ApiModelProperty(value = "文本状态") private String fileType; @@ -95,7 +95,6 @@ public class SarFileSplitInfoEO implements Serializable { /**编辑人*/ @Excel(name = "编辑人", width = 15) @ApiModelProperty(value = "编辑人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String author; /**拆分结果*/ diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 7db83b03..1955a6eb 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -34,8 +34,10 @@ import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.split.vo.SplitFilePageInfoParam; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -81,6 +83,8 @@ public class SarFileSplitInfoServiceImpl 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{ From 928437412c0e91206015901d27409038a88b6892 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 12 Oct 2023 14:55:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E8=8A=82=E7=82=B9=E4=B8=8D=E8=87=AA=E5=8A=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/process/common/service/ActFlowCommonService.java | 1 + .../process/esInitChange/entity/ProcessEsInitChange.java | 3 --- .../service/impl/ProcessEsInitChangeServiceImpl.java | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) 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/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index d48b54f9..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 @@ -15,8 +15,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotBlank; - /** * 企标计划 * @TableName process_es_init_change @@ -128,7 +126,6 @@ public class ProcessEsInitChange implements Serializable { /** * 企业标准代号 */ - @NotBlank private String enStandardCode; /** 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 08adfee9..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());