From 65651622f8aaef2decb2b2e20384dddc28c10a58 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 1 Feb 2024 16:51:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=95=B4=E6=94=B9):=2081375?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/process/aspect/ProcessAspect.java | 6 +----- .../entity/EnterpriseStandardInspectRectifyPlan.java | 10 ++++++++++ .../entity/EnterpriseStandardInspectReport.java | 3 +++ ...nterpriseStandardInspectRectifyPlanServiceImpl.java | 9 +++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java index 2c9e60fc..733a950f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java @@ -13,10 +13,8 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; -import com.jero.modules.activiti.process.esinspectrectify.common.EsInspectRectifyCommon; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import lombok.extern.slf4j.Slf4j; import org.activiti.bpmn.model.Process; @@ -209,9 +207,7 @@ public class ProcessAspect { if (!Objects.isNull(processApprovalRecordObject) && !Objects.isNull(processAllObject)){ ProcessApprovalRecord processApprovalRecord = JSON.parseObject(JSON.toJSONString(processApprovalRecordObject), ProcessApprovalRecord.class); ProcessAll processAll = JSON.parseObject(JSON.toJSONString(processAllObject), ProcessAll.class); - if (StringUtils.isBlank(processAll.getNodeId()) || SAVE_BY_DRAFT.equals(saveSource) - // 企标稽查整改（自动发起流程）特殊节点判断 - || (ProcessType.ES_INSPECT_REPORT.getValue().equals(String.valueOf(processAll.getPrcType())) && EsInspectRectifyCommon.PROCESS_NODE_1.equals(processAll.getNodeId()))){ + if (StringUtils.isBlank(processAll.getNodeId()) || SAVE_BY_DRAFT.equals(saveSource)){ ProcessDraft processDraft = new ProcessDraft(); setProperty(loginUser, infoJsonStr, processApprovalRecord, processAll, processDraft); // 删除旧草稿 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java index eb65ff43..3fdfd130 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.entity; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; @@ -41,6 +42,7 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** @@ -53,6 +55,7 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable { * 更新时间 */ @ApiModelProperty(value = "更新时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** @@ -110,6 +113,12 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable { @ApiModelProperty(value = "整改单位") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String responseDepart; + /** + * 整改单位 翻译 + */ + @ApiModelProperty(value = "整改单位 翻译") + @TableField(exist = false) + private String responseDepartDictText; /** * 整改计划完成时间 @@ -118,6 +127,7 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable { @ApiModelProperty(value = "整改计划完成时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JSONField(format = "yyyy-MM-dd") private Date planCompleteDate; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java index e04e59a9..e0a45b54 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.entity; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -42,6 +43,7 @@ public class EnterpriseStandardInspectReport implements Serializable { /**创建时间*/ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date createTime; @@ -52,6 +54,7 @@ public class EnterpriseStandardInspectReport implements Serializable { /**更新时间*/ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java index fa290656..f1859754 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java @@ -14,6 +14,8 @@ import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -49,6 +51,9 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl @Resource private ISysUserService sysUserService; + @Resource + private ISysDepartService sysDepartService; + @Resource private EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; @@ -184,6 +189,10 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport); // 翻译 item.setResponseUserDictText(sysUserService.dictByIdsOrUserNames(item.getResponseUser(), "")); + SysDepart sysDepart = sysDepartService.getById(item.getResponseDepart()); + if (!Objects.isNull(sysDepart)){ + item.setResponseDepartDictText(sysDepart.getDepartName()); + } }); } }