审核

src/main/java/com/bonus/aqgqj/basis/controller/ExamineController.java

@@ -47,7 +47,6 @@ public class ExamineController {
     @PostMapping(value = "getDetailList")
     @DecryptAndVerify(decryptedClass = ParamsDto.class)//加解密统一管理
     @LogAnnotation(operModul = "审查管理", operation = "查询审查详情列表", operDesc = "系统级事件", operType = "查询")
-//    @PreAuthorize("@pms.hasPermission('sys:examine:detailQuery')")
     public ServerResponse getDetailList(EncryptedReq<ParamsDto> data) {
         PageHelper.startPage(data.getData().getPage(), data.getData().getLimit());
         List<ExperimentalDetailVo> list = service.getDetailList(data.getData());

src/main/java/com/bonus/aqgqj/basis/controller/OriginalRecordController.java

@@ -43,15 +43,4 @@ public class OriginalRecordController {
         PageInfo<ExperimentalVo> pageInfo = new PageInfo<>(list);
         return ServerResponse.createSuccessPage(pageInfo, data.getData().getPage(), data.getData().getLimit());
     }
-
-    @PostMapping(value = "getDetailList")
-    @DecryptAndVerify(decryptedClass = ParamsDto.class)//加解密统一管理
-    @LogAnnotation(operModul = "原始记录管理", operation = "查询审查详情列表", operDesc = "系统级事件", operType = "查询")
-//    @PreAuthorize("@pms.hasPermission('sys:originalRecord:detailQuery')")
-    public ServerResponse getDetailList(EncryptedReq<ParamsDto> data) {
-        PageHelper.startPage(data.getData().getPage(), data.getData().getLimit());
-        List<ExperimentalDetailVo> list = service.getDetailList(data.getData());
-        PageInfo<ExperimentalDetailVo> pageInfo = new PageInfo<>(list);
-        return ServerResponse.createSuccessPage(pageInfo, data.getData().getPage(), data.getData().getLimit());
-    }
 }

src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java

@@ -28,24 +28,4 @@ public interface OriginalRecordMapper {
      * @date 2024/7/23 10:15
      */
     List<ExperimentalVo> getList(ParamsDto dto);
-
-    /**
-     * 原始记录审查详情列表
-     *
-     * @param dto
-     * @return List<ExperimentalDetailVo>
-     * @author cwchen
-     * @date 2024/7/23 17:58
-     */
-    List<ExperimentalDetailVo> getDetailList(ParamsDto dto);
-
-    /**
-     * 查询试验设备数量
-     * @param experId
-     * @return List<Map < String, String>>
-     * @author cwchen
-     * @date 2024/7/23 18:16
-     */
-    @MapKey("id")
-    List<Map<String, String>> getExperDevItemsNum(Long experId);
 }

src/main/java/com/bonus/aqgqj/basis/service/OriginalRecordService.java

@@ -25,12 +25,4 @@ public interface OriginalRecordService {
      */
     List<ExperimentalVo> getList(ParamsDto data);
 
-    /**
-     * 审查详情列表
-     * @param data
-     * @return List<ExperimentalDetailVo>
-     * @author cwchen
-     * @date 2024/7/23 17:57
-     */
-    List<ExperimentalDetailVo> getDetailList(ParamsDto data);
 }

src/main/java/com/bonus/aqgqj/basis/service/impl/OriginalRecordServiceImpl.java

@@ -42,29 +42,4 @@ public class OriginalRecordServiceImpl implements OriginalRecordService {
         }
         return list;
     }
-
-    @Override
-    public List<ExperimentalDetailVo> getDetailList(ParamsDto dto) {
-        List<ExperimentalDetailVo> list = new ArrayList<>();
-        try {
-            list = mapper.getDetailList(dto);
-            if (CollectionUtils.isNotEmpty(list)) {
-                for (ExperimentalDetailVo detailVo : list) {
-                    // 样品试验结果、样品数量、送样总数
-                    List<ExperimentalDetailVo.Sample> sampleList = new ArrayList<>();
-                    if (detailVo.getExperId() != null) {
-                        List<Map<String, String>> mapList = mapper.getExperDevItemsNum(detailVo.getExperId());
-                        JSONArray jsonArray = new JSONArray();
-                        jsonArray.addAll(mapList);
-                        sampleList = jsonArray.toJavaList(ExperimentalDetailVo.Sample.class);
-                    }
-                    detailVo.setSampleList(sampleList);
-                    detailVo.setSampleQuantity(sampleList.size());
-                }
-            }
-        } catch (Exception e) {
-            log.error(e.toString(), e);
-        }
-        return list;
-    }
 }

