From 2225925ed8d273252010cddee05350f391e05570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 10:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B3=E9=94=AE=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=9E=8B=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/process/common/enums/ProcessType.java | 2 +- .../part/mapper/xml/ProcessPartTypeApplyRecordMapper.xml | 2 ++ .../service/impl/ProcessPartTypeApplyServiceImpl.java | 2 ++ .../com/jero/modules/laws/part/entity/LawsPartType.java | 8 +++++--- .../modules/laws/part/mapper/xml/LawsPartTypeMapper.xml | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java index f577bc3d..85b5b956 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java @@ -14,7 +14,7 @@ public enum ProcessType { NEW_STANDARD_IMPORT("新法规导入流程", "1", "new_standard_import", "ProcessNewStandardImportServiceImpl"), STANDARD_INTERPRET("标准解读流程", "2", "standard_interpret", "StandardInterpretFlowServiceImpl"), STANDARD_COMPLIANCE_CHECK("法规符合性评估流程", "3", "laws-evaluation-main", "ProcessStandardComplianceCheckServiceImpl"), - MARKET_STANDARD_PUBLISH("市场清单发布流程", "4", "market_standard_publish", "ProcessNewStandardImportServiceImpl"), + MARKET_STANDARD_PUBLISH("市场清单发布流程", "4", "market_standard_publish", "ProcessMarketStandardReleaseServiceImpl"), ENTERPRISE_STANDARD_ABOLISH_PUBLISH("企标废止发布流程", "5", "enterprise_standard_abolish_publish", "ProcessAbolishReleaseServiceImpl"), ES_REVISION_ADVICE("企标制修订及征求意见流程", "6", "es_revision_advice", "ProcessEsRevisionServiceImpl"), ANNUAL_INIT("企业标准年度制修订计划流程", "7", "process-annual-init", "ProcessAnnualInitService"), diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/mapper/xml/ProcessPartTypeApplyRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/mapper/xml/ProcessPartTypeApplyRecordMapper.xml index 87807d39..4fd41285 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/mapper/xml/ProcessPartTypeApplyRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/mapper/xml/ProcessPartTypeApplyRecordMapper.xml @@ -30,6 +30,8 @@ l1.already_part_num, l1.status, l1.success_time, + l1.part_relevance_type, + l1.replace_part_num, l1.create_by, l1.last_id, l1.create_time, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java index b6453d3f..e01aff7b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java @@ -26,6 +26,7 @@ import com.jero.modules.activiti.process.part.service.IProcessPartTypeApplyServi import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.part.constans.PartConstants; import com.jero.modules.laws.part.entity.LawsPartType; import com.jero.modules.laws.part.service.ILawsPartRelevanceService; import com.jero.modules.laws.part.service.ILawsPartTypeService; @@ -282,6 +283,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl list = JSON.parseArray(JSON.toJSONString(listProcessPartTypeApplyRecord),LawsPartType.class); lawsPartTypeService.saveBatch(list); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java index ce915f9c..24b8102a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java @@ -204,8 +204,8 @@ public class LawsPartType implements Serializable { * 申请人 */ @ApiModelProperty(value = "申请人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") - @Excel(name = "申请人", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "username") + @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") + @Excel(name = "申请人", width = 15, dictTable = "sys_user", dicCode = "username", dicText = "realname") private String createBy; /** * 申请部门 @@ -221,7 +221,9 @@ public class LawsPartType implements Serializable { */ @ApiModelProperty(value = "完成时间") @Excel(name = "完成时间",format = "yyyy-MM-dd") - private String successTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date successTime; /** * 状态 */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml index 3dafdaa9..e3df5c7f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/mapper/xml/LawsPartTypeMapper.xml @@ -18,6 +18,7 @@ l2.responsible_module, l2.remark, l2.fnd_gpc, + l1.id, l1.part_num, l1.part_relevance_id, l1.part_name, @@ -28,6 +29,8 @@ l1.already_part_num, l1.status, l1.success_time, + l1.part_relevance_type, + l1.replace_part_num, l1.create_by, l1.last_id, l1.create_time,