From 5fb14bb0d28210f69c07021441b2cdd76aa46fe5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 九月 2023 17:58:24 +0800
Subject: [PATCH] 原材料检验修改9-4 3.0

---
 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml                    |   29 ++++-
 inspect-server/src/main/resources/mapper/RawInspectMapper.xml                           |    6 +
 inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java                    |    1 
 inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java               |   10 ++
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java |    7 -
 inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java       |   24 +++-
 inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java                       |    1 
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java        |    6 +
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java                |    1 
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java    |  154 +++++++++++++++++++++++++-----
 inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java               |    3 
 inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java            |    6 +
 inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java             |   16 ++
 inspect-server/src/main/resources/mapper/RawInsProductMapper.xml                        |   12 ++
 14 files changed, 223 insertions(+), 53 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index 33c4c66..399a283 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -38,7 +38,7 @@
     @PostMapping("/addRawInspects")
     public Result addRawInspects(@RequestHeader("token") String token, @RequestBody RawInspectVo rawInspectVo) throws Exception {
         Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
-        return Result.success(rawInspectService.addRawInspects(data.get("name").replaceAll("\"", ""), rawInspectVo));
+        return Result.success(rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
     }
 
     @ApiOperation(value = "鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃")
@@ -82,9 +82,23 @@
         return Result.success(rawInspectService.updateRawInspectsById(id));
     }
 
+    @ApiOperation(value = "鍒犻櫎")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "鍘熸潗鏂欐楠屽崟id", dataTypeClass = Integer.class, required = true)
+    })
+    @PostMapping("/delRawInsById")
+    public Result delRawInsById(Integer id) {
+        rawInspectService.delRawInsById(id);
+        return Result.success("鍒犻櫎" + id + "鎴愬姛!");
+    }
 
-
-
-
-
+    @ApiOperation(value = "鎵归噺鍒犻櫎")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "ids", value = "鍘熸潗鏂欐楠屽崟id", dataTypeClass = String.class, required = true)
+    })
+    @PostMapping("/delAllRawIns")
+    public Result delAllRawIns(String ids) {
+        rawInspectService.delAllRawIns(ids);
+        return Result.success("鎵归噺鍒犻櫎鎴愬姛!");
+    }
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
index c6a9145..3227e8c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
@@ -17,5 +17,11 @@
 
     //鏌ヨ鎴愬搧妫�楠屼腑涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
     IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState);
+
+    //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�
+    void updaRawIns(Integer id);
+
+    //鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�
+    void delAllRawIns(String ids);
 }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
index bf0108c..74ac78c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
@@ -18,5 +18,11 @@
 
     //鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�
     List<Integer> getresult(Integer id);
+
+    //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
+    void updaRawInsById(Integer id);
+
+    //鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩�
+    void delAllRawIns(String ids);
 }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
index c3df3f8..a536bd6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
@@ -28,6 +28,9 @@
 
     //鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏
     List<Map<String, Object>> selectRawInspectsListById(Integer id);
+
+    //鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎
+    void delAllRawIns(String ids);
 }
 
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index f7feb1b..0e27b8e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -60,7 +60,6 @@
     private Date dealTime;
 
     @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
-    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
index 5c142db..ed42d76 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
@@ -63,7 +63,6 @@
     private Integer testState;
 
     @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
-    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     @TableField(fill = FieldFill.INSERT)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
index 364f96c..32511d9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
@@ -82,7 +82,6 @@
     private String userName;
 
     @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
-    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     /**
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
index bfdc58f..154df8d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
@@ -40,4 +40,14 @@
     @JsonSerialize
     private String internal;
 
+    /**
+     * 妫�娴嬪��
+     */
+    private String testValue;
+
+    /**
+     * 璁惧id
+     */
+    private Integer deviceId;
+
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index cdda26c..ba303c1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -18,10 +18,10 @@
 
     /**
      * 鏂板鍘熸潗鏂欐楠屽崟
-     * @param userName
+     * @param userId
      * @param rawInspectVo
      */
-    String addRawInspects(String userName, RawInspectVo rawInspectVo);
+    String addRawInspects(String userId, RawInspectVo rawInspectVo);
 
     /**
      * 鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
@@ -47,7 +47,15 @@
      */
     String updateRawInspectsById(Integer id);
 
+    /**
+     * 鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
+     * @param id
+     */
+    void delRawInsById(Integer id);
 
-
-
+    /**
+     * 鎵归噺鍒犻櫎
+     * @param ids
+     */
+    void delAllRawIns(String ids);
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 0d6a42f..31bc55f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -1,18 +1,16 @@
 package com.yuanchu.mom.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.mapper.RawInsProductMapper;
 import com.yuanchu.mom.mapper.RawInspectMapper;
 import com.yuanchu.mom.pojo.RawInsProduct;
 import com.yuanchu.mom.pojo.RawInspect;
 import com.yuanchu.mom.service.RawInsProductService;
