代储点修改

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentStorehouseController.java

@@ -113,7 +113,7 @@ public class AgentStorehouseController {
         	}
         }
         //如果是粮情数据，那就不要油罐的信息
-        if (ParameterUtil.isequal(is_lq,"1")) {
+        if (ParameterUtil.isnotnull(is_lq) && ParameterUtil.isequal(is_lq,"1")) {
         	if (null != new_list && new_list.size() > 0) {
         		List<Map<String,Object>> list2 = new ArrayList<Map<String, Object>>();
         		Iterator<Map<String,Object>> ite = list.iterator();

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

@@ -11,10 +11,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class AgentTankServiceImpl implements agentTankService {
@@ -190,6 +187,8 @@ public class AgentTankServiceImpl implements agentTankService {
                 }
 
             }
+            String tank_id = "YG" + UUID.randomUUID().toString().replace("-", "");
+            agent.setId(tank_id.trim());
             BusinessAgentTankMapper.insert(agent);
         }
         return msg;

src/main/java/com/chinaitop/depot/agent/quality/controller/AgentQualityController.java

@@ -224,7 +224,10 @@ public class AgentQualityController {
         retMap.put("qualitycheck",qualitycheck);
 
         if(qualitycheck!=null){
-            BusinessAgentQualityInspection qualitycheckInspection = agentQualityService.loadDataByTankId(id);
+            BusinessAgentQualityInspectionExample example = new BusinessAgentQualityInspectionExample();
+            BusinessAgentQualityInspectionExample.Criteria criteria = example.createCriteria();
+            criteria.andQualitycheckIdEqualTo(id);
+            BusinessAgentQualityInspection qualitycheckInspection = agentQualityService.loadDataByQualityId(example);
             retMap.put("qualitycheckInspection",qualitycheckInspection);
         }
 
@@ -305,15 +308,19 @@ public class AgentQualityController {
             @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "检查类型", paramType = "query"),
-            @ApiImplicitParam(name = "sealStatus", value = "封仓类型", paramType = "query")
+            @ApiImplicitParam(name = "checkResult", value = "封仓类型", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
     })
-    public BusinessAgentQuality findByStoreWarehouse(Integer houseId, Integer warehouseId, String type,String sealStatus) {
+    public BusinessAgentQuality findByStoreWarehouse(String houseId, Integer warehouseId, String type,String checkResult, Integer orgId) {
     	BusinessAgentQuality qualityCheckExample = new BusinessAgentQuality();
         BusinessAgentQuality qualitycheck = null;
         try {
-            if (houseId != null && !"".equals(houseId)) {
-                qualityCheckExample.setStorehouseId(houseId);
-
+            if (ParameterUtil.isnotnull(houseId)) {
+                if(ParameterUtil.isNumeric(houseId)){
+                    qualityCheckExample.setStorehouseId(Integer.parseInt(houseId));
+                }else{
+                    qualityCheckExample.setTankId(houseId);
+                }
             }
             if(warehouseId != null && !"".equals(warehouseId)){
                 qualityCheckExample.setWarehouseId(warehouseId);
@@ -322,11 +329,12 @@ public class AgentQualityController {
                 qualityCheckExample.setType(type);//传入查找的质量类型
             }
 
-            if(StringUtils.isNotBlank(sealStatus)){
-                qualityCheckExample.setSealStatus(sealStatus);//传入查找的质量类型
+            if(StringUtils.isNotBlank(checkResult)){
+                qualityCheckExample.setSealStatus(checkResult);//传入查找的质量类型
             }
             //0:最新数据  1:历史数据
             qualityCheckExample.setHistoryStatus(0);
+            qualityCheckExample.setOrgId(orgId);
             List<BusinessAgentQuality> list = agentQualityService.queryByQualitycheck(qualityCheckExample);
             if (null != list && list.size() > 0) {
             	qualitycheck = list.get(0);

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualityMapper.java

@@ -2,11 +2,11 @@ package com.chinaitop.depot.agent.quality.mapper;
 
 import com.chinaitop.depot.agent.quality.model.BusinessAgentQuality;
 import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
 public interface BusinessAgentQualityMapper {
     int countByExample(BusinessAgentQualityExample example);
 
@@ -40,8 +40,7 @@ public interface BusinessAgentQualityMapper {
      * @param qualitycheck
      * @return
      */
-    List<BusinessAgentQuality> getWareHouseIdList(
-            BusinessAgentQuality qualitycheck);
+    List<BusinessAgentQuality> getWareHouseIdList(BusinessAgentQuality qualitycheck);
     List<BusinessAgentQuality> getThirdCheckList(BusinessAgentQuality qualitycheck);
     List<BusinessAgentQuality> getQualitycheckListByFoodbasicinfoCheck(BusinessAgentQuality qualitycheck);
     BusinessAgentQuality queryPrimaryKey(Integer id);

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualityMapper.xml

@@ -13,6 +13,7 @@
     <result column="sub_type_detailed" property="subTypeDetailed" jdbcType="INTEGER" />
     <result column="check_time" property="checkTime" jdbcType="TIMESTAMP" />
     <result column="check_result" property="checkResult" jdbcType="VARCHAR" />
+    <result column="checker" property="checker" jdbcType="VARCHAR" />
     <result column="level" property="level" jdbcType="INTEGER" />
     <result column="capacity" property="capacity" jdbcType="VARCHAR" />
     <result column="water" property="water" jdbcType="VARCHAR" />
@@ -151,9 +152,9 @@
   </sql>
   <sql id="Base_Column_List" >
     id, agent_id, agent_depot_id, tank_id, storehouse_id, warehouse_id, type, sub_type, 
-    sub_type_detailed, check_time, check_result, level, capacity, water, impurity, mineral, 
-    badpart, colorsmell, keeper_advices, keeper_advices_time, keeper_advices_paint, chief_advices, 
-    chief_advices_time, chiet_advices_paint, vice_manager_advices, vice_manager_advices_time, 
+    sub_type_detailed, check_time, check_result, checker, level, capacity, water, impurity, 
+    mineral, badpart, colorsmell, keeper_advices, keeper_advices_time, keeper_advices_paint, 
+    chief_advices, chief_advices_time, chiet_advices_paint, vice_manager_advices, vice_manager_advices_time, 
     vice_manager_advices_paint, manager_advices, manager_advices_time, manager_advices_paint, 
     improve_result, improve_time, improve_paint, is_firstchecklevel_right, accept_unite, 
     input_time, number, location, keeper, harvest_time, goodpart, chooser, choose_time, 
@@ -196,18 +197,18 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQuality">
+  <insert id="insert" useGeneratedKeys="true" keyProperty="id"  parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQuality" >
     insert into business_agent_quality (id, agent_id, agent_depot_id, 
       tank_id, storehouse_id, warehouse_id, 
       type, sub_type, sub_type_detailed, 
-      check_time, check_result, level, 
-      capacity, water, impurity, 
-      mineral, badpart, colorsmell, 
-      keeper_advices, keeper_advices_time, keeper_advices_paint, 
-      chief_advices, chief_advices_time, chiet_advices_paint, 
-      vice_manager_advices, vice_manager_advices_time, 
-      vice_manager_advices_paint, manager_advices, 
-      manager_advices_time, manager_advices_paint, 
+      check_time, check_result, checker, 
+      level, capacity, water, 
+      impurity, mineral, badpart, 
+      colorsmell, keeper_advices, keeper_advices_time, 
+      keeper_advices_paint, chief_advices, chief_advices_time, 
+      chiet_advices_paint, vice_manager_advices, 
+      vice_manager_advices_time, vice_manager_advices_paint, 
+      manager_advices, manager_advices_time, manager_advices_paint, 
       improve_result, improve_time, improve_paint, 
       is_firstchecklevel_right, accept_unite, input_time, 
       number, location, keeper, 
@@ -231,14 +232,14 @@
     values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER}, 
       #{tankId,jdbcType=VARCHAR}, #{storehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, 
       #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, #{subTypeDetailed,jdbcType=INTEGER}, 
-      #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER}, 
-      #{capacity,jdbcType=VARCHAR}, #{water,jdbcType=VARCHAR}, #{impurity,jdbcType=VARCHAR}, 
-      #{mineral,jdbcType=VARCHAR}, #{badpart,jdbcType=VARCHAR}, #{colorsmell,jdbcType=VARCHAR}, 
-      #{keeperAdvices,jdbcType=VARCHAR}, #{keeperAdvicesTime,jdbcType=VARCHAR}, #{keeperAdvicesPaint,jdbcType=VARCHAR}, 
-      #{chiefAdvices,jdbcType=VARCHAR}, #{chiefAdvicesTime,jdbcType=TIMESTAMP}, #{chietAdvicesPaint,jdbcType=VARCHAR}, 
-      #{viceManagerAdvices,jdbcType=VARCHAR}, #{viceManagerAdvicesTime,jdbcType=TIMESTAMP}, 
-      #{viceManagerAdvicesPaint,jdbcType=VARCHAR}, #{managerAdvices,jdbcType=VARCHAR}, 
-      #{managerAdvicesTime,jdbcType=TIMESTAMP}, #{managerAdvicesPaint,jdbcType=VARCHAR}, 
+      #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, #{checker,jdbcType=VARCHAR}, 
+      #{level,jdbcType=INTEGER}, #{capacity,jdbcType=VARCHAR}, #{water,jdbcType=VARCHAR}, 
+      #{impurity,jdbcType=VARCHAR}, #{mineral,jdbcType=VARCHAR}, #{badpart,jdbcType=VARCHAR}, 
+      #{colorsmell,jdbcType=VARCHAR}, #{keeperAdvices,jdbcType=VARCHAR}, #{keeperAdvicesTime,jdbcType=VARCHAR}, 
+      #{keeperAdvicesPaint,jdbcType=VARCHAR}, #{chiefAdvices,jdbcType=VARCHAR}, #{chiefAdvicesTime,jdbcType=TIMESTAMP}, 
+      #{chietAdvicesPaint,jdbcType=VARCHAR}, #{viceManagerAdvices,jdbcType=VARCHAR}, 
+      #{viceManagerAdvicesTime,jdbcType=TIMESTAMP}, #{viceManagerAdvicesPaint,jdbcType=VARCHAR}, 
+      #{managerAdvices,jdbcType=VARCHAR}, #{managerAdvicesTime,jdbcType=TIMESTAMP}, #{managerAdvicesPaint,jdbcType=VARCHAR}, 
       #{improveResult,jdbcType=VARCHAR}, #{improveTime,jdbcType=TIMESTAMP}, #{improvePaint,jdbcType=VARCHAR}, 
       #{isFirstchecklevelRight,jdbcType=VARCHAR}, #{acceptUnite,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=VARCHAR}, #{location,jdbcType=VARCHAR}, #{keeper,jdbcType=VARCHAR}, 
@@ -296,6 +297,9 @@
       <if test="checkResult != null" >
         check_result,
       </if>
+      <if test="checker != null" >
+        checker,
+      </if>
       <if test="level != null" >
         level,
       </if>
@@ -562,6 +566,9 @@
       <if test="checkResult != null" >
         #{checkResult,jdbcType=VARCHAR},
       </if>
+      <if test="checker != null" >
+        #{checker,jdbcType=VARCHAR},
+      </if>
       <if test="level != null" >
         #{level,jdbcType=INTEGER},
       </if>
@@ -837,6 +844,9 @@
       <if test="record.checkResult != null" >
         check_result = #{record.checkResult,jdbcType=VARCHAR},
       </if>
+      <if test="record.checker != null" >
+        checker = #{record.checker,jdbcType=VARCHAR},
+      </if>
       <if test="record.level != null" >
         level = #{record.level,jdbcType=INTEGER},
       </if>
@@ -1086,6 +1096,7 @@
       sub_type_detailed = #{record.subTypeDetailed,jdbcType=INTEGER},
       check_time = #{record.checkTime,jdbcType=TIMESTAMP},
       check_result = #{record.checkResult,jdbcType=VARCHAR},
+      checker = #{record.checker,jdbcType=VARCHAR},
       level = #{record.level,jdbcType=INTEGER},
       capacity = #{record.capacity,jdbcType=VARCHAR},
       water = #{record.water,jdbcType=VARCHAR},
@@ -1200,6 +1211,9 @@
       <if test="checkResult != null" >
         check_result = #{checkResult,jdbcType=VARCHAR},
       </if>
+      <if test="checker != null" >
+        checker = #{checker,jdbcType=VARCHAR},
+      </if>
       <if test="level != null" >
         level = #{level,jdbcType=INTEGER},
       </if>
@@ -1446,6 +1460,7 @@
       sub_type_detailed = #{subTypeDetailed,jdbcType=INTEGER},
       check_time = #{checkTime,jdbcType=TIMESTAMP},
       check_result = #{checkResult,jdbcType=VARCHAR},
+      checker = #{checker,jdbcType=VARCHAR},
       level = #{level,jdbcType=INTEGER},
       capacity = #{capacity,jdbcType=VARCHAR},
       water = #{water,jdbcType=VARCHAR},
@@ -1632,7 +1647,7 @@
     sqk.seal_status, sqk.auth_code, sqk.org_id, sqk.history_status,
     sqk.intermixing_rate,sqk.smelltaste,sqk.transparency,sqk.peroxide_value,
     sqk.smoke_point,sqk.reeze_test,sqk.residual_solvent,sqk.lead,sqk.total_arsenic,sqk.aflatoxin,sqk.butyl_phenol,
-    sqk.updatetime
+    sqk.updatetime,sqk.tank_id
     <!--云南新增的字段，先注释掉方便调试-->
     /*, sqk.intermixing_rate,sqk.smelltaste,sqk.transparency,sqk.peroxide_value,
     sqk.smoke_point,sqk.reeze_test,sqk.residual_solvent,sqk.lead,sqk.total_arsenic,sqk.aflatoxin,sqk.butyl_phenol*/

src/main/java/com/chinaitop/depot/agent/quality/model/BusinessAgentQuality.java

@@ -26,6 +26,8 @@ public class BusinessAgentQuality {
 
     private String checkResult;
 
+    private String checker;
+
     private Integer level;
 
     private String capacity;
@@ -206,6 +208,7 @@ public class BusinessAgentQuality {
     private String stateType;
 
     private String tankName;
+
     /**
      * 质量检查信息表
      * @return id 质量检查信息表
@@ -383,6 +386,22 @@ public class BusinessAgentQuality {
     }
 
     /**
+     * 检验人
+     * @return checker 检验人
+     */
+    public String getChecker() {
+        return checker;
+    }
+
+    /**
+     * 检验人
+     * @param checker 检验人
+     */
+    public void setChecker(String checker) {
+        this.checker = checker == null ? null : checker.trim();
+    }
+
+    /**
      * 等级
      * @return level 等级
      */

src/main/java/com/chinaitop/depot/agent/quality/model/BusinessAgentQualityExample.java

@@ -74,7 +74,7 @@ public class BusinessAgentQualityExample {
     }
 
     /**
-     * business_agent_quality 2020-03-11
+     * business_agent_quality 2020-05-25
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -807,6 +807,76 @@ public class BusinessAgentQualityExample {
             return (Criteria) this;
         }
 
+        public Criteria andCheckerIsNull() {
+            addCriterion("checker is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerIsNotNull() {
+            addCriterion("checker is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerEqualTo(String value) {
+            addCriterion("checker =", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerNotEqualTo(String value) {
+            addCriterion("checker <>", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerGreaterThan(String value) {
+            addCriterion("checker >", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerGreaterThanOrEqualTo(String value) {
+            addCriterion("checker >=", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerLessThan(String value) {
+            addCriterion("checker <", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerLessThanOrEqualTo(String value) {
+            addCriterion("checker <=", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerLike(String value) {
+            addCriterion("checker like", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerNotLike(String value) {
+            addCriterion("checker not like", value, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerIn(List<String> values) {
+            addCriterion("checker in", values, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerNotIn(List<String> values) {
+            addCriterion("checker not in", values, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerBetween(String value1, String value2) {
+            addCriterion("checker between", value1, value2, "checker");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckerNotBetween(String value1, String value2) {
+            addCriterion("checker not between", value1, value2, "checker");
+            return (Criteria) this;
+        }
+
         public Criteria andLevelIsNull() {
             addCriterion("level is null");
             return (Criteria) this;
@@ -6069,7 +6139,7 @@ public class BusinessAgentQualityExample {
     }
 
     /**
-     * business_agent_quality 2020-03-11
+     * business_agent_quality 2020-05-25
      */
     public static class Criterion {
         private String condition;

src/main/java/com/chinaitop/depot/agent/quality/service/AgentQualityService.java

@@ -1,9 +1,6 @@
 package com.chinaitop.depot.agent.quality.service;
 
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQuality;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityExample;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityInspection;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon;
+import com.chinaitop.depot.agent.quality.model.*;
 
 import java.util.List;
 import java.util.Map;
@@ -126,5 +123,5 @@ public interface AgentQualityService {
 	 */
 	void tankSave(BusinessAgentQualityInspection qualityInspection);
 
-	BusinessAgentQualityInspection loadDataByTankId(Integer id);
+	BusinessAgentQualityInspection loadDataByQualityId(BusinessAgentQualityInspectionExample example);
 }

src/main/java/com/chinaitop/depot/agent/quality/service/impl/AgentQualityServiceImpl.java

@@ -4,10 +4,7 @@ import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
 import com.chinaitop.depot.agent.quality.mapper.BusinessAgentQualityInspectionMapper;
 import com.chinaitop.depot.agent.quality.mapper.BusinessAgentQualityMapper;
 import com.chinaitop.depot.agent.quality.mapper.BusinessAgentQualitySonMapper;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQuality;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityExample;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityInspection;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon;
+import com.chinaitop.depot.agent.quality.model.*;
 import com.chinaitop.depot.agent.quality.service.AgentQualityService;
 import com.chinaitop.utils.ParameterUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -1276,7 +1273,7 @@ public class AgentQualityServiceImpl implements AgentQualityService {
     }
 
     @Override
-    public BusinessAgentQualityInspection loadDataByTankId(Integer id) {
-        return businessAgentQualityInspectionMapper.selectByPrimaryKey(id);
+    public BusinessAgentQualityInspection loadDataByQualityId(BusinessAgentQualityInspectionExample example) {
+        return businessAgentQualityInspectionMapper.selectByExample(example).get(0);
     }
 }

src/main/java/com/chinaitop/utils/ParameterUtil.java

@@ -280,4 +280,14 @@ public class ParameterUtil {
         // 返回
         return sbf.toString();
     }
+
+    //判断字符串是否是数字
+    public static boolean isNumeric(String str){
+        for (int i = str.length();--i>=0;){
+            if (!Character.isDigit(str.charAt(i))){
+                return false;
+            }
+        }
+        return true;
+    }
 }