完善关键零部件型号申请流程

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"),

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,

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<ProcessPartType
         Date d = new Date();
         for (ProcessPartTypeApplyRecord processPartTypeApplyRecord : listProcessPartTypeApplyRecord) {
             processPartTypeApplyRecord.setSuccessTime(d);
+            processPartTypeApplyRecord.setStatus(PartConstants.STATUS_1);
         }
         List<LawsPartType> list = JSON.parseArray(JSON.toJSONString(listProcessPartTypeApplyRecord),LawsPartType.class);
         lawsPartTypeService.saveBatch(list);

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")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
-    @Excel(name = "申请人", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @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;
     /**
      * 状态
      */

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,