-import com.yuanchu.mom.utils.MyUtil;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -59,7 +57,6 @@
         /*鏇存柊鍘熸潗鏂欐楠屽崟*/
         RawInspect rawInspect = new RawInspect();
         rawInspect.setId(rawInsProduct.getRawInspectId());
-        rawInspect.setInsState(2);
         rawInspectMapper.updateById(rawInspect);
     }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 6ec695c..72b3615 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -42,6 +42,60 @@
     @Resource
     InspectUnacceptedMapper inspectUnacceptedMapper;
 
+    @Resource
+    UserMapper userMapper;
+
+    //鏂板鍘熸潗鏂欐楠屽崟
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addRawInspects(String userId, RawInspectVo rawInspectVo) {
+        //鎶ユ浜�(鏂板妫�楠屽崟鐨勪汉)
+        rawInspectVo.setUserName(userMapper.selectById(userId).getName());
+        //鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
+        List<RawInsProductVo> rawInsProductVos = rawInspectVo.getRawInsProducts();
+        for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
+            char internal = rawInsProductVo.getInternal().charAt(0);
+            char required = rawInsProductVo.getRequired().charAt(0);
+            if (internal != '>' && internal != '<' && internal != '=') {
+                return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
+            }
+            if (required != '>' && required != '<' && required != '=') {
+                return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
+            }
+        }
+        /*鏂板鍘熸潗鏂欐楠屽崟*/
+        RawInspect rawInspect = new RawInspect();
+        BeanUtils.copyProperties(rawInspectVo, rawInspect);
+        rawInspectMapper.insert(rawInspect);
+        /*鏂板鍘熸潗鏂欐楠岄」鐩崟*/
+        List<RawInsProduct> rawInsProductList = rawInsProductVos.stream().map(rawInsProVo -> {
+            RawInsProduct rawInsProduct = new RawInsProduct();
+            BeanUtils.copyProperties(rawInsProVo, rawInsProduct);
+            if (ObjectUtils.isNotEmpty(rawInsProduct.getTestValue())) {
+                //鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
+                String required = rawInsProduct.getRequired();//鏍囧噯鍊�
+                String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
+                String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
+                List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
+                    int values = checkValues(required, internal, s);
+                    return values;
+                }).collect(Collectors.toList());
+                if (list.contains(0)) {
+                    //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+                    rawInsProduct.setTestState(0);
+                } else {
+                    rawInsProduct.setTestState(1);
+                }
+                rawInsProduct.setUserId(Integer.parseInt(userId));
+            }
+            rawInsProduct.setRawInspectId(rawInspect.getId());
+            return rawInsProduct;
+        }).collect(Collectors.toList());
+        //妫�楠岄」鐩壒閲忔坊鍔�
+        rawInsProductService.saveBatch(rawInsProductList);
+        return "鏂板妫�楠屽崟鎴愬姛!";
+    }
+
 
     //鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
     @Override
@@ -71,6 +125,7 @@
         RawInspect rawInspect = new RawInspect();
         rawInspect.setId(id);
         rawInspect.setInsState(1);
+        rawInspect.setInsTime(new Date());
         //濡傛灉妫�楠岄」鐩腑鐨勭粨璁哄寘鍚笉鍚堟牸鍒欐楠屽崟涓嶅悎鏍�
         if (results.contains(0)) {
             rawInspect.setJudgeState(0);
@@ -92,39 +147,80 @@
         return "涓婃姤鎴愬姛!";
     }
 
