日常检查

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

@@ -63,6 +63,9 @@ public class StorageDailyController {
             criteria.andWarehouseIdEqualTo(warehouseId);
         }
 
+        //查询FlagType为null的，要不然和粮情卡冲突
+        criteria.andFlagTypeIsNull();
+
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }

src/main/java/com/chinaitop/depot/storage/mapper/StorageDailycheckMapper.xml

@@ -16,6 +16,8 @@
     <result column="ratfinch_check" property="ratfinchCheck" jdbcType="VARCHAR" />
     <result column="other_check" property="otherCheck" jdbcType="VARCHAR" />
     <result column="find_question" property="findQuestion" jdbcType="VARCHAR" />
+    <result column="flag_type" property="flagType" jdbcType="INTEGER" />
+    <result column="dailycard_Id" property="dailycardId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -76,8 +78,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, house_id, warehouse_id, org_id, sub_type, check_time, checker, pests_position, pests_density,
-    pests_species, rain_check, ratfinch_check, other_check, find_question
+    id, house_id, warehouse_id, org_id, sub_type, check_time, checker, pests_position,
+    pests_density, pests_species, rain_check, ratfinch_check, other_check, find_question,
+    flag_type
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageDailycheckExample" >
     select
@@ -94,7 +97,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from storage_dailycheck
     where id = #{id,jdbcType=INTEGER}
@@ -110,21 +113,23 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageDailycheck" >
-    insert into storage_dailycheck (id, house_id, warehouse_id, org_id,
-      sub_type, check_time, checker, 
-      pests_position, pests_density, pests_species, 
-      rain_check, ratfinch_check, other_check, 
-      find_question)
-    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER},
-      #{subType,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checker,jdbcType=VARCHAR}, 
-      #{pestsPosition,jdbcType=VARCHAR}, #{pestsDensity,jdbcType=INTEGER}, #{pestsSpecies,jdbcType=INTEGER}, 
-      #{rainCheck,jdbcType=VARCHAR}, #{ratfinchCheck,jdbcType=VARCHAR}, #{otherCheck,jdbcType=VARCHAR}, 
-      #{findQuestion,jdbcType=VARCHAR})
+    insert into storage_dailycheck (id, house_id, warehouse_id,
+      org_id, sub_type, check_time,
+      checker, pests_position, pests_density,
+      pests_species, rain_check, ratfinch_check,
+      other_check, find_question, flag_type
+      )
+    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER},
+      #{orgId,jdbcType=INTEGER}, #{subType,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP},
+      #{checker,jdbcType=VARCHAR}, #{pestsPosition,jdbcType=VARCHAR}, #{pestsDensity,jdbcType=INTEGER},
+      #{pestsSpecies,jdbcType=INTEGER}, #{rainCheck,jdbcType=VARCHAR}, #{ratfinchCheck,jdbcType=VARCHAR},
+      #{otherCheck,jdbcType=VARCHAR}, #{findQuestion,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageDailycheck" >
     insert into storage_dailycheck
     <trim prefix="(" suffix=")" suffixOverrides="," >
-        id,
+      id,
       <if test="houseId != null" >
         house_id,
       </if>
@@ -164,6 +169,12 @@
       <if test="findQuestion != null" >
         find_question,
       </if>
+      <if test="flagType != null" >
+        flag_type,
+      </if>
+      <if test="dailycardId != null" >
+        dailycard_Id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_DAILYCHECK.nextVal,
@@ -206,6 +217,12 @@
       <if test="findQuestion != null" >
         #{findQuestion,jdbcType=VARCHAR},
       </if>
+      <if test="flagType != null" >
+        #{flagType,jdbcType=INTEGER},
+      </if>
+      <if test="dailycardId != null" >
+        #{dailycardId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageDailycheckExample" resultType="java.lang.Integer" >
@@ -259,6 +276,12 @@
       <if test="record.findQuestion != null" >
         find_question = #{record.findQuestion,jdbcType=VARCHAR},
       </if>
+      <if test="record.flagType != null" >
+        flag_type = #{record.flagType,jdbcType=INTEGER},
+      </if>
+      <if test="record.dailycardId != null" >
+        dailycard_Id = #{record.dailycardId,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -267,19 +290,20 @@
   <update id="updateByExample" parameterType="map" >
     update storage_dailycheck
     set id = #{record.id,jdbcType=INTEGER},
