From 5503b05232092738c4580ee39d732439783af360 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jul 2024 13:48:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=B8=A2=E5=A4=B1=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckDetail.java |  4 +--
 ...essStandardComplianceCheckServiceImpl.java |  4 ++-
 .../LawsConformityAssessmentLibrary.java      | 33 +++++++++----------
 .../entity/LawsEvaluationNotMetLibrary.java   |  2 --
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
index 2119fa06..9b200b39 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
@@ -93,7 +93,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable {
      */
     @ApiModelProperty(value = "车型状态")
     @Dict(dicCode = "model_status")
-    private String modelState;
+    private String modelStatus;
 
     /**
      * 评估人
@@ -145,7 +145,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable {
      */
     @ApiModelProperty(value = "整改周期")
     @Dict(dicCode = "correction_period")
-    private String correctionCycle;
+    private String correctionPeriod;
 
     /**
      * 整改费用
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 485b0b25..a096ad1d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -340,6 +340,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     });
                     // 先删后增
                     removeByIds(detailInfoListIds);
+                    detailInfoList.forEach(detail -> detail.setValuationTime(new Date()));
                     sccDetailService.saveBatch(detailInfoList);
                 }
                 runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
@@ -351,6 +352,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 detailInfoList.forEach(detail -> {
                     detail.setAssessor(curUserId);
                     detail.setAuthDept(curUserDepartIds);
+                    detail.setValuationTime(new Date());
                 });
                 // 先删后增
                 removeByIds(detailInfoListIds);
@@ -580,7 +582,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             for (ModelExcelVO modelExcelVO : modelExcelVOList) {
                 ProcessStandardComplianceCheckDetail detail = new ProcessStandardComplianceCheckDetail();
                 detail.setModel(modelExcelVO.getModel());
-                detail.setModelState(modelExcelVO.getModelState());
+                detail.setModelStatus(modelExcelVO.getModelState());
                 detail.setTermNumber(detailInfo.getTermNumber());
                 detail.setTermTitle(detailInfo.getTermTitle());
                 detail.setTermContent(detailInfo.getTermContent());
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
index 2cc9e717..b00dd8f7 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 法规符合性评估库
  * @TableName laws_conformity_assessment_library
@@ -40,6 +40,19 @@ public class LawsConformityAssessmentLibrary implements Serializable {
     @ApiModelProperty(value = "标准ID")
     private String standardId;
 
+    /**
+     * 标准编号
+     */
+    @ApiModelProperty(value = "标准编号")
+    private String standardNumber;
+
+    /**
+     * 标准名称
+     */
+    @ApiModelProperty(value = "标准名称")
+    private String standardName;
+
+
     /**
      * 评估日期
      */
@@ -62,20 +75,6 @@ public class LawsConformityAssessmentLibrary implements Serializable {
     @ApiModelProperty(value = "结束评估日期")
     private Date endValuationTime;
 
-    /**
-     * 标准编号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "标准编号")
-    private String standardNumber;
-
-    /**
-     * 标准名称
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "标准名称")
-    private String standardName;
-
     /**
      * 适用市场
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java
index 42ab788c..e2b2b94d 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java
@@ -229,7 +229,6 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
     /**
      * 标准编号
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "标准编号")
     @Excel(name = "标准编号", width = 15, orderNum = "3")
     private String standardNumber;
@@ -237,7 +236,6 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
     /**
      * 标准名称
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "标准名称")
     @Excel(name = "标准编号", width = 15, orderNum = "4")
     private String standardName;