lvzhikai лет назад: 5
Родитель
Сommit
9ff11cf813

+ 8 - 7
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationProcessMapper.xml

@@ -48,7 +48,7 @@
48
     <result column="mbndwcts" property="mbndwcts" jdbcType="INTEGER" />
48
     <result column="mbndwcts" property="mbndwcts" jdbcType="INTEGER" />
49
     <result column="lswzjc" property="lswzjc" jdbcType="VARCHAR" />
49
     <result column="lswzjc" property="lswzjc" jdbcType="VARCHAR" />
50
     <result column="lqbwcqdbjcs" property="lqbwcqdbjcs" jdbcType="VARCHAR" />
50
     <result column="lqbwcqdbjcs" property="lqbwcqdbjcs" jdbcType="VARCHAR" />
51
-    <result column="mbsj" property="mbsj" jdbcType="INTEGER" />
51
+    <result column="mbsj" property="mbsj" jdbcType="DECIMAL" />
52
     <result column="ctz" property="ctz" jdbcType="DECIMAL" />
52
     <result column="ctz" property="ctz" jdbcType="DECIMAL" />
53
     <result column="sqqlhqnd" property="sqqlhqnd" jdbcType="DECIMAL" />
53
     <result column="sqqlhqnd" property="sqqlhqnd" jdbcType="DECIMAL" />
54
     <result column="sqpzr" property="sqpzr" jdbcType="VARCHAR" />
54
     <result column="sqpzr" property="sqpzr" jdbcType="VARCHAR" />
@@ -200,7 +200,7 @@
200
       #{updateTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{yqbjyaqjc,jdbcType=VARCHAR}, 
200
       #{updateTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{yqbjyaqjc,jdbcType=VARCHAR}, 
201
       #{byqcnlhqnd,jdbcType=DECIMAL}, #{mbnd,jdbcType=DECIMAL}, #{jsbyl,jdbcType=DECIMAL}, 
201
       #{byqcnlhqnd,jdbcType=DECIMAL}, #{mbnd,jdbcType=DECIMAL}, #{jsbyl,jdbcType=DECIMAL}, 
202
       #{byzypzr,jdbcType=VARCHAR}, #{fznd,jdbcType=DECIMAL}, #{mbndwcts,jdbcType=INTEGER}, 
202
       #{byzypzr,jdbcType=VARCHAR}, #{fznd,jdbcType=DECIMAL}, #{mbndwcts,jdbcType=INTEGER}, 
203
-      #{lswzjc,jdbcType=VARCHAR}, #{lqbwcqdbjcs,jdbcType=VARCHAR}, #{mbsj,jdbcType=INTEGER}, 
203
+      #{lswzjc,jdbcType=VARCHAR}, #{lqbwcqdbjcs,jdbcType=VARCHAR}, #{mbsj,jdbcType=DECIMAL},
204
       #{ctz,jdbcType=DECIMAL}, #{sqqlhqnd,jdbcType=DECIMAL}, #{sqpzr,jdbcType=VARCHAR}, 
204
       #{ctz,jdbcType=DECIMAL}, #{sqqlhqnd,jdbcType=DECIMAL}, #{sqpzr,jdbcType=VARCHAR}, 
205
       #{sqcsts,jdbcType=INTEGER}, #{sqjsslhqnd,jdbcType=DECIMAL}, #{deleteState,jdbcType=VARCHAR}, 
205
       #{sqcsts,jdbcType=INTEGER}, #{sqjsslhqnd,jdbcType=DECIMAL}, #{deleteState,jdbcType=VARCHAR}, 
206
       #{dataSource,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
206
       #{dataSource,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
@@ -514,7 +514,7 @@
514
         #{lqbwcqdbjcs,jdbcType=VARCHAR},
514
         #{lqbwcqdbjcs,jdbcType=VARCHAR},
515
       </if>
515
       </if>
516
       <if test="mbsj != null" >
516
       <if test="mbsj != null" >
517
-        #{mbsj,jdbcType=INTEGER},
517
+        #{mbsj,jdbcType=DECIMAL},
518
       </if>
518
       </if>
519
       <if test="ctz != null" >
519
       <if test="ctz != null" >
520
         #{ctz,jdbcType=DECIMAL},
520
         #{ctz,jdbcType=DECIMAL},
@@ -690,7 +690,7 @@
690
         lqbwcqdbjcs = #{record.lqbwcqdbjcs,jdbcType=VARCHAR},
690
         lqbwcqdbjcs = #{record.lqbwcqdbjcs,jdbcType=VARCHAR},
691
       </if>
691
       </if>
692
       <if test="record.mbsj != null" >
692
       <if test="record.mbsj != null" >
693
-        mbsj = #{record.mbsj,jdbcType=INTEGER},
693
+        mbsj = #{record.mbsj,jdbcType=DECIMAL},
694
       </if>
694
       </if>
695
       <if test="record.ctz != null" >
695
       <if test="record.ctz != null" >
696
         ctz = #{record.ctz,jdbcType=DECIMAL},
696
         ctz = #{record.ctz,jdbcType=DECIMAL},