-      house_id = #{record.houseId,jdbcType=INTEGER},
-      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
-      org_id = #{record.orgId,jdbcType=INTEGER},
-      sub_type = #{record.subType,jdbcType=INTEGER},
-      check_time = #{record.checkTime,jdbcType=TIMESTAMP},
-      checker = #{record.checker,jdbcType=VARCHAR},
-      pests_position = #{record.pestsPosition,jdbcType=VARCHAR},
-      pests_density = #{record.pestsDensity,jdbcType=INTEGER},
-      pests_species = #{record.pestsSpecies,jdbcType=INTEGER},
-      rain_check = #{record.rainCheck,jdbcType=VARCHAR},
-      ratfinch_check = #{record.ratfinchCheck,jdbcType=VARCHAR},
-      other_check = #{record.otherCheck,jdbcType=VARCHAR},
-      find_question = #{record.findQuestion,jdbcType=VARCHAR}
+    house_id = #{record.houseId,jdbcType=INTEGER},
+    warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+    org_id = #{record.orgId,jdbcType=INTEGER},
+    sub_type = #{record.subType,jdbcType=INTEGER},
+    check_time = #{record.checkTime,jdbcType=TIMESTAMP},
+    checker = #{record.checker,jdbcType=VARCHAR},
+    pests_position = #{record.pestsPosition,jdbcType=VARCHAR},
+    pests_density = #{record.pestsDensity,jdbcType=INTEGER},
+    pests_species = #{record.pestsSpecies,jdbcType=INTEGER},
+    rain_check = #{record.rainCheck,jdbcType=VARCHAR},
+    ratfinch_check = #{record.ratfinchCheck,jdbcType=VARCHAR},
+    other_check = #{record.otherCheck,jdbcType=VARCHAR},
+    find_question = #{record.findQuestion,jdbcType=VARCHAR},
+    flag_type = #{record.flagType,jdbcType=INTEGER}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -326,6 +350,12 @@
       <if test="findQuestion != null" >
         find_question = #{findQuestion,jdbcType=VARCHAR},
       </if>
+      <if test="flagType != null" >
+        flag_type = #{flagType,jdbcType=INTEGER},
+      </if>
+      <if test="dailycardId != null" >
+        dailycard_Id = #{dailycardId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -343,7 +373,9 @@
       rain_check = #{rainCheck,jdbcType=VARCHAR},
       ratfinch_check = #{ratfinchCheck,jdbcType=VARCHAR},
       other_check = #{otherCheck,jdbcType=VARCHAR},
-      find_question = #{findQuestion,jdbcType=VARCHAR}
+      find_question = #{findQuestion,jdbcType=VARCHAR},
+      flag_type = #{flagType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
 </mapper>

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

@@ -88,6 +88,7 @@
     <result column="total_arsenic" jdbcType="VARCHAR" property="totalArsenic" />
     <result column="aflatoxin" jdbcType="VARCHAR" property="aflatoxin" />
     <result column="butyl_phenol" jdbcType="VARCHAR" property="butylPhenol" />
+    <result column="flag_type" jdbcType="INTEGER" property="flagType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -1570,7 +1571,7 @@
     sqk.pests, sqk.color_ratio, sqk.hard_index, sqk.gluten_water_count, sqk.remarks, approver, sqk.mildew_count,
     sqk.damage_ratio, sqk.hot_damage_ratio, sqk.husked_rice_weight, sqk.reviewer, sqk.apply_check_time, sqk.check_time_type,
     sqk.check_result_time, sqk.store_quality, sqk.is_pest, sqk.inspection_standard_basis, sqk.quality, sqk.seal_date,
-    sqk.seal_status, sqk.auth_code, sqk.org_id, sqk.history_status
+    sqk.seal_status, sqk.auth_code, sqk.org_id, sqk.history_status, sqk.flag_type
     <!--云南新增的字段，先注释掉方便调试-->
     /*, 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*/
@@ -1626,6 +1627,8 @@
       <if test="checkResult !=null">
         and sq.check_result = #{checkResult}
       </if>
+        <!--区分粮情卡的数据-->
+        and sq.flag_type is null
     </where>
     and sq.rn = 1
   </select>

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

