修改bug

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationAlterController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -120,31 +121,36 @@ public class FumigationAlterController {
             tFumigationPlan.setState(10);
             fumigationPlanService.updateByExample(tFumigationPlan, example);
 
-            //向市级提交数据--熏蒸计划
-            TFumigationPlan planData = fumigationPlanService.findById(tFumigationAfter.getFumigationId());
-            Map<String, Object> planMap = ParameterUtil.convertBean(planData);
-            //熏蒸善后
-            List<TFumigationAfter> afterData = fumigationAfterService.findByFumigationId(tFumigationAfter.getFumigationId());
-            Map<String, Object> afterMap = ParameterUtil.convertBean(afterData.get(0));
-            planMap.put("fumigationAfter",afterMap);
-            //熏蒸施药
-            TFumigationPesticideExample pesticideexample = new TFumigationPesticideExample();
-            TFumigationPesticideExample.Criteria pesticidecriteria = pesticideexample.createCriteria();
-            pesticidecriteria.andFumigationIdEqualTo(tFumigationAfter.getFumigationId());
-            List<TFumigationPesticide> pesticideData = pesticidePlanService.getFumigationPesticideList(pesticideexample);
-            Map<String, Object> pesticideMap = ParameterUtil.convertBean(pesticideData.get(0));
-            planMap.put("fumigationPesticide",pesticideMap);
-            //熏蒸过程
-            TFumigationProcessExample processExample = new TFumigationProcessExample();
-            TFumigationProcessExample.Criteria processcriteria = processExample.createCriteria();
-            processcriteria.andFumigationIdEqualTo(tFumigationAfter.getFumigationId());
-            List<TFumigationProcess> processData = fumigationProcessService.getDataByFumId(processExample);
-            Map<String, Object> processMap = ParameterUtil.convertBean(pesticideData.get(0));
-            planMap.put("fumigationProcess",processMap);
-
-            String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigationPlan";//市级接口
-            String strResult = HttpUtil.doPost(url, JSON.toJSONString(planMap));
-            modelMap.put("status", "success");
+            try {
+                //向市级提交数据--熏蒸计划
+                TFumigationPlan planData = fumigationPlanService.findById(tFumigationAfter.getFumigationId());
+                Map<String, Object> planMap = ParameterUtil.convertBean(planData);
+                //熏蒸善后
+                List<TFumigationAfter> afterData = fumigationAfterService.findByFumigationId(tFumigationAfter.getFumigationId());
+                Map<String, Object> afterMap = ParameterUtil.convertBean(afterData.get(0));
+                planMap.put("fumigationAfter",afterMap);
+                //熏蒸施药
+                TFumigationPesticideExample pesticideexample = new TFumigationPesticideExample();
+                TFumigationPesticideExample.Criteria pesticidecriteria = pesticideexample.createCriteria();
+                pesticidecriteria.andFumigationIdEqualTo(tFumigationAfter.getFumigationId());
+                List<TFumigationPesticide> pesticideData = pesticidePlanService.getFumigationPesticideList(pesticideexample);
+                Map<String, Object> pesticideMap = ParameterUtil.convertBean(pesticideData.get(0));
+                planMap.put("fumigationPesticide",pesticideMap);
+                //熏蒸过程
+                TFumigationProcessExample processExample = new TFumigationProcessExample();
+                TFumigationProcessExample.Criteria processcriteria = processExample.createCriteria();
+                processcriteria.andFumigationIdEqualTo(tFumigationAfter.getFumigationId());
+                List<TFumigationProcess> processData = fumigationProcessService.getDataByFumId(processExample);
+                Map<String, Object> processMap = ParameterUtil.convertBean(pesticideData.get(0));
+                planMap.put("fumigationProcess",processMap);
+
+                String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigationPlan";//市级接口
+                String strResult = HttpUtil.doPost(url, JSON.toJSONString(planMap));
+            }catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                modelMap.put("status", "success");
+            }
         } else {
             tFumigationAfter.setUpdateTime(new Date());//修改时间
             fumigationAfterService.update(tFumigationAfter);

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationForRecordController.java

@@ -84,8 +84,10 @@ public class FumigationForRecordController {
 
         list = fumigationFroRecordService.getFumigationFroRecordList(map);
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(list);
-        pageInfo.setStartRow(pageInfo.getStartRow()+1);
-        pageInfo.setEndRow(pageInfo.getEndRow()+1);
+        if(list.size() > 0){
+            pageInfo.setStartRow(pageInfo.getStartRow()+1);
+            pageInfo.setEndRow(pageInfo.getEndRow()+1);
+        }
         return pageInfo;
     }
 
@@ -138,6 +140,7 @@ public class FumigationForRecordController {
                 planIds+=maps.get("planids")+",";
             }
             planIds = planIds.substring(0,planIds.length()-1);
+            forRecordData.get(0).remove("planids");
             forRecordData.get(0).put("planIds",planIds);
             modelMap.put("forRecordData",ParameterUtil.slashCapitals(forRecordData));//熏蒸备案数据
 
@@ -235,6 +238,7 @@ public class FumigationForRecordController {
             TFumigationPlan tFumigationPlan = new TFumigationPlan();
             tFumigationPlan.setState(Integer.parseInt(stateType));
             tFumigationPlan.setGrainMoisture(fumMap.get("grainMoisture").toString());
+            tFumigationPlan.setStowWay(fumMap.get("stowWay").toString());
             tFumigationPlan.setForRecordId(uuid);
             fumigationPlanService.updateByExample(tFumigationPlan, example);
 

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationForrecordMapper.xml

@@ -8,7 +8,6 @@
     <result column="contact_phone" property="contactPhone" jdbcType="VARCHAR" />
     <result column="fumigation_start" property="fumigationStart" jdbcType="TIMESTAMP" />
     <result column="fumigation_end" property="fumigationEnd" jdbcType="TIMESTAMP" />
-    <result column="stow_way" property="stowWay" jdbcType="VARCHAR" />
     <result column="east" property="east" jdbcType="VARCHAR" />
     <result column="south" property="south" jdbcType="VARCHAR" />
     <result column="west" property="west" jdbcType="VARCHAR" />
@@ -83,10 +82,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, operation_supervisor, position, contact_phone, fumigation_start, fumigation_end,
-    stow_way, east, south, west, north, processing_instructions, enterprise_opinion,
-    organs_opinion, creater, create_time, out_person, out_forrecord_time, org_id, delete_state,
-    updatetime
+    id, operation_supervisor, position, contact_phone, fumigation_start, fumigation_end, 
+    east, south, west, north, processing_instructions, enterprise_opinion, organs_opinion, 
+    creater, create_time, out_person, out_forrecord_time, org_id, delete_state, updatetime
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationForrecordExample" >
     select
@@ -103,7 +101,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select
+    select 
     <include refid="Base_Column_List" />
     from t_fumigation_forrecord
     where id = #{id,jdbcType=VARCHAR}
@@ -119,22 +117,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.fumigation.model.TFumigationForrecord" >
-    insert into t_fumigation_forrecord (id, operation_supervisor, position,
-      contact_phone, fumigation_start, fumigation_end,
-      stow_way, east, south,
-      west, north, processing_instructions,
-      enterprise_opinion, organs_opinion, creater,
-      create_time, out_person, out_forrecord_time,
-      org_id, delete_state, updatetime
-      )
-    values (#{id,jdbcType=VARCHAR}, #{operationSupervisor,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
-      #{contactPhone,jdbcType=VARCHAR}, #{fumigationStart,jdbcType=TIMESTAMP}, #{fumigationEnd,jdbcType=TIMESTAMP},
-      #{stowWay,jdbcType=VARCHAR}, #{east,jdbcType=VARCHAR}, #{south,jdbcType=VARCHAR},
-      #{west,jdbcType=VARCHAR}, #{north,jdbcType=VARCHAR}, #{processingInstructions,jdbcType=VARCHAR},
-      #{enterpriseOpinion,jdbcType=VARCHAR}, #{organsOpinion,jdbcType=VARCHAR}, #{creater,jdbcType=INTEGER},
-      #{createTime,jdbcType=TIMESTAMP}, #{outPerson,jdbcType=VARCHAR}, #{outForrecordTime,jdbcType=TIMESTAMP},
-      #{orgId,jdbcType=INTEGER}, #{deleteState,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}
-      )
+    insert into t_fumigation_forrecord (id, operation_supervisor, position, 
+      contact_phone, fumigation_start, fumigation_end, 
+      east, south, west, 
+      north, processing_instructions, enterprise_opinion, 
+      organs_opinion, creater, create_time, 
+      out_person, out_forrecord_time, org_id, 
+      delete_state, updatetime)
+    values (#{id,jdbcType=VARCHAR}, #{operationSupervisor,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
+      #{contactPhone,jdbcType=VARCHAR}, #{fumigationStart,jdbcType=TIMESTAMP}, #{fumigationEnd,jdbcType=TIMESTAMP}, 
+      #{east,jdbcType=VARCHAR}, #{south,jdbcType=VARCHAR}, #{west,jdbcType=VARCHAR}, 
+      #{north,jdbcType=VARCHAR}, #{processingInstructions,jdbcType=VARCHAR}, #{enterpriseOpinion,jdbcType=VARCHAR}, 
+      #{organsOpinion,jdbcType=VARCHAR}, #{creater,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{outPerson,jdbcType=VARCHAR}, #{outForrecordTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, 
+      #{deleteState,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.fumigation.model.TFumigationForrecord" >
     insert into t_fumigation_forrecord
@@ -157,9 +153,6 @@
       <if test="fumigationEnd != null" >
         fumigation_end,
       </if>
-      <if test="stowWay != null" >
-        stow_way,
-      </if>
       <if test="east != null" >
         east,
       </if>
@@ -222,9 +215,6 @@
       <if test="fumigationEnd != null" >
         #{fumigationEnd,jdbcType=TIMESTAMP},
       </if>
-      <if test="stowWay != null" >
-        #{stowWay,jdbcType=VARCHAR},
-      </if>
       <if test="east != null" >
         #{east,jdbcType=VARCHAR},
       </if>
@@ -296,9 +286,6 @@
       <if test="record.fumigationEnd != null" >
         fumigation_end = #{record.fumigationEnd,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.stowWay != null" >
-        stow_way = #{record.stowWay,jdbcType=VARCHAR},
-      </if>
       <if test="record.east != null" >
         east = #{record.east,jdbcType=VARCHAR},
       </if>
@@ -354,7 +341,6 @@
       contact_phone = #{record.contactPhone,jdbcType=VARCHAR},
       fumigation_start = #{record.fumigationStart,jdbcType=TIMESTAMP},
       fumigation_end = #{record.fumigationEnd,jdbcType=TIMESTAMP},
-      stow_way = #{record.stowWay,jdbcType=VARCHAR},
       east = #{record.east,jdbcType=VARCHAR},
       south = #{record.south,jdbcType=VARCHAR},
       west = #{record.west,jdbcType=VARCHAR},
@@ -391,9 +377,6 @@
       <if test="fumigationEnd != null" >
         fumigation_end = #{fumigationEnd,jdbcType=TIMESTAMP},
       </if>
-      <if test="stowWay != null" >
-        stow_way = #{stowWay,jdbcType=VARCHAR},
-      </if>
       <if test="east != null" >
         east = #{east,jdbcType=VARCHAR},
       </if>
@@ -446,7 +429,6 @@
       contact_phone = #{contactPhone,jdbcType=VARCHAR},
       fumigation_start = #{fumigationStart,jdbcType=TIMESTAMP},
       fumigation_end = #{fumigationEnd,jdbcType=TIMESTAMP},
-      stow_way = #{stowWay,jdbcType=VARCHAR},
       east = #{east,jdbcType=VARCHAR},
       south = #{south,jdbcType=VARCHAR},
       west = #{west,jdbcType=VARCHAR},
@@ -705,6 +687,7 @@ WHERE
     plan.grain_kind grain_kind,
     plan.grain_count grain_count,
     plan.grain_moisture grain_moisture,
+    plan.stow_way stow_way,
     pesticide.major_insect_pests major_insect_pests,
     pesticide.insect_density insect_density,
     pesticide.drug_name drug_name,

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationPlanMapper.xml

@@ -11,6 +11,7 @@
     <result column="harvest_years" property="harvestYears" jdbcType="TIMESTAMP" />
     <result column="put_storage_years" property="putStorageYears" jdbcType="TIMESTAMP" />
     <result column="fumigation_num" property="fumigationNum" jdbcType="VARCHAR" />
+    <result column="stow_way" property="stowWay" jdbcType="VARCHAR" />
     <result column="one_methods" property="oneMethods" jdbcType="INTEGER" />
     <result column="one_dose" property="oneDose" jdbcType="VARCHAR" />
     <result column="one_date" property="oneDate" jdbcType="TIMESTAMP" />
@@ -119,14 +120,14 @@
   </sql>
   <sql id="Base_Column_List" >
     id, for_record_id, house_id, keeper, grain_kind, grain_count, harvest_years, put_storage_years, 
-    fumigation_num, one_methods, one_dose, one_date, two_methods, two_dose, two_date, 
-    three_methods, three_dose, three_date, four_methods, four_dose, four_date, deliquescence, 
-    bag_buried, test_tube, applying_pesticide, fixed_decorate, mobile_decorate, fixed, 
-    mobile, single_control, double_control, fumigation_type, fumigation_number, fumigation_command, 
-    fumigation_operation, fumiagtion_protective, fumiagtion_period_time, fumiagtion_chief, 
-    expected, points_work, note, state, creater, create_time, plan_formulation, reported, 
-    pesticide_qualification, qualification, approve_people, approve_department, approve_note, 
-    approve_time, grain_moisture, delete_state, org_id, updatetime
+    fumigation_num, stow_way, one_methods, one_dose, one_date, two_methods, two_dose, 
+    two_date, three_methods, three_dose, three_date, four_methods, four_dose, four_date, 
+    deliquescence, bag_buried, test_tube, applying_pesticide, fixed_decorate, mobile_decorate, 
+    fixed, mobile, single_control, double_control, fumigation_type, fumigation_number, 
+    fumigation_command, fumigation_operation, fumiagtion_protective, fumiagtion_period_time, 
+    fumiagtion_chief, expected, points_work, note, state, creater, create_time, plan_formulation, 
+    reported, pesticide_qualification, qualification, approve_people, approve_department, 
+    approve_note, approve_time, grain_moisture, delete_state, org_id, updatetime
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationPlanExample" >
     select
@@ -162,15 +163,15 @@
     insert into t_fumigation_plan (id, for_record_id, house_id, 
       keeper, grain_kind, grain_count, 
       harvest_years, put_storage_years, fumigation_num, 
-      one_methods, one_dose, one_date, 
-      two_methods, two_dose, two_date, 
-      three_methods, three_dose, three_date, 
-      four_methods, four_dose, four_date, 
-      deliquescence, bag_buried, test_tube, 
-      applying_pesticide, fixed_decorate, mobile_decorate, 
-      fixed, mobile, single_control, 
-      double_control, fumigation_type, fumigation_number, 
-      fumigation_command, fumigation_operation, 
+      stow_way, one_methods, one_dose, 
+      one_date, two_methods, two_dose, 
+      two_date, three_methods, three_dose, 
+      three_date, four_methods, four_dose, 
+      four_date, deliquescence, bag_buried, 
+      test_tube, applying_pesticide, fixed_decorate, 
+      mobile_decorate, fixed, mobile, 
+      single_control, double_control, fumigation_type, 
+      fumigation_number, fumigation_command, fumigation_operation, 
       fumiagtion_protective, fumiagtion_period_time, 
       fumiagtion_chief, expected, points_work, 
       note, state, creater, 
@@ -182,15 +183,15 @@
     values (#{id,jdbcType=VARCHAR}, #{forRecordId,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
       #{keeper,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainCount,jdbcType=DECIMAL}, 
       #{harvestYears,jdbcType=TIMESTAMP}, #{putStorageYears,jdbcType=TIMESTAMP}, #{fumigationNum,jdbcType=VARCHAR}, 
-      #{oneMethods,jdbcType=INTEGER}, #{oneDose,jdbcType=VARCHAR}, #{oneDate,jdbcType=TIMESTAMP}, 
-      #{twoMethods,jdbcType=INTEGER}, #{twoDose,jdbcType=VARCHAR}, #{twoDate,jdbcType=TIMESTAMP}, 
-      #{threeMethods,jdbcType=INTEGER}, #{threeDose,jdbcType=VARCHAR}, #{threeDate,jdbcType=TIMESTAMP}, 
-      #{fourMethods,jdbcType=INTEGER}, #{fourDose,jdbcType=VARCHAR}, #{fourDate,jdbcType=TIMESTAMP}, 
-      #{deliquescence,jdbcType=VARCHAR}, #{bagBuried,jdbcType=VARCHAR}, #{testTube,jdbcType=VARCHAR}, 
-      #{applyingPesticide,jdbcType=VARCHAR}, #{fixedDecorate,jdbcType=VARCHAR}, #{mobileDecorate,jdbcType=VARCHAR}, 
-      #{fixed,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{singleControl,jdbcType=VARCHAR}, 
-      #{doubleControl,jdbcType=VARCHAR}, #{fumigationType,jdbcType=INTEGER}, #{fumigationNumber,jdbcType=INTEGER}, 
-      #{fumigationCommand,jdbcType=VARCHAR}, #{fumigationOperation,jdbcType=VARCHAR}, 
+      #{stowWay,jdbcType=VARCHAR}, #{oneMethods,jdbcType=INTEGER}, #{oneDose,jdbcType=VARCHAR}, 
+      #{oneDate,jdbcType=TIMESTAMP}, #{twoMethods,jdbcType=INTEGER}, #{twoDose,jdbcType=VARCHAR}, 
+      #{twoDate,jdbcType=TIMESTAMP}, #{threeMethods,jdbcType=INTEGER}, #{threeDose,jdbcType=VARCHAR}, 
+      #{threeDate,jdbcType=TIMESTAMP}, #{fourMethods,jdbcType=INTEGER}, #{fourDose,jdbcType=VARCHAR}, 
+      #{fourDate,jdbcType=TIMESTAMP}, #{deliquescence,jdbcType=VARCHAR}, #{bagBuried,jdbcType=VARCHAR}, 
+      #{testTube,jdbcType=VARCHAR}, #{applyingPesticide,jdbcType=VARCHAR}, #{fixedDecorate,jdbcType=VARCHAR}, 
+      #{mobileDecorate,jdbcType=VARCHAR}, #{fixed,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, 
+      #{singleControl,jdbcType=VARCHAR}, #{doubleControl,jdbcType=VARCHAR}, #{fumigationType,jdbcType=INTEGER}, 
+      #{fumigationNumber,jdbcType=INTEGER}, #{fumigationCommand,jdbcType=VARCHAR}, #{fumigationOperation,jdbcType=VARCHAR}, 
       #{fumiagtionProtective,jdbcType=VARCHAR}, #{fumiagtionPeriodTime,jdbcType=VARCHAR}, 
       #{fumiagtionChief,jdbcType=VARCHAR}, #{expected,jdbcType=VARCHAR}, #{pointsWork,jdbcType=VARCHAR}, 
       #{note,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
@@ -230,6 +231,9 @@
       <if test="fumigationNum != null" >
         fumigation_num,
       </if>
+      <if test="stowWay != null" >
+        stow_way,
+      </if>
       <if test="oneMethods != null" >
         one_methods,
       </if>
@@ -400,6 +404,9 @@
       <if test="fumigationNum != null" >
         #{fumigationNum,jdbcType=VARCHAR},
       </if>
+      <if test="stowWay != null" >
+        #{stowWay,jdbcType=VARCHAR},
+      </if>
       <if test="oneMethods != null" >
         #{oneMethods,jdbcType=INTEGER},
       </if>
@@ -579,6 +586,9 @@
       <if test="record.fumigationNum != null" >
         fumigation_num = #{record.fumigationNum,jdbcType=VARCHAR},
       </if>
+      <if test="record.stowWay != null" >
+        stow_way = #{record.stowWay,jdbcType=VARCHAR},
+      </if>
       <if test="record.oneMethods != null" >
         one_methods = #{record.oneMethods,jdbcType=INTEGER},
       </if>
@@ -736,6 +746,7 @@
       harvest_years = #{record.harvestYears,jdbcType=TIMESTAMP},
       put_storage_years = #{record.putStorageYears,jdbcType=TIMESTAMP},
       fumigation_num = #{record.fumigationNum,jdbcType=VARCHAR},
+      stow_way = #{record.stowWay,jdbcType=VARCHAR},
       one_methods = #{record.oneMethods,jdbcType=INTEGER},
       one_dose = #{record.oneDose,jdbcType=VARCHAR},
       one_date = #{record.oneDate,jdbcType=TIMESTAMP},
@@ -814,6 +825,9 @@
       <if test="fumigationNum != null" >
         fumigation_num = #{fumigationNum,jdbcType=VARCHAR},
       </if>
+      <if test="stowWay != null" >
+        stow_way = #{stowWay,jdbcType=VARCHAR},
+      </if>
       <if test="oneMethods != null" >
         one_methods = #{oneMethods,jdbcType=INTEGER},
       </if>
@@ -968,6 +982,7 @@
       harvest_years = #{harvestYears,jdbcType=TIMESTAMP},
       put_storage_years = #{putStorageYears,jdbcType=TIMESTAMP},
       fumigation_num = #{fumigationNum,jdbcType=VARCHAR},
+      stow_way = #{stowWay,jdbcType=VARCHAR},
       one_methods = #{oneMethods,jdbcType=INTEGER},
       one_dose = #{oneDose,jdbcType=VARCHAR},
       one_date = #{oneDate,jdbcType=TIMESTAMP},
@@ -1132,6 +1147,7 @@
     WHERE plan.org_id = #{orgId,jdbcType=INTEGER}
     AND plan.state != 1
     AND approval.operator = #{userId}
+    AND approval.operator_name is not null
     <if test="houseId != null" >
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
     </if>

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationForrecord.java

@@ -15,8 +15,6 @@ public class TFumigationForrecord {
 
     private Date fumigationEnd;
 
-    private String stowWay;
-
     private String east;
 
     private String south;
@@ -142,22 +140,6 @@ public class TFumigationForrecord {
     }
 
     /**
-     * 堆装方式
-     * @return stow_way 堆装方式
-     */
-    public String getStowWay() {
-        return stowWay;
-    }
-
-    /**
-     * 堆装方式
-     * @param stowWay 堆装方式
-     */
-    public void setStowWay(String stowWay) {
-        this.stowWay = stowWay == null ? null : stowWay.trim();
-    }
-
-    /**
      * 东
      * @return east 东
      */

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationForrecordExample.java

@@ -74,7 +74,7 @@ public class TFumigationForrecordExample {
     }
 
     /**
-     * t_fumigation_forrecord 2020-07-06
+     * t_fumigation_forrecord 2020-08-11
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -517,76 +517,6 @@ public class TFumigationForrecordExample {
             return (Criteria) this;
         }
 
-        public Criteria andStowWayIsNull() {
-            addCriterion("stow_way is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayIsNotNull() {
-            addCriterion("stow_way is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayEqualTo(String value) {
-            addCriterion("stow_way =", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayNotEqualTo(String value) {
-            addCriterion("stow_way <>", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayGreaterThan(String value) {
-            addCriterion("stow_way >", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayGreaterThanOrEqualTo(String value) {
-            addCriterion("stow_way >=", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayLessThan(String value) {
-            addCriterion("stow_way <", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayLessThanOrEqualTo(String value) {
-            addCriterion("stow_way <=", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayLike(String value) {
-            addCriterion("stow_way like", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayNotLike(String value) {
-            addCriterion("stow_way not like", value, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayIn(List<String> values) {
-            addCriterion("stow_way in", values, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayNotIn(List<String> values) {
-            addCriterion("stow_way not in", values, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayBetween(String value1, String value2) {
-            addCriterion("stow_way between", value1, value2, "stowWay");
-            return (Criteria) this;
-        }
-
-        public Criteria andStowWayNotBetween(String value1, String value2) {
-            addCriterion("stow_way not between", value1, value2, "stowWay");
-            return (Criteria) this;
-        }
-
         public Criteria andEastIsNull() {
             addCriterion("east is null");
             return (Criteria) this;
@@ -1529,7 +1459,7 @@ public class TFumigationForrecordExample {
     }
 
     /**
-     * t_fumigation_forrecord 2020-07-06
+     * t_fumigation_forrecord 2020-08-11
      */
     public static class Criterion {
         private String condition;

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationPlan.java

@@ -22,6 +22,8 @@ public class TFumigationPlan {
 
     private String fumigationNum;
 
+    private String stowWay;
+
     private Integer oneMethods;
 
     private String oneDose;
@@ -261,6 +263,22 @@ public class TFumigationPlan {
     }
 
     /**
+     * 堆装方式
+     * @return stow_way 堆装方式
+     */
+    public String getStowWay() {
+        return stowWay;
+    }
+
+    /**
+     * 堆装方式
+     * @param stowWay 堆装方式
+     */
+    public void setStowWay(String stowWay) {
+        this.stowWay = stowWay == null ? null : stowWay.trim();
+    }
+
+    /**
      * 第一次熏蒸方法
      * @return one_methods 第一次熏蒸方法
      */

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationPlanExample.java

@@ -75,7 +75,7 @@ public class TFumigationPlanExample {
     }
 
     /**
-     * t_fumigation_plan 2020-08-05
+     * t_fumigation_plan 2020-08-11
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -688,6 +688,76 @@ public class TFumigationPlanExample {
             return (Criteria) this;
         }
 
+        public Criteria andStowWayIsNull() {
+            addCriterion("stow_way is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayIsNotNull() {
+            addCriterion("stow_way is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayEqualTo(String value) {
+            addCriterion("stow_way =", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayNotEqualTo(String value) {
+            addCriterion("stow_way <>", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayGreaterThan(String value) {
+            addCriterion("stow_way >", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayGreaterThanOrEqualTo(String value) {
+            addCriterion("stow_way >=", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayLessThan(String value) {
+            addCriterion("stow_way <", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayLessThanOrEqualTo(String value) {
+            addCriterion("stow_way <=", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayLike(String value) {
+            addCriterion("stow_way like", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayNotLike(String value) {
+            addCriterion("stow_way not like", value, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayIn(List<String> values) {
+            addCriterion("stow_way in", values, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayNotIn(List<String> values) {
+            addCriterion("stow_way not in", values, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayBetween(String value1, String value2) {
+            addCriterion("stow_way between", value1, value2, "stowWay");
+            return (Criteria) this;
+        }
+
+        public Criteria andStowWayNotBetween(String value1, String value2) {
+            addCriterion("stow_way not between", value1, value2, "stowWay");
+            return (Criteria) this;
+        }
+
         public Criteria andOneMethodsIsNull() {
             addCriterion("one_methods is null");
             return (Criteria) this;
@@ -3850,7 +3920,7 @@ public class TFumigationPlanExample {
     }
 
     /**
-     * t_fumigation_plan 2020-08-05
+     * t_fumigation_plan 2020-08-11
      */
     public static class Criterion {
         private String condition;