-
-    //鏂板鍘熸潗鏂欐楠屽崟
+    //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addRawInspects(String userName, RawInspectVo rawInspectVo) {
-        //鎶ユ浜�(鏂板妫�楠屽崟鐨勪汉)
-        rawInspectVo.setUserName(userName);
-        //鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
-        List<RawInsProductVo> rawInsProductVos = rawInspectVo.getRawInsProducts();
-        for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
-            char internal = rawInsProductVo.getInternal().charAt(0);
-            char required = rawInsProductVo.getRequired().charAt(0);
-            if (internal != '>' && internal != '<' && internal != '=') {
-                if (required != '>' && required != '<' && required != '=') {
-                    return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
-                }
-                return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
+    public void delRawInsById(Integer id) {
+        /*鍒犻櫎鍘熸潗鏂欐楠屽崟*/
+        RawInspect rawInspect = new RawInspect();
+        rawInspect.setId(id);
+        rawInspect.setState(0);
+        rawInspectMapper.updateById(rawInspect);
+        /*鍒犻櫎鍘熸潗鏂欐楠岄」鐩〃*/
+        rawInsProductMapper.updaRawInsById(id);
+        /*鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍗�*/
+        inspectUnacceptedMapper.updaRawIns(id);
+    }
+
+    //鎵归噺鍒犻櫎
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delAllRawIns(String ids) {
+        /*鎵归噺鍒犻櫎鍘熸潗鏂欐楠屽崟*/
+        rawInspectMapper.delAllRawIns(ids);
+        /*鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩〃*/
+        rawInsProductMapper.delAllRawIns(ids);
+        /*鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍗�*/
+        inspectUnacceptedMapper.delAllRawIns(ids);
+
+    }
+
+
+    /*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
+    private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+        boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+        boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
+
+        if (isStandardValueSatisfied && isControlValueSatisfied) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
+        String substring = valueStr.substring(1, 2);
+        if (substring.equals("=")) {
+            String operator = valueStr.substring(0, 2);
+            Double standardValue = Double.parseDouble(valueStr.substring(2));
+            Double detectionValue = Double.parseDouble(detectionValueStr);
+            switch (operator) {
+                case ">=":
+                    return detectionValue >= standardValue;
+                case "<=":
+                    return detectionValue <= standardValue;
+                default:
+                    return false;
+            }
+        } else {
+            String operator = valueStr.substring(0, 1);
+            Double standardValue = Double.parseDouble(valueStr.substring(1));
+            Double detectionValue = Double.parseDouble(detectionValueStr);
+            switch (operator) {
+                case ">":
+                    return detectionValue > standardValue;
+                case "鈮�":
+                    return detectionValue >= standardValue;
+                case "鈮�":
+                    return detectionValue <= standardValue;
+                case "<":
+                    return detectionValue < standardValue;
+                case "=":
+                    return detectionValue.equals(standardValue);
+                default:
+                    return false;
             }
         }
-        /*鏂板鍘熸潗鏂欐楠屽崟*/
-        RawInspect rawInspect = new RawInspect();
-        BeanUtils.copyProperties(rawInspectVo, rawInspect);
-        rawInspectMapper.insert(rawInspect);
-        /*鏂板鍘熸潗鏂欐楠岄」鐩崟*/
-        List<RawInsProduct> rawInsProductList = rawInsProductVos.stream().map(rawInsProVo -> {
-            RawInsProduct rawInsProduct = new RawInsProduct();
-            BeanUtils.copyProperties(rawInsProVo, rawInsProduct);
-            rawInsProduct.setRawInspectId(rawInspect.getId());
-            return rawInsProduct;
-        }).collect(Collectors.toList());
-        //妫�楠岄」鐩壒閲忔坊鍔�
-        rawInsProductService.saveBatch(rawInsProductList);
-        return "鏂板妫�楠屽崟鎴愬姛!";
     }
 }
 
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index e02d08b..61deb85 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
+    <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�-->
+    <update id="updaRawIns">
+        update mom_ocean.inspect_unaccepted
+        set state=0
+        where raw_inspect_id = #{id}
+          and type = 0
+    </update>
+    <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�-->
+    <update id="delAllRawIns">
+        update mom_ocean.inspect_unaccepted
+        set state=0
+        where raw_inspect_id in (${ids})
+          and type = 0
+    </update>
+
     <select id="selectUnRawInspectsList" resultType="java.util.Map">
         select ru.id,
         DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
@@ -18,13 +33,13 @@
         DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
         from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
         <where>
-        <if test="dealState!=null and dealState!=''">
-           and deal_state=#{dealState}
-        </if>
-        <if test="formTime!=null and formTime!=''">
-            and form_time=#{formTime}
-        </if>
-        and ru.state=1
+            <if test="dealState!=null and dealState!=''">
+                and deal_state=#{dealState}
+            </if>
+            <if test="formTime!=null and formTime!=''">
+                and form_time=#{formTime}
+            </if>
+            and ru.state=1
         </where>
         order by ru.id desc
     </select>
diff --git a/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml b/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
index 3c9a5d9..d8e0d2a 100644
--- a/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yuanchu.mom.mapper.RawInsProductMapper">
+    <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎-->
+    <update id="updaRawInsById">
+        update mom_ocean.raw_ins_product
+        set state=0
+        where raw_inspect_id = #{id}
+    </update>
+    <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩�-->
+    <update id="delAllRawIns">
+        update mom_ocean.raw_ins_product
+        set state=0
+        where raw_inspect_id in (${ids})
+    </update>
     <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�-->
     <select id="getresult" resultType="java.lang.Integer">
         select test_state
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index 1c9b84b..327ba05 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -3,6 +3,12 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
+    <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎-->
+    <update id="delAllRawIns">
+        update mom_ocean.raw_inspect
+        set state=0
+        where id in (${ids})
+    </update>
     <select id="selCountRaw" resultType="java.lang.Integer">
         select count(id)
         from mom_ocean.raw_inspect

--
Gitblit v1.9.3