src/main/resources/mappers/basis/OriginalRecordMapper.xml

@@ -129,50 +129,4 @@
         </if>
         ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC
     </select>
-    <!--原始记录审查详情列表-->
-    <select id="getDetailList" resultType="com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo">
-        SELECT ANY_VALUE(tsd.sample_id) AS sampleId,
-        ANY_VALUE(tsd.dev_type_name) AS devTypeName,
-        tsd.dev_type_code AS devTypeCode,
-        ANY_VALUE(te.id) AS experId,
-        COUNT(tsd.dev_type_code) AS sampleNum,
-        ANY_VALUE(te.audit_remakr) AS causeOfRejection,
-        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) = 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 '审核不通过'
-        WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 0 THEN '待审批'
-        WHEN ANY_VALUE(te.status) = 3 AND ANY_VALUE(te.audit_status) = 4 THEN '审批不通过'
-        WHEN ANY_VALUE(te.status) = 4 AND ANY_VALUE(te.audit_status) = 1 THEN '试验完成'
-        ELSE '待试验'
-        END AS status
-        FROM tb_sample_device tsd
-        LEFT JOIN tb_exper te ON tsd.sample_id = te.sample_id AND tsd.dev_type_code = te.dev_type_code AND te.del_flag = 0
-        LEFT JOIN sys_user su2 ON te.update_user = su2.id AND su2.del_flag = 0
-        WHERE tsd.sample_id = #{id} AND tsd.del_falg = 0
-        <if test="devTypeCode != null and devTypeCode!=''">
-            AND INSTR(tsd.dev_type_code,#{devTypeCode})
-        </if>
-        <if test="startTime != null and endTime!=''">
-            AND DATE_FORMAT(te.update_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
-        </if>
-        <if test="keyWord != null and keyWord!=''">
-            AND (
-                INSTR(su2.user_name,#{keyWord}) > 0
-            )
-        </if>
-        GROUP BY tsd.dev_type_code
-    </select>
-    <!--查询试验设备数量-->
-    <select id="getExperDevItemsNum" resultType="java.util.Map">
-        SELECT dev_code AS devCode,
-               case is_hg WHEN '1' THEN '不合格'
-                          WHEN '0' THEN '合格'
-                          ELSE '不合格' END AS testResult
-        FROM tb_exper_dev
-        WHERE exper_id = #{experId}
-    </select>
 </mapper>

src/main/resources/static/js/basis/child/auditData.js

@@ -155,9 +155,9 @@ function getReqParams(page, limit, type) {
 // 查询/重置
 function query() {
     let pattern = new RegExp("[%_<>]");
-    if (pattern.test($("#ip").val())) {
+    if (pattern.test($("#keyWord").val())) {
-        $("#ip").val('');
+        $("#keyWord").val('');
-        return layer.msg('ip查询包含特殊字符，请重新输入', {
+        return layer.msg('关键字查询包含特殊字符，请重新输入', {
             icon: 2,
             time: 2000 //2秒关闭（如果不配置，默认是3秒）
         });

src/main/resources/static/js/basis/examine.js

@@ -142,9 +142,9 @@ function getReqParams(page, limit, type) {
 // 查询/重置
 function query() {
     let pattern = new RegExp("[%_<>]");
-    if (pattern.test($("#ip").val())) {
+    if (pattern.test($("#keyWord").val())) {
-        $("#ip").val('');
+        $("#keyWord").val('');
-        return layer.msg('ip查询包含特殊字符，请重新输入', {
+        return layer.msg('关键字查询包含特殊字符，请重新输入', {
             icon: 2,
             time: 2000 //2秒关闭（如果不配置，默认是3秒）
         });

src/main/resources/static/js/basis/originalRecord.js

@@ -143,8 +143,8 @@ function getReqParams(page, limit, type) {
 function query() {
     let pattern = new RegExp("[%_<>]");
     if (pattern.test($("#ip").val())) {
-        $("#ip").val('');
+        $("#keyWord").val('');
-        return layer.msg('ip查询包含特殊字符，请重新输入', {
+        return layer.msg('关键字查询包含特殊字符，请重新输入', {
             icon: 2,
             time: 2000 //2秒关闭（如果不配置，默认是3秒）
         });