From b5f19577ecd8f4af0c0747dc741d8de92b6c548f Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 30 Jul 2024 18:20:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BDexcel=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/aqgqj/basis/controller/DownLoadController.java   | 3 ++-
 .../static/pages/primaryData/child/viewOriginalRecord.html     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
index 83f1141..e78d679 100644
--- a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
+++ b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
@@ -681,7 +681,8 @@ public class DownLoadController {
         int sharingNum = (hbNum - 2) / 2;
         checkRow.createCell(0).setCellValue("试验员：" + vo.getExperUserName());
         checkRow.createCell(sharingNum + 1).setCellValue("审核员：" + vo.getAuditUserName());
-        checkRow.createCell(hbNum - 1).setCellValue("第 页 共 页");
+//        checkRow.createCell(hbNum - 1).setCellValue("第 页 共 页");
+        checkRow.createCell(hbNum - 1).setCellValue("");
         sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), 0, sharingNum));
         sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), sharingNum + 1, hbNum - 2));
         sheet.addMergedRegion(new CellRangeAddress(checkRow.getRowNum(), checkRow.getRowNum(), hbNum - 1, hbNum));
diff --git a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
index a44e3e0..6519990 100644
--- a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
+++ b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
@@ -80,7 +80,7 @@
     <div class="title2 layout">
         <p>试验员：<span id="experUserName"></span></p>
         <p>审核员：<span id="auditUserName"></span></p>
-        <p>第 页 共 页：</p>
+<!--        <p>第 页 共 页：</p>-->
     </div>
     <div class="btn-box" style="display: none;">
         <button class="layui-btn layui-btn-norma save" onclick="download()">下载</button>

From 8a001ba290768e541967347143e96062893ca669 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 30 Jul 2024 18:53:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/css/home/home.css |  6 ++--
 src/main/resources/static/js/home/home.js   | 39 ++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/css/home/home.css b/src/main/resources/static/css/home/home.css