@@ -769,7 +769,7 @@
769
       mbndwcts = #{record.mbndwcts,jdbcType=INTEGER},
769
       mbndwcts = #{record.mbndwcts,jdbcType=INTEGER},
770
       lswzjc = #{record.lswzjc,jdbcType=VARCHAR},
770
       lswzjc = #{record.lswzjc,jdbcType=VARCHAR},
771
       lqbwcqdbjcs = #{record.lqbwcqdbjcs,jdbcType=VARCHAR},
771
       lqbwcqdbjcs = #{record.lqbwcqdbjcs,jdbcType=VARCHAR},
772
-      mbsj = #{record.mbsj,jdbcType=INTEGER},
772
+      mbsj = #{record.mbsj,jdbcType=DECIMAL},
773
       ctz = #{record.ctz,jdbcType=DECIMAL},
773
       ctz = #{record.ctz,jdbcType=DECIMAL},
774
       sqqlhqnd = #{record.sqqlhqnd,jdbcType=DECIMAL},
774
       sqqlhqnd = #{record.sqqlhqnd,jdbcType=DECIMAL},
775
       sqpzr = #{record.sqpzr,jdbcType=VARCHAR},
775
       sqpzr = #{record.sqpzr,jdbcType=VARCHAR},
@@ -921,7 +921,7 @@
921
         lqbwcqdbjcs = #{lqbwcqdbjcs,jdbcType=VARCHAR},
921
         lqbwcqdbjcs = #{lqbwcqdbjcs,jdbcType=VARCHAR},
922
       </if>
922
       </if>
923
       <if test="mbsj != null" >
923
       <if test="mbsj != null" >
924
-        mbsj = #{mbsj,jdbcType=INTEGER},
924
+        mbsj = #{mbsj,jdbcType=DECIMAL},
925
       </if>
925
       </if>
926
       <if test="ctz != null" >
926
       <if test="ctz != null" >
927
         ctz = #{ctz,jdbcType=DECIMAL},
927
         ctz = #{ctz,jdbcType=DECIMAL},
@@ -997,7 +997,7 @@
997
       mbndwcts = #{mbndwcts,jdbcType=INTEGER},
997
       mbndwcts = #{mbndwcts,jdbcType=INTEGER},
998
       lswzjc = #{lswzjc,jdbcType=VARCHAR},
998
       lswzjc = #{lswzjc,jdbcType=VARCHAR},
999
       lqbwcqdbjcs = #{lqbwcqdbjcs,jdbcType=VARCHAR},
999
       lqbwcqdbjcs = #{lqbwcqdbjcs,jdbcType=VARCHAR},
1000
-      mbsj = #{mbsj,jdbcType=INTEGER},
1000
+      mbsj = #{mbsj,jdbcType=DECIMAL},
1001
       ctz = #{ctz,jdbcType=DECIMAL},
1001
       ctz = #{ctz,jdbcType=DECIMAL},
1002
       sqqlhqnd = #{sqqlhqnd,jdbcType=DECIMAL},
1002
       sqqlhqnd = #{sqqlhqnd,jdbcType=DECIMAL},
1003
       sqpzr = #{sqpzr,jdbcType=VARCHAR},
1003
       sqpzr = #{sqpzr,jdbcType=VARCHAR},
@@ -1018,6 +1018,7 @@
1018
     pes.drug_name drugName,
1018
     pes.drug_name drugName,
1019
     plan.fumigation_type fumigationType,
1019
     plan.fumigation_type fumigationType,
1020
     plan.creater,
1020
     plan.creater,
1021
+    plan.state,
1021
     pro.task_end_time taskEndTime
1022
     pro.task_end_time taskEndTime
1022
     FROM
1023
     FROM
1023
     t_fumigation_process pro
1024
     t_fumigation_process pro

+ 3 - 3
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/fumigation/model/TFumigationProcess.java

@@ -96,7 +96,7 @@ public class TFumigationProcess {
96
 
96
 
97
     private String lqbwcqdbjcs;
97
     private String lqbwcqdbjcs;
98
 
98
 
99
-    private Integer mbsj;
99
+    private BigDecimal mbsj;
100
 
100
 
101
     private BigDecimal ctz;
101
     private BigDecimal ctz;
102
 
102
 
@@ -854,7 +854,7 @@ public class TFumigationProcess {
854
      * 密闭时间
854
      * 密闭时间
855
      * @return mbsj 密闭时间
855
      * @return mbsj 密闭时间
856
      */
856
      */
857
-    public Integer getMbsj() {
857
+    public BigDecimal getMbsj() {
858
         return mbsj;
858
         return mbsj;
859
     }
859
     }
860
 
860
 
@@ -862,7 +862,7 @@ public class TFumigationProcess {
862
      * 密闭时间
862
      * 密闭时间
863
      * @param mbsj 密闭时间
863
      * @param mbsj 密闭时间
864
      */
864
      */
865
-    public void setMbsj(Integer mbsj) {
865
+    public void setMbsj(BigDecimal mbsj) {
866
         this.mbsj = mbsj;
866
         this.mbsj = mbsj;
867
     }
867
     }
868
 
868