From 09cf3540864329195ae7fb0780dc2cda208406c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 20 Jun 2021 23:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/MaterialController.java    |  5 ++-
 .../datasource/mappers/MaterialMapperEx.java  | 13 +++++++
 .../erp/service/material/MaterialService.java | 24 +-----------
 .../resources/mapper_xml/MaterialMapperEx.xml | 38 +++++++++++++++++++
 4 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index bf74081f..9e10de2e 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -55,8 +55,9 @@ public class MaterialController {
                                @RequestParam("otherField3") String otherField3, @RequestParam("unit") String unit,@RequestParam("unitId") Long unitId,
                                HttpServletRequest request)throws Exception {
         Map<String, Object> objectMap = new HashMap<String, Object>();
-        int exist = materialService.checkIsExist(id, name, model, color, standard, mfrs,
-                otherField1, otherField2, otherField3, unit, unitId);
+        int exist = materialService.checkIsExist(id, name, StringUtil.toNull(model), StringUtil.toNull(color),
+                StringUtil.toNull(standard), StringUtil.toNull(mfrs), StringUtil.toNull(otherField1),
+                StringUtil.toNull(otherField2), StringUtil.toNull(otherField3), StringUtil.toNull(unit), unitId);
         if(exist > 0) {
             objectMap.put("status", true);
         } else {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
index d5fcfc6f..cf8b748f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
@@ -102,4 +102,17 @@ public interface MaterialMapperEx {
             @Param("depotId") Long depotId,
             @Param("idList") List<Long> idList,
             @Param("materialParam") String materialParam);
+
+    int checkIsExist(
+            @Param("id") Long id,
+            @Param("name") String name,
+            @Param("model") String model,
+            @Param("color") String color,
+            @Param("standard") String standard,
+            @Param("mfrs") String mfrs,
+            @Param("otherField1") String otherField1,
+            @Param("otherField2") String otherField2,
+            @Param("otherField3") String otherField3,
+            @Param("unit") String unit,
+            @Param("unitId") Long unitId);
 }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 1e09653a..7814f4c4 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -298,28 +298,8 @@ public class MaterialService {
 
     public int checkIsExist(Long id, String name, String model, String color, String standard, String mfrs,
                             String otherField1, String otherField2, String otherField3, String unit, Long unitId)throws Exception {
-        MaterialExample example = new MaterialExample();
-        MaterialExample.Criteria criteria = example.createCriteria();
-        criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
-                .andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
-                .andOtherField1EqualTo(otherField1).andOtherField2EqualTo(otherField2).andOtherField2EqualTo(otherField3)
-                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        if (id > 0) {
-            criteria.andIdNotEqualTo(id);
-        }
-        if (!StringUtil.isEmpty(unit)) {
-            criteria.andUnitEqualTo(unit);
-        }
-        if (unitId !=null) {
-            criteria.andUnitIdEqualTo(unitId);
-        }
-        List<Material> list =null;
-        try{
-            list=  materialMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list==null?0:list.size();
+        return materialMapperEx.checkIsExist(id, name, model, color, standard, mfrs, otherField1,
+                otherField2, otherField3, unit, unitId);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 14b2f27b..adc078af 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -406,4 +406,42 @@
         </if>
         and ifnull(m.delete_flag,'0') !='1'
     </select>
+
+    <select id="checkIsExist" resultType="java.lang.Integer">
+        select count(1) from jsh_material m
+        where ifnull(m.delete_flag,'0') !='1'
+        <if test="name != null">
+            and m.name = #{name}
+        </if>
+        <if test="model != null">
+            and m.model = #{model}
+        </if>
+        <if test="color != null">
+            and m.color = #{color}
+        </if>
+        <if test="standard != null">
+            and m.standard = #{standard}
+        </if>
+        <if test="mfrs != null">
+            and m.mfrs = #{mfrs}
+        </if>
+        <if test="otherField1 != null">
+            and m.other_field1 = #{otherField1}
+        </if>
+        <if test="otherField2 != null">
+            and m.other_field2 = #{otherField2}
+        </if>
+        <if test="otherField3 != null">
+            and m.other_field3 = #{otherField3}
+        </if>
+        <if test="unit != null">
+            and m.unit = #{unit}
+        </if>
+        <if test="unitId != null">
+            and m.unit_id = #{unitId}
+        </if>
+        <if test="id != null">
+            and m.id != #{id}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file