From 411e7870c70a33b5a0164158f28aa99c54e41847 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 25 Jun 2024 14:50:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E8=A1=A5=E9=BD=90=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsEvaluationNotMetLibrary.java               | 8 ++++++++
 .../impl/LawsEvaluationNotMetLibraryServiceImpl.java      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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 568870c2..5a312946 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
@@ -8,6 +8,7 @@ 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;
@@ -84,18 +85,21 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * 车型状态
      */
     @ApiModelProperty(value = "车型状态")
+    @Dict(dicCode = "model_status")
     private String modelStatus;
 
     /**
      * 责任部门
      */
     @ApiModelProperty(value = "责任部门")
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     private String authDept;
 
     /**
      * 评估人
      */
     @ApiModelProperty(value = "评估人")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String userId;
 
     /**
@@ -156,6 +160,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * 整改状态
      */
     @ApiModelProperty(value = "整改状态")
+    @Dict(dicCode = "rectify_status")
     private String rectifyStatus;
 
     /**
@@ -168,12 +173,14 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * 问题类型
      */
     @ApiModelProperty(value = "问题类型")
+    @Dict(dicCode = "problem_type")
     private String problemType;
 
     /**
      * 整改周期
      */
     @ApiModelProperty(value = "整改周期")
+    @Dict(dicCode = "correction_period")
     private String correctionPeriod;
 
     /**
@@ -188,6 +195,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
      * 附件
      */
     @ApiModelProperty(value = "附件")
+    @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
     private String file;
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index a582bd0b..fecdcd43 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -39,7 +39,7 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
                 "d.standard_name", lawsEvaluationNotMet.getStandardName());
         queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getModel()),
                 "nm.model", lawsEvaluationNotMet.getModel());
-        if (StringUtils.isNotBlank(lawsEvaluationNotMet.getProblemType())) {
+        if (StringUtils.isNotBlank(lawsEvaluationNotMet.getAuthDept())) {
             queryWrapper.in("nm.auth_dept", Arrays.asList(lawsEvaluationNotMet.getAuthDept().split(",")));
         }
         queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getRectifyStatus()),