Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/supply/judgementBills/entity/SupplyJudgementBills.java

@@ -12,7 +12,7 @@ public class SupplyJudgementBills extends DataEntity<SupplyJudgementBills> {
     private String serialNumber;            //序号
     private String materialNumber;          //varchar(255) 物料编码
     private String materialDescription;     //varchar(500) 物料描述
-    public String  examineCount;            //varchar(255) 审定数量
+    private String  examineCount;            //varchar(255) 审定数量
     private String unit;                    //varchar(255) 单位
     private String projectDefinition;       //varchar(255) 项目定义号
     private String projectName;             //varchar(255) 项目名称

src/main/java/com/jeeplus/modules/supply/judgementBills/mapper/SupplyJudgementBillsMapper.java

@@ -8,7 +8,8 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * @author: 大猫
+ * 审定单mapper
+ * @author: 徐滕
  * @create: 2022-02-28 16:00
  **/
 @MyBatisMapper

src/main/java/com/jeeplus/modules/supply/judgementBills/service/SupplyJudgementBillsService.java

@@ -6,13 +6,15 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.supply.judgementBills.entity.SupplyJudgementBills;
 import com.jeeplus.modules.supply.judgementBills.mapper.SupplyJudgementBillsMapper;
+import com.jeeplus.modules.supply.utils.CommonUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 /**
- * @author: 大猫
+ * 审定单service
+ * @author: 徐滕
  * @create: 2022-02-28 15:59
  **/
 @Service
@@ -62,18 +64,9 @@ public class SupplyJudgementBillsService extends CrudService<SupplyJudgementBill
         //查询项目定义号对应的项目信息
         List<String> projectDefinitionList = new ArrayList(set);
         List<String> projectDefinitionInfoList = mapper.getProjectDefinitionList(projectDefinitionList);
-        String projectDefinitions = StringUtils.join(projectDefinitionInfoList);
-
-        List<String> nonentityProjectDefinitionList = Lists.newArrayList();
         //判断项目信息和数据库中的项目信息数量是否一致，不一致则找到对应信息并进行提示
         if(projectDefinitionList.size() != projectDefinitionInfoList.size()){
-            for (String projectDefinition : projectDefinitionList) {
-                //判定上传的信息中的项目定义号是否包含在数据库中
-                if(!projectDefinitions.contains(projectDefinition)){
-                    nonentityProjectDefinitionList.add(projectDefinition);
-                }
-            }
-            String nonentityProjectDefinitions = StringUtils.join(nonentityProjectDefinitionList);
+            String nonentityProjectDefinitions = CommonUtil.comparisonProjectDefinition(projectDefinitionInfoList,projectDefinitionList);
             map.put("success",false);
             map.put("message","查询不到项目定义号为：" + nonentityProjectDefinitions + " 的项目信息。请先上传对应项目信息");
             return map;

src/main/java/com/jeeplus/modules/supply/stockOut/mapper/SupplyStockOutMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
+ * 出库单mapper
  * @author: 徐滕
  * @create: 2022-02-25 10:32
  **/

src/main/java/com/jeeplus/modules/supply/stockOut/service/SupplyStockOutService.java

@@ -7,6 +7,7 @@ import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.supply.judgementBills.mapper.SupplyJudgementBillsMapper;
 import com.jeeplus.modules.supply.stockOut.entity.SupplyStockOut;
 import com.jeeplus.modules.supply.stockOut.mapper.SupplyStockOutMapper;
+import com.jeeplus.modules.supply.utils.CommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 
 /**
+ * 出库单service
  * @author: 徐滕
  * @create: 2022-02-25 10:31
  **/
@@ -81,18 +83,9 @@ public class SupplyStockOutService  extends CrudService<SupplyStockOutMapper, Su
         //查询项目定义号对应的项目信息
         List<String> projectDefinitionList = new ArrayList(set);
         List<String> projectDefinitionInfoList = supplyJudgementBillsMapper.getProjectDefinitionList(projectDefinitionList);
-        String projectDefinitions = StringUtils.join(projectDefinitionInfoList);
-
-        List<String> nonentityProjectDefinitionList = Lists.newArrayList();
         //判断项目信息和数据库中的项目信息数量是否一致，不一致则找到对应信息并进行提示
         if(projectDefinitionList.size() != projectDefinitionInfoList.size()){
-            for (String projectDefinition : projectDefinitionList) {
-                //判定上传的信息中的项目定义号是否包含在数据库中
-                if(!projectDefinitions.contains(projectDefinition)){
-                    nonentityProjectDefinitionList.add(projectDefinition);
-                }
-            }
-            String nonentityProjectDefinitions = StringUtils.join(nonentityProjectDefinitionList);
+            String nonentityProjectDefinitions = CommonUtil.comparisonProjectDefinition(projectDefinitionInfoList,projectDefinitionList);
             map.put("success",false);
             map.put("message","查询不到项目定义号为：" + nonentityProjectDefinitions + " 的项目信息。请先上传对应项目信息");
             return map;

src/main/java/com/jeeplus/modules/supply/stockOut/web/SupplyStockOutController.java

@@ -10,7 +10,6 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.supply.stockOut.entity.SupplyStockOut;
 import com.jeeplus.modules.supply.stockOut.service.SupplyStockOutService;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -28,7 +27,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-
+/**
+ * 出库单controller
+ * @author: 徐滕
+ * @create: 2022-03-02 10:31
+ **/
 @Controller
 @RequestMapping(value = "${adminPath}/supply/stockOut")
 public class SupplyStockOutController extends BaseController {

src/main/java/com/jeeplus/modules/supply/utils/CommonUtil.java

@@ -0,0 +1,40 @@
+package com.jeeplus.modules.supply.utils;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.supply.judgementBills.entity.SupplyJudgementBills;
+import com.jeeplus.modules.supply.judgementBills.mapper.SupplyJudgementBillsMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 公共验证方法
+ * @author: 徐滕
+ * @create: 2022-03-03 09:21
+ **/
+public class CommonUtil {
+
+    /**
+     * 对比项目定义号信息
+     * @param projectDefinitionInfoList 项目信息表中的项目定义号
+     * @param projectDefinitionList 导入数据中的项目定义号
+     * @return
+     */
+    public static String comparisonProjectDefinition (List<String> projectDefinitionInfoList, List<String> projectDefinitionList){
+
+        List<String> nonentityProjectDefinitionList = Lists.newArrayList();
+        String projectDefinitions = StringUtils.join(projectDefinitionInfoList);
+
+        for (String projectDefinition : projectDefinitionList) {
+            //判定上传的信息中的项目定义号是否包含在数据库中
+            if(!projectDefinitions.contains(projectDefinition)){
+                nonentityProjectDefinitionList.add(projectDefinition);
+            }
+        }
+        String nonentityProjectDefinitions = StringUtils.join(nonentityProjectDefinitionList);
+        return nonentityProjectDefinitions;
+    }
+}