@@ -9,6 +9,8 @@ public class StorageDailycheck {
 
     private Integer warehouseId;
 
+    private Integer orgId;
+
     private Integer subType;
 
     private Date checkTime;
@@ -29,19 +31,21 @@ public class StorageDailycheck {
 
     private String findQuestion;
 
-    private Integer orgId;
+    private Integer flagType;
+
+    private String dailycardId;
 
     /**
-     * 油罐id
-     * @return id 油罐id
+     * id
+     * @return id id
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * 油罐id
-     * @param id 油罐id
+     * id
+     * @param id id
      */
     public void setId(Integer id) {
         this.id = id;
@@ -80,6 +84,22 @@ public class StorageDailycheck {
     }
 
     /**
+     * 库级id
+     * @return org_id 库级id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 库级id
+     * @param orgId 库级id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
      * 品种
      * @return sub_type 品种
      */
@@ -239,11 +259,27 @@ public class StorageDailycheck {
         this.findQuestion = findQuestion == null ? null : findQuestion.trim();
     }
 
-    public Integer getOrgId() {
-        return orgId;
+    /**
+     * 保存:1,提交:2
+     * @return flag_type 保存:1,提交:2
+     */
+    public Integer getFlagType() {
+        return flagType;
     }
 
-    public void setOrgId(Integer orgId) {
-        this.orgId = orgId;
+    /**
+     * 保存:1,提交:2
+     * @param flagType 保存:1,提交:2
+     */
+    public void setFlagType(Integer flagType) {
+        this.flagType = flagType;
+    }
+
+    public String getDailycardId() {
+        return dailycardId;
+    }
+
+    public void setDailycardId(String dailycardId) {
+        this.dailycardId = dailycardId;
     }
 }

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

@@ -74,7 +74,7 @@ public class StorageDailycheckExample {
     }
 
     /**
-     * storage_dailycheck 2020-07-01
+     * storage_dailycheck 2020-07-17
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -237,123 +237,123 @@ public class StorageDailycheckExample {
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdIsNull() {
-            addCriterion("org_id is null");
+        public Criteria andWarehouseIdIsNull() {
+            addCriterion("warehouse_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdIsNotNull() {
-            addCriterion("org_id is not null");
+        public Criteria andWarehouseIdIsNotNull() {
+            addCriterion("warehouse_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdEqualTo(Integer value) {
-            addCriterion("org_id =", value, "orgId");
+        public Criteria andWarehouseIdEqualTo(Integer value) {
+            addCriterion("warehouse_id =", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdNotEqualTo(Integer value) {
-            addCriterion("org_id <>", value, "orgId");
+        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+            addCriterion("warehouse_id <>", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdGreaterThan(Integer value) {
-            addCriterion("org_id >", value, "orgId");
+        public Criteria andWarehouseIdGreaterThan(Integer value) {
+            addCriterion("warehouse_id >", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("org_id >=", value, "orgId");
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id >=", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdLessThan(Integer value) {
-            addCriterion("org_id <", value, "orgId");
+        public Criteria andWarehouseIdLessThan(Integer value) {
+            addCriterion("warehouse_id <", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
-            addCriterion("org_id <=", value, "orgId");
+        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id <=", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdIn(List<Integer> values) {
-            addCriterion("org_id in", values, "orgId");
+        public Criteria andWarehouseIdIn(List<Integer> values) {
+            addCriterion("warehouse_id in", values, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdNotIn(List<Integer> values) {
-            addCriterion("org_id not in", values, "orgId");
+        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+            addCriterion("warehouse_id not in", values, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
-            addCriterion("org_id between", value1, value2, "orgId");
+        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id between", value1, value2, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("org_id not between", value1, value2, "orgId");
+        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdIsNull() {
-            addCriterion("warehouse_id is null");
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdIsNotNull() {
-            addCriterion("warehouse_id is not null");
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdEqualTo(Integer value) {
-            addCriterion("warehouse_id =", value, "warehouseId");
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotEqualTo(Integer value) {
-            addCriterion("warehouse_id <>", value, "warehouseId");
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdGreaterThan(Integer value) {
-            addCriterion("warehouse_id >", value, "warehouseId");
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("warehouse_id >=", value, "warehouseId");
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdLessThan(Integer value) {
-            addCriterion("warehouse_id <", value, "warehouseId");
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
-            addCriterion("warehouse_id <=", value, "warehouseId");
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdIn(List<Integer> values) {
-            addCriterion("warehouse_id in", values, "warehouseId");
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotIn(List<Integer> values) {
-            addCriterion("warehouse_id not in", values, "warehouseId");
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
-            addCriterion("warehouse_id between", value1, value2, "warehouseId");
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
             return (Criteria) this;
         }
 
@@ -1016,6 +1016,66 @@ public class StorageDailycheckExample {
             addCriterion("find_question not between", value1, value2, "findQuestion");
             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;
+        }
     }
 
     /**
@@ -1029,7 +1089,7 @@ public class StorageDailycheckExample {
     }
 
     /**
-     * storage_dailycheck 2020-07-01
+     * storage_dailycheck 2020-07-17
      */
     public static class Criterion {
         private String condition;

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

@@ -189,6 +189,8 @@ public class StorageQualitycheck {
 
     private String chooserOrgan;
 
+    private Integer flagType;
+
     //封仓业务字段
     private String disperseCapacity;
     private BigDecimal height;
@@ -1682,4 +1684,12 @@ public class StorageQualitycheck {
     public void setChooserOrgan(String chooserOrgan) {
         this.chooserOrgan = chooserOrgan;
     }
+
+    public Integer getFlagType() {
+        return flagType;
+    }
+
+    public void setFlagType(Integer flagType) {
+        this.flagType = flagType;
+    }
 }