更新bug

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
 import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.*;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.lang.reflect.Parameter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -55,10 +57,11 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "qualitycheck", value = "实体类", paramType = "query"),
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
-            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query")
+            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "depotType", value = "判断是否是代储", paramType = "query"),
     })
-    public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize,
-                                                  StorageQualitycheck qualitycheck, String checktype,String checkResult) {
+    public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize, StorageQualitycheck qualitycheck,
+                                                  String checktype,String checkResult,String depotType) {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
 
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
@@ -100,6 +103,12 @@ public class StorageQualitycheckController {
         if (StringUtils.isNotBlank(checkResult)) {
             qualityCheck.setCheckResult(checkResult);
         }
+
+        //如果是1则说明是代储点的，则另外查询
+        if(ParameterUtil.isequal("1",depotType)){
+            qualityCheck.setDepotId(Integer.parseInt(depotType));
+        }
+
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
         //qualityCheck.setSealStatus("0");

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.java

@@ -2,13 +2,11 @@ package com.chinaitop.depot.storage.mapper;
 
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
 import java.util.List;
 import java.util.Map;
 
-@Repository
+import org.apache.ibatis.annotations.Param;
+
 public interface StorageQualitycheckMapper {
     int countByExample(StorageQualitycheckExample example);
 
@@ -24,7 +22,6 @@ public interface StorageQualitycheckMapper {
 
     StorageQualitycheck selectByPrimaryKey(Integer id);
 
-
     int updateByExampleSelective(@Param("record") StorageQualitycheck record, @Param("example") StorageQualitycheckExample example);
 
     int updateByExample(@Param("record") StorageQualitycheck record, @Param("example") StorageQualitycheckExample example);
@@ -32,7 +29,6 @@ public interface StorageQualitycheckMapper {
     int updateByPrimaryKeySelective(StorageQualitycheck record);
 
     int updateByPrimaryKey(StorageQualitycheck record);
-
     /**
      * @param qualitycheck
      * @return
@@ -51,9 +47,8 @@ public interface StorageQualitycheckMapper {
     List<StorageQualitycheck> queryByExample(StorageQualitycheck example);
     List<Map<String,Object>> getStoreQualityList(Integer orgId);
 
-    
     List<Map<String,Object>> getTrdStoreQualityList();
-	List<StorageQualitycheck> getDataByZJId(Map<String, Object> paramMap);
+    List<StorageQualitycheck> getDataByZJId(Map<String, Object> paramMap);
 
     List<StorageQualitycheck> queryByExampleData(StorageQualitycheck example);
 

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -8,6 +8,8 @@ import java.util.List;
 public class StorageQualitycheck {
     private Integer id;
 
+    private Integer depotId;
+
     private Integer houseId;
 
     private Integer warehouseId;
@@ -86,6 +88,8 @@ public class StorageQualitycheck {
 
     private String chooser;
 
+    private String chooseOrgan;
+
     private Date chooseTime;
 
     private String boldfatIndex;
@@ -174,6 +178,8 @@ public class StorageQualitycheck {
 
     private String aflatoxin;
 
+    private String quailtycardId;
+
     private String butylPhenol;
 
     private String storehouseName;
@@ -217,7 +223,7 @@ public class StorageQualitycheck {
     public void setWareHouseName(String wareHouseName) {
         this.wareHouseName = wareHouseName;
     }
-    
+
     public String getOrgName() {
 		return orgName;
 	}
@@ -259,6 +265,22 @@ public class StorageQualitycheck {
     }
 
     /**
+     * 代储点用到的代储库id，没有值则不是代储库
+     * @return depot_id 代储点用到的代储库id，没有值则不是代储库
+     */
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    /**
+     * 代储点用到的代储库id，没有值则不是代储库
+     * @param depotId 代储点用到的代储库id，没有值则不是代储库
+     */
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    /**
      * 仓房的id
      * @return house_id 仓房的id
      */
@@ -883,6 +905,22 @@ public class StorageQualitycheck {
     }
 
     /**
+     * 扦样机构
+     * @return choose_organ 扦样机构
+     */
+    public String getChooseOrgan() {
+        return chooseOrgan;
+    }
+
+    /**
+     * 扦样机构
+     * @param chooseOrgan 扦样机构
+     */
+    public void setChooseOrgan(String chooseOrgan) {
+        this.chooseOrgan = chooseOrgan == null ? null : chooseOrgan.trim();
+    }
+
+    /**
      * 扦样日期
      * @return choose_time 扦样日期
      */
@@ -1587,6 +1625,22 @@ public class StorageQualitycheck {
     }
 
     /**
+     * 粮情卡id
+     * @return quailtycard_id 粮情卡id
+     */
+    public String getQuailtycardId() {
+        return quailtycardId;
+    }
+
+    /**
+     * 粮情卡id
+     * @param quailtycardId 粮情卡id
+     */
+    public void setQuailtycardId(String quailtycardId) {
+        this.quailtycardId = quailtycardId == null ? null : quailtycardId.trim();
+    }
+
+    /**
      * 特丁基对二苯酚(g/kg)
      * @return butyl_phenol 特丁基对二苯酚(g/kg)
      */
@@ -1689,6 +1743,10 @@ public class StorageQualitycheck {
         return flagType;
     }
 
+    /**
+     * 保存:1,提交:2
+     * @param flagType 保存:1,提交:2
+     */
     public void setFlagType(Integer flagType) {
         this.flagType = flagType;
     }

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheckExample.java

@@ -74,7 +74,7 @@ public class StorageQualitycheckExample {
     }
 
     /**
-     * storage_qualitycheck 2018-08-10
+     * storage_qualitycheck 2020-07-29
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -177,6 +177,66 @@ public class StorageQualitycheckExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepotIdIsNull() {
+            addCriterion("depot_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIsNotNull() {
+            addCriterion("depot_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdEqualTo(Integer value) {
+            addCriterion("depot_id =", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotEqualTo(Integer value) {
+            addCriterion("depot_id <>", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThan(Integer value) {
+            addCriterion("depot_id >", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("depot_id >=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThan(Integer value) {
+            addCriterion("depot_id <", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThanOrEqualTo(Integer value) {
+            addCriterion("depot_id <=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIn(List<Integer> values) {
+            addCriterion("depot_id in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotIn(List<Integer> values) {
+            addCriterion("depot_id not in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdBetween(Integer value1, Integer value2) {
+            addCriterion("depot_id between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("depot_id not between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
         public Criteria andHouseIdIsNull() {
             addCriterion("house_id is null");
             return (Criteria) this;
@@ -2777,6 +2837,76 @@ public class StorageQualitycheckExample {
             return (Criteria) this;
         }
 
+        public Criteria andChooseOrganIsNull() {
+            addCriterion("choose_organ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganIsNotNull() {
+            addCriterion("choose_organ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganEqualTo(String value) {
+            addCriterion("choose_organ =", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganNotEqualTo(String value) {
+            addCriterion("choose_organ <>", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganGreaterThan(String value) {
+            addCriterion("choose_organ >", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganGreaterThanOrEqualTo(String value) {
+            addCriterion("choose_organ >=", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganLessThan(String value) {
+            addCriterion("choose_organ <", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganLessThanOrEqualTo(String value) {
+            addCriterion("choose_organ <=", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganLike(String value) {
+            addCriterion("choose_organ like", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganNotLike(String value) {
+            addCriterion("choose_organ not like", value, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganIn(List<String> values) {
+            addCriterion("choose_organ in", values, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganNotIn(List<String> values) {
+            addCriterion("choose_organ not in", values, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganBetween(String value1, String value2) {
+            addCriterion("choose_organ between", value1, value2, "chooseOrgan");
+            return (Criteria) this;
+        }
+
+        public Criteria andChooseOrganNotBetween(String value1, String value2) {
+            addCriterion("choose_organ not between", value1, value2, "chooseOrgan");
+            return (Criteria) this;
+        }
+
         public Criteria andChooseTimeIsNull() {
             addCriterion("choose_time is null");
             return (Criteria) this;
@@ -5797,6 +5927,76 @@ public class StorageQualitycheckExample {
             return (Criteria) this;
         }
 
+        public Criteria andQuailtycardIdIsNull() {
+            addCriterion("quailtycard_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdIsNotNull() {
+            addCriterion("quailtycard_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdEqualTo(String value) {
+            addCriterion("quailtycard_id =", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdNotEqualTo(String value) {
+            addCriterion("quailtycard_id <>", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdGreaterThan(String value) {
+            addCriterion("quailtycard_id >", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdGreaterThanOrEqualTo(String value) {
+            addCriterion("quailtycard_id >=", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdLessThan(String value) {
+            addCriterion("quailtycard_id <", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdLessThanOrEqualTo(String value) {
+            addCriterion("quailtycard_id <=", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdLike(String value) {
+            addCriterion("quailtycard_id like", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdNotLike(String value) {
+            addCriterion("quailtycard_id not like", value, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdIn(List<String> values) {
+            addCriterion("quailtycard_id in", values, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdNotIn(List<String> values) {
+            addCriterion("quailtycard_id not in", values, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdBetween(String value1, String value2) {
+            addCriterion("quailtycard_id between", value1, value2, "quailtycardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuailtycardIdNotBetween(String value1, String value2) {
+            addCriterion("quailtycard_id not between", value1, value2, "quailtycardId");
+            return (Criteria) this;
+        }
+
         public Criteria andButylPhenolIsNull() {
             addCriterion("butyl_phenol is null");
             return (Criteria) this;
@@ -5866,6 +6066,126 @@ public class StorageQualitycheckExample {
             addCriterion("butyl_phenol not between", value1, value2, "butylPhenol");
             return (Criteria) this;
         }
+
+        public Criteria andFlagTypeIsNull() {
+            addCriterion("flag_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeIsNotNull() {
+            addCriterion("flag_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeEqualTo(Integer value) {
+            addCriterion("flag_type =", value, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeNotEqualTo(Integer value) {
+            addCriterion("flag_type <>", value, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeGreaterThan(Integer value) {
+            addCriterion("flag_type >", value, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("flag_type >=", value, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeLessThan(Integer value) {
+            addCriterion("flag_type <", value, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("flag_type <=", value, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeIn(List<Integer> values) {
+            addCriterion("flag_type in", values, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeNotIn(List<Integer> values) {
+            addCriterion("flag_type not in", values, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeBetween(Integer value1, Integer value2) {
+            addCriterion("flag_type between", value1, value2, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("flag_type not between", value1, value2, "flagType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -5879,7 +6199,7 @@ public class StorageQualitycheckExample {
     }
 
     /**
-     * storage_qualitycheck 2018-08-10
+     * storage_qualitycheck 2020-07-29
      */
     public static class Criterion {
         private String condition;