From 420b0f9a0742826f91dc910dc08143c9873a858c Mon Sep 17 00:00:00 2001
From: mythxb <mythxb@qq.com>
Date: Sun, 7 Apr 2024 13:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E9=A1=B9=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rzyc/mapper/ex/ExStandardMapper.java |  5 +++++
 .../main/resources/mapper/ex/ExStandardMapper.xml | 15 ++++++++++++++-
 .../com/rzyc/controller/ExamineController.java    |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java
index 38fac25..abeda4e 100644
--- a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java
@@ -22,6 +22,11 @@ public interface ExStandardMapper extends BaseMapper<ExStandard> {
                                   @Param("examineState") Integer examineState,
                                   @Param("examineId") String examineId);
 
+    /*部门个性评分标准*/
+    List<ExStandard> standardListUnit(@Param("itemType") Integer itemType,
+                                      @Param("examineState") Integer examineState,
+                                      @Param("examineId") String examineId);
+
     /*部门个性评分标准*/
     List<ExStandard> unitStandardList(@Param("itemType") Integer itemType,
                                       @Param("examineState") Integer examineState,
diff --git a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml
index 85c2131..de3f607 100644
--- a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml
@@ -38,6 +38,20 @@
 
     </select>
 
+
+    <!--部门普通评分标准-->
+    <select id="standardListUnit" resultMap="BaseResultMap">
+        SELECT
+            es.*,lf.`PerformClassName`
+        FROM ex_standard es
+                 LEFT JOIN  `listperform` lf ON es.`perform_id` = lf.`ListPerformId`
+        WHERE es.`item_type` = #{itemType}
+          AND es.`examine_state` = #{examineState}
+          AND es.`examine_id` = #{examineId}
+        ORDER BY es.`sort_id` ASC;
+
+    </select>
+
     <!--部门普通评分标准-->
     <select id="unitStandardList" resultMap="BaseResultMap">
 
@@ -54,7 +68,6 @@
         AND (es.`perform_id` = #{performId} OR es.`perform_id` IS NULL OR es.`perform_id` = '')
         ORDER BY es.`sort_id` ASC;
 
-
     </select>
 
 
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
index b366255..4003f6d 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java
@@ -490,7 +490,7 @@ public class ExamineController extends BaseController{
     public MultiResult<ExStandard> standardListUnit(@Valid StandardListUnitDto standardListUnitDto)throws Exception{
         MultiResult<ExStandard> result = new MultiResult<>();
         //评分标准
-        List<ExStandard> standards = exStandardMapper.unitStandardList(ExItemType.PERSONALITY.getType(),standardListUnitDto.getExamineState(),standardListUnitDto.getExamineId(),standardListUnitDto.getListperformid());
+        List<ExStandard> standards = exStandardMapper.standardListUnit(ExItemType.PERSONALITY.getType(),standardListUnitDto.getExamineState(),standardListUnitDto.getExamineId());
         result.setData(standards);
         return result;
     }