index 77b95ce..e63d8db 100644
--- a/src/main/resources/static/css/home/home.css
+++ b/src/main/resources/static/css/home/home.css
@@ -6,10 +6,12 @@
 .one{
   height: 4%;
   width: 100%;
+  margin-left: 20px;
 }
 .one span{
   font-weight: bold;
   font-size: 20px;
+  margin-left: 20px;
 }
 .two{
   height: 40%;
@@ -65,7 +67,7 @@
 }
 .three-one div:nth-child(1){
   margin-top: 1%;
-  margin-left: 2%;
+  margin-left: 20px;
   height: 10%;
 }
 .three-one div:nth-child(2){
@@ -116,7 +118,7 @@
 }
 .four-one div{
   height: 58%;
-  margin-left: 2%;
+  margin-left: 20px;
   padding-top: 1%;
 }
 .four-one span{
diff --git a/src/main/resources/static/js/home/home.js b/src/main/resources/static/js/home/home.js
index 960f6c1..b9a4899 100644
--- a/src/main/resources/static/js/home/home.js
+++ b/src/main/resources/static/js/home/home.js
@@ -257,7 +257,44 @@ function echartstwo(){
     option = {
         tooltip: {
             trigger: 'item',
-            extraCssText: 'width:160px;height:100px;',
+            extraCssText: 'width:200px;height:100px;',
+            formatter: function (params) {
+                if (!params || !params.name || !params.value) {
+                    return ''; // 如果数据无效，则返回空字符串
+                }
+
+                let text = ''; // 创建一个空字符串来存放最终的文本
+
+                // 处理参数数据
+                let name = params.name;
+                let value = params.value;
+
+                // 每行最多显示15个字符
+                const maxCharsPerLine = 8;
+
+                // 将名称分隔成多行
+                let lines = [];
+                while (name.length > maxCharsPerLine) {
+                    let spaceIndex = name.lastIndexOf(' ', maxCharsPerLine);
+                    if (spaceIndex === -1) {
+                        spaceIndex = maxCharsPerLine;
+                    }
+                    lines.push(name.slice(0, spaceIndex));
+                    name = name.slice(spaceIndex).trim();
+                }
+                lines.push(name);
+
+                // 将每一行添加到最终文本中，并在每行之间添加换行符
+                lines.forEach(function (line) {
+                    text += line + '<br/>';
+                });
+
+                // 添加值
+                text += ': ' + value;
+
+                // 返回格式化的文本
+                return text;
+            }
         },
         // legend: {
         //     orient: 'vertical',

From 21ddabfc6b96e2acd340d8e4a4f71239dac02ae6 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 30 Jul 2024 19:48:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=87=8D=E6=96=B0=E5=AE=A1=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/aqgqj/basis/dao/ExamineMapper.java  | 18 ++++++++++--
 .../service/impl/ExamineServiceImpl.java      | 14 ++++++---
 .../resources/mappers/basis/ExamineMapper.xml | 27 ++++++++++++-----
 .../mappers/basis/ExperimentalMapper.xml      | 26 +++++++++--------
 .../mappers/basis/OriginalRecordMapper.xml    |  5 ++--
 .../static/js/basis/child/auditData.js        | 29 +++++++++++--------
 src/main/resources/static/js/commonUtils.js   |  3 +-
 7 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java
index c7c52ae..e6b791b 100644
--- a/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java
+++ b/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java
@@ -65,14 +65,15 @@ public interface ExamineMapper {
      * 更新试验信息表审核状态
      *
      * @param vo
-     * @param experId
+     * @param vo
      * @param status
      * @param auditStatus
+     * @param isEr
      * @return void
      * @author cwchen
      * @date 2024/7/25 9:16
      */
-    void updateExperStatus(@Param("params") AuditHistoryVo vo, @Param("status") Integer status, @Param("auditStatus") Integer auditStatus);
+    void updateExperStatus(@Param("params") AuditHistoryVo vo, @Param("status") Integer status, @Param("auditStatus") Integer auditStatus,@Param("isEr")String isEr);
 
     /**
      * 查询试验项是否都是通过
@@ -86,6 +87,7 @@ public interface ExamineMapper {
 
     /**
      * 更新收样信息审核的状态
+     *
      * @param vo
      * @param audtiStatus
      * @param processStatus
@@ -93,5 +95,15 @@ public interface ExamineMapper {
      * @author cwchen
      * @date 2024/7/25 9:41
      */
-    void updateSampleStatus(@Param("params") AuditHistoryVo vo, @Param("audtiStatus") Integer audtiStatus, @Param("processStatus") Integer processStatus);
+    void updateSampleStatus(@Param("params") AuditHistoryVo vo, @Param("audtiStatus") Integer audtiStatus, @Param("processStatus") Integer processStatus,@Param("isEr")String isEr);
+
+    /**
+     * 获取设备试验项/收样的是否二次审阅的值
+     * @param type
+     * @param id
+     * @return String
+     * @author cwchen
+     * @date 2024/7/30 18:50
+     */
+    String getExperIsErValue(@Param("type") int type,@Param("id") Long id);
 }
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java
index ff58699..16d7b59 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java
@@ -98,39 +98,45 @@ public class ExamineServiceImpl implements ExamineService {
             for (Long experId : vo.getExperIds()) {
                 vo.setExperId(experId);
                 mapper.checkData(vo);
-                // auditType 审核类型 1 审阅 2 审核 3 审批 auditStatus 审核结果 2 不通过 1通过
+                // auditType 审核类型 1 审阅 2 审核 3 审批 auditStatus 审核结果 2 不通过 1通过 isEr：是否二次审核
                 Integer status = 0, auditStatus = 0;
+                String isEr = null;
                 if (Objects.equals(vo.getAuditStatus(), Constants.PASS)) {
                     // 审查通过
                     Integer[] valArr = handleData(vo, 1);
                     status = valArr[0];
                     auditStatus = valArr[1];
+                    isEr = mapper.getExperIsErValue(1,experId);
                     // 更新试验信息表审核状态
                 } else if (Objects.equals(vo.getAuditStatus(), Constants.NOT_PASS)) {
                     // 审查不通过
                     Integer[] valArr = handleData(vo, 2);
                     status = valArr[0];
                     auditStatus = valArr[1];
+                    isEr = "1";
                 }
-                mapper.updateExperStatus(vo, status, auditStatus);
+                mapper.updateExperStatus(vo, status, auditStatus,isEr);
             }
-            // 查询试验项是否都是通过，并更新收样信息审核的状态
+            // 查询试验项是否都是通过，并更新收样信息审核的状态 isEr：是否二次审核
             List<Integer> experIsPassList = mapper.getExperIsPass(vo);
             Integer audtiStatus = 0, processStatus = 0;
+            String isEr = null;
             if (experIsPassList.get(Constants.NOT_PASS_INDEX) > 0) {
                 // 存在未通过项
                 Integer[] valArr = handleData(vo, 3);
                 processStatus = valArr[0];
                 audtiStatus = valArr[1];
+                isEr = "1";
             } else if (Objects.equals(experIsPassList.get(Constants.ALL_EXPER_INDEX), experIsPassList.get(Constants.PASS_INDEX))) {
                 // 全部通过
                 Integer[] valArr = handleData(vo, 4);
                 processStatus = valArr[0];
                 audtiStatus = valArr[1];
+                isEr = mapper.getExperIsErValue(2,vo.getSampleId());
             }
             // 审核状态、流程状态不为0时，修改收样信息审核状态
             if(!Objects.equals(audtiStatus, Constants.ALL_EXPER_INDEX) || !Objects.equals(processStatus, Constants.ALL_EXPER_INDEX)){
-                mapper.updateSampleStatus(vo, audtiStatus, processStatus);
+                mapper.updateSampleStatus(vo, audtiStatus, processStatus,isEr);
             }
         } catch (Exception e) {
             log.error(e.toString(), e);
diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml
index 6de865a..efdaf83 100644
--- a/src/main/resources/mappers/basis/ExamineMapper.xml
+++ b/src/main/resources/mappers/basis/ExamineMapper.xml
@@ -9,12 +9,12 @@
     </insert>
     <!--更新试验信息表审核状态-->
     <update id="updateExperStatus">
-        UPDATE tb_exper SET status = #{status},audit_status = #{auditStatus},audit_user_name = #{params.auditUserName},audit_time = #{params.auditTime},audit_remakr = #{params.auditRemark}
+        UPDATE tb_exper SET status = #{status},audit_status = #{auditStatus},audit_user_name = #{params.auditUserName},audit_time = #{params.auditTime},audit_remakr = #{params.auditRemark},is_er = #{isEr}
         WHERE id = #{params.experId}
     </update>
     <!--更新收样信息审核的状态-->
     <update id="updateSampleStatus">
-        UPDATE tb_sample SET audti_status = #{audtiStatus},process_status = #{processStatus} WHERE id = #{params.sampleId}
+        UPDATE tb_sample SET audti_status = #{audtiStatus},process_status = #{processStatus},is_er = #{isEr},remarks = #{params.auditRemark} WHERE id = #{params.sampleId}
     </update>
 
     <!--试验审查列表-->
@@ -29,9 +29,10 @@
         DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
         tt.team_name AS teamName,
         ts.process_status AS status,
-        CASE WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
-        WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
-        WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
+        CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er IS NULL THEN '待审阅'
+        WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er = '1' THEN '待重新审阅'
+        WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
+        WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
         END AS audtiStatus,
         ts.remarks
         FROM tb_sample ts
@@ -91,7 +92,7 @@
         <if test="roleCode=='administrators'">
             AND process_status IN (1,2,3) AND audti_status = 0
         </if>
-        ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') DESC,ts.sample_date DESC
+        ORDER BY FIELD(audtiStatus, '待审阅','待重新审阅','待审核','待审批') DESC,ts.sample_date DESC
     </select>
     <!--审查详情列表-->
     <select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
@@ -105,7 +106,8 @@
             ANY_VALUE(su2.user_name) AS experimenter,
             ANY_VALUE(DATE_FORMAT(te.update_time, '%Y-%m-%d')) AS testTime,
             CASE WHEN ANY_VALUE(te.status) = 0 AND ANY_VALUE(te.audit_status) = 0 THEN '待提交'
-            WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 THEN '待审阅'
+            WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 AND ANY_VALUE(te.is_er) IS NULL THEN '待审阅'
+            WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 AND ANY_VALUE(te.is_er) = '1' THEN '待重新审阅'
             WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过'
             WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 0 THEN '待审核'
             WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 3 THEN '审核不通过'
@@ -131,7 +133,7 @@
             </if>
             GROUP BY tsd.dev_type_code
         ) a
-        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待审核','待审批','试验完成') ASC,a.testTime DESC
+        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成') ASC,a.testTime DESC
     </select>
     <!--查询试验设备数量-->
     <select id="getExperDevItemsNum" resultType="java.util.Map">
@@ -168,4 +170,13 @@
             AND status = 3 AND audit_status = 4
         </if>
     </select>
+    <!--获取设备试验项/收样的是否二次审阅的值-->
+    <select id="getExperIsErValue" resultType="java.lang.String">
+        <if test="type == 1">
+            SELECT is_er FROM tb_exper WHERE id = #{id}
+        </if>
+        <if test="type == 2">
+            SELECT is_er FROM tb_sample WHERE id = #{id}
+        </if>
+    </select>
 </mapper>
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 60f4ee0..87b502a 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -187,7 +187,7 @@
     </update>
     <!--更新收样表中的状态为待审阅-->
     <update id="updateSampleStatus">
-        UPDATE tb_sample SET audti_status = 0,process_status = 1
+        UPDATE tb_sample SET audti_status = 0,process_status = 1,remarks = null
         WHERE id IN
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
@@ -260,15 +260,16 @@
                su2.user_name AS dispatchUserName,
                DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
                tt.team_name AS teamName,
-               CASE WHEN process_status IS NULL THEN '待试验'
-                    WHEN process_status = 0 AND audti_status = 0 THEN '待提交'
-                    WHEN process_status = 1 AND audti_status = 0 THEN '待审阅'
-                    WHEN process_status = 1 AND audti_status = 2 THEN '审阅不通过'
-                    WHEN process_status = 2 AND audti_status = 0 THEN '待审核'
-                    WHEN process_status = 2 AND audti_status = 2 THEN '审核不通过'
-                    WHEN process_status = 3 AND audti_status = 0 THEN '待审批'
-                    WHEN process_status = 3 AND audti_status = 2 THEN '审批不通过'
-                    WHEN process_status = 4 AND audti_status = 1 THEN '试验完成'
+               CASE WHEN ts.process_status IS NULL THEN '待试验'
+                    WHEN ts.process_status = 0 AND ts.audti_status = 0 THEN '待提交'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待重新审阅'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
+                    WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
+                    WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
+                    WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批'
+                    WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过'
+                    WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成'
                     ELSE '待试验'
                     END AS audtiStatus,
                ts.remarks
@@ -339,7 +340,8 @@
                 ANY_VALUE(su2.user_name) AS experimenter,
                 ANY_VALUE(DATE_FORMAT(te.update_time, '%Y-%m-%d')) AS testTime,
                 CASE WHEN ANY_VALUE(te.status) = 0 AND ANY_VALUE(te.audit_status) = 0 THEN '待提交'
-                    WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 THEN '待审阅'
+                    WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 AND ANY_VALUE(te.is_er) IS NULL THEN '待审阅'
+                    WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 0 AND ANY_VALUE(te.is_er) = '1' THEN '待重新审阅'
                     WHEN ANY_VALUE(te.status) = 1 AND ANY_VALUE(te.audit_status) = 2 THEN '审阅不通过'
                     WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 0 THEN '待审核'
                     WHEN ANY_VALUE(te.status) = 2 AND ANY_VALUE(te.audit_status) = 3 THEN '审核不通过'
@@ -357,7 +359,7 @@
                 </if>
                 GROUP BY tsd.dev_type_code
         )a
-        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待审核','待审批','试验完成') ,a.testTime DESC
+        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成') ,a.testTime DESC
     </select>
     <!--查询试验模板数据、基础数据-->
     <select id="getTestBasicInfo" resultType="com.bonus.aqgqj.basis.entity.vo.TestVo">
diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
index 4f297e5..bf4a2a0 100644
--- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml
+++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml
@@ -15,7 +15,8 @@
         DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate,
         tt.team_name AS teamName,
         ts.process_status AS status,
-        CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅'
+        CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er IS NULL THEN '待审阅'
+        WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er = '1' THEN '待重新审阅'
         WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
         WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
         WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'
@@ -109,7 +110,7 @@
             (ts.process_status = 4 AND audti_status = 1)
             )
         </if>
-        ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') DESC,ts.sample_date DESC
+        ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待重新审阅','待审核','待审批','试验结束') DESC,ts.sample_date DESC
     </select>
     <!--根据收样ID获取试验ID-->
     <select id="getExperIds" resultType="java.util.Map">
diff --git a/src/main/resources/static/js/basis/child/auditData.js b/src/main/resources/static/js/basis/child/auditData.js
index 2dcbfdc..a297444 100644
--- a/src/main/resources/static/js/basis/child/auditData.js
+++ b/src/main/resources/static/js/basis/child/auditData.js
@@ -96,28 +96,31 @@ function initTable(dataList, limit, page) {
                 },
                 {field: "devTypeName", title: "设备类型", unresize: true, align: "center"},
                 {field: "sampleNum", title: "送样总数", unresize: true, align: "center"},
-                {field: "sampleQuantity", title: "样品总数", unresize: true, align: "center",
+                {
+                    field: "sampleQuantity", title: "样品总数", unresize: true, align: "center",
                     templet: function (d) {
                         const sampleList = d.sampleList;
                         if (sampleList && sampleList.length > 0) {
-                            let flag = false,style = '';
+                            let flag = false, style = '';
                             $.each(sampleList, function (index, item) {
                                 if (item.testResult === '不合格') {
                                     flag = true;
                                     return false;
                                 }
                             })
-                            style='color: '+(flag ? "#F39268" : '#2A6EDF')+'';
-                            return "<span class='layui-show-details' onmouseover='getMouseover("+JSON.stringify(sampleList)+")' style='"+style+"'; cursor: pointer'>" + sampleList.length + "</span>";
+                            style = 'color: ' + (flag ? "#F39268" : '#2A6EDF') + '';
+                            return "<span class='layui-show-details' onmouseover='getMouseover(" + JSON.stringify(sampleList) + ")' style='" + style + "'; cursor: pointer'>" + sampleList.length + "</span>";
                         } else {
                             return 0;
                         }
-                    }},
+                    }
+                },
                 {field: "experimenter", title: "试验人员", unresize: true, align: "center"},
                 {field: "testTime", title: "试验时间", unresize: true, align: "center"},
-                {field: "status", title: "状态", unresize: true, align: "center", templet: function (d) {
-                       return setAuditStatus(d.status);
-                 }
+                {
+                    field: "status", title: "状态", unresize: true, align: "center", templet: function (d) {
+                        return setAuditStatus(d.status);
+                    }
                 },
                 {field: "causeOfRejection", title: "驳回原因", unresize: true, align: "center"},
                 {
@@ -132,6 +135,7 @@ function initTable(dataList, limit, page) {
                     title: "操作", unresize: true, width: 180, align: "center",
                     templet: function (d) {
                         let html = '';
+                        d.status = d.status === '待重新审阅' ? '待审阅' : d.status;
                         if (checkNameArr.indexOf(d.status) > -1 && checkNameArr.indexOf(d.status) + 1 === parseInt(statusParam)) {
                             html += "<a title='通过' onclick=\"passData('" + d.experId + "','" + d.sampleId + "','" + d.status + "',1)\">通过</a>";
                             html += "<a style='margin: 0 0 0 10px' title='不通过' onclick=\"passData('" + d.experId + "','" + d.sampleId + "','" + d.status + "',2)\">不通过</a>";
@@ -148,6 +152,7 @@ function initTable(dataList, limit, page) {
             count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto");
             temp_table_list = res.data;
             temp_table_list.forEach(function (o, i) {
+                o.status = o.status === '待重新审阅' ? '待审阅' : o.status;
                 if (!isCheck(o.status) || !(checkNameArr.indexOf(o.status) + 1 === parseInt(statusParam))) {
                     let index = o['LAY_INDEX'];
                     $('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').attr('disabled', 'disabled');
@@ -241,7 +246,7 @@ function getMouseover(data) {
             html += '<tr>' +
                 '<td>' + (i + 1) + '</td>' +
                 '<td title="' + data[i].devCode + '" style="cursor: pointer;" >' + data[i].devCode + '</td>' +
-                '<td title="' + data[i].testResult + '" style="cursor: pointer;color:'+(data[i].testResult.indexOf('不合格')>-1 ? '#F39268' : '#2A6EDF')+'">' + data[i].testResult + '</td>' +
+                '<td title="' + data[i].testResult + '" style="cursor: pointer;color:' + (data[i].testResult.indexOf('不合格') > -1 ? '#F39268' : '#2A6EDF') + '">' + data[i].testResult + '</td>' +
                 '</tr>';
         }
     } else {
@@ -309,7 +314,7 @@ function query() {
 }
 
 function reloadData() {
-    temp_all_list.splice(0,temp_all_list.length)
+    temp_all_list.splice(0, temp_all_list.length)
     pages(pageNum, limitSize);
 }
 
@@ -327,7 +332,7 @@ function viewData(experId, devTypeCode) {
 function passData(experId, sampleId, status, type) {
     if (type === 1) {
         // 通过
-        layer.confirm('确认通过？', {icon: 7,move:false}, function (index) {
+        layer.confirm('确认通过？', {icon: 7, move: false}, function (index) {
             saveData([experId], sampleId);
         })
     } else {
@@ -358,7 +363,7 @@ function batchAudit(type) {
         experIdArr.push(item.experId)
     })
     if (type === 1) { // 批量通过
-        layer.confirm('确认批量通过？', {icon: 7,move:false}, function (index) {
+        layer.confirm('确认批量通过？', {icon: 7, move: false}, function (index) {
             saveData(experIdArr, sampleId);
         })
     } else if (type === 2) { // 批量不通过
diff --git a/src/main/resources/static/js/commonUtils.js b/src/main/resources/static/js/commonUtils.js
index 3c49a3d..b5f5bb2 100644
--- a/src/main/resources/static/js/commonUtils.js
+++ b/src/main/resources/static/js/commonUtils.js
@@ -92,7 +92,8 @@ function formatSeconds(value) {
 
 /*设置审核状态字体颜色*/
 function setAuditStatus(value){
-    if(value === '待试验' || value === '待提交' || value === '待审核' || value === '待审批' || value === '待审阅'){
+    console.log(value)
+    if(value === '待试验' || value === '待提交' || value === '待审核' || value === '待审批' || value === '待审阅' || value === '待修改' || value === '待重新审阅'){
         return '<span style="color: #5778f3">'+value+'</span>';
     }else if(value === '审阅不通过' || value === '审核不通过' || value === '审批不通过'){
         return '<span style="color: #f1895b ">'+value+'</span>';

From 6ae23a9e947a157630ab3c4e14a83c15f04ebdbb Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 30 Jul 2024 20:23:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=87=8D=E6=96=B0=E5=AE=A1=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/basis/ExamineMapper.xml      | 2 +-
 src/main/resources/mappers/basis/ExperimentalMapper.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml
index efdaf83..1778071 100644
--- a/src/main/resources/mappers/basis/ExamineMapper.xml
+++ b/src/main/resources/mappers/basis/ExamineMapper.xml
@@ -133,7 +133,7 @@
             </if>
             GROUP BY tsd.dev_type_code
         ) a
-        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成') ASC,a.testTime DESC
+        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成'),a.testTime DESC
     </select>
     <!--查询试验设备数量-->
     <select id="getExperDevItemsNum" resultType="java.util.Map">
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index 87b502a..35646e7 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -262,8 +262,8 @@
                tt.team_name AS teamName,
                CASE WHEN ts.process_status IS NULL THEN '待试验'
                     WHEN ts.process_status = 0 AND ts.audti_status = 0 THEN '待提交'
-                    WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅'
-                    WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待重新审阅'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er IS NULL THEN '待审阅'
+                    WHEN ts.process_status = 1 AND ts.audti_status = 0 AND ts.is_er = '1' THEN '待重新审阅'
                     WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过'
                     WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核'
                     WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过'