fanxw vor 11 Monaten
Ursprung
Commit
f12bda067b

+ 21 - 6
src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.xml

@@ -38,7 +38,7 @@
38 38
     <result column="jldw" property="jldw" jdbcType="VARCHAR" />
39 39
     <result column="spt_dataid" property="sptDataid" jdbcType="VARCHAR" />
40 40
     <result column="yghwdm" property="yghwdm" jdbcType="VARCHAR" />
41
-    
41
+    <result column="sjsynx" property="sjsynx" jdbcType="INTEGER" />
42 42
   </resultMap>
43 43
   <sql id="Example_Where_Clause" >
44 44
     <where >
@@ -103,7 +103,7 @@
103 103
     heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, 
104 104
     tank_status, library_type, org_id, del_flag, updatetime, bottom_area, design_height, 
105 105
     oil_height, insport_height, tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx, jsdw, sjdw, jldw,
106
-    spt_dataid
106
+    spt_dataid, sjsynx
107 107
   </sql>
108 108
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" >
109 109
     select
@@ -145,7 +145,7 @@
145 145
       del_flag, updatetime, bottom_area, 
146 146
       design_height, oil_height, insport_height, 
147 147
       tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx, jsdw, sjdw, jldw,
148
-      spt_dataid
148
+      spt_dataid, sjsynx
149 149
       )
150 150
     values (#{id,jdbcType=VARCHAR}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
151 151
       #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
@@ -157,7 +157,8 @@
157 157
       #{designHeight,jdbcType=DECIMAL}, #{oilHeight,jdbcType=DECIMAL}, #{insportHeight,jdbcType=DECIMAL}, 
158 158
       #{tankChart,jdbcType=VARCHAR}, #{tanklibChart,jdbcType=VARCHAR}, #{basicTruckType,jdbcType=VARCHAR},
159 159
       #{crkStatus,jdbcType=VARCHAR},#{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR}, #{lylx,jdbcType=VARCHAR},
160
-      #{jsdw,jdbcType=VARCHAR},#{sjdw,jdbcType=VARCHAR},#{jldw,jdbcType=VARCHAR},#{sptDataid,jdbcType=VARCHAR}
160
+      #{jsdw,jdbcType=VARCHAR},#{sjdw,jdbcType=VARCHAR},#{jldw,jdbcType=VARCHAR},#{sptDataid,jdbcType=VARCHAR},
161
+      #{sjsynx,jdbcType=INTEGER}
161 162
       )
162 163
   </insert>
163 164
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank" >
@@ -268,6 +269,9 @@
268 269
       <if test="sptDataid != null">
269 270
         spt_dataid,
270 271
       </if>
272
+      <if test="sjsynx != null">
273
+        sjsynx,
274
+      </if>
271 275
     </trim>
272 276
     <trim prefix="values (" suffix=")" suffixOverrides="," >
273 277
       <if test="id != null" >
@@ -375,6 +379,9 @@
375 379
       <if test="sptDataid != null">
376 380
         #{sptDataid,jdbcType=VARCHAR},
377 381
       </if>
382
+      <if test="sjsynx != null">
383
+        #{sjsynx,jdbcType=INTEGER},
384
+      </if>
378 385
     </trim>
379 386
   </insert>
380 387
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultType="java.lang.Integer" >
@@ -491,6 +498,9 @@
491 498
       <if test="record.sptDataid != null">
492 499
         spt_dataid = #{record.sptDataid,jdbcType=VARCHAR},
493 500
       </if>
501
+      <if test="record.sjsynx != null">
502
+        sjsynx = #{record.sjsynx,jdbcType=INTEGER},
503
+      </if>
494 504
     </set>
495 505
     <if test="_parameter != null" >
496 506
       <include refid="Update_By_Example_Where_Clause" />
@@ -532,7 +542,8 @@
532 542
       jsdw = #{record.jsdw,jdbcType=VARCHAR},
533 543
       sjdw = #{record.sjdw,jdbcType=VARCHAR},
534 544
       jldw = #{record.jldw,jdbcType=VARCHAR},
535
-      spt_dataid = #{record.sptDataid,jdbcType=VARCHAR}
545
+      spt_dataid = #{record.sptDataid,jdbcType=VARCHAR},
546
+      sjsynx = #{record.sjsynx,jdbcType=INTEGER}
536 547
     <if test="_parameter != null" >
537 548
       <include refid="Update_By_Example_Where_Clause" />
538 549
     </if>
@@ -642,6 +653,9 @@
642 653
       <if test="sptDataid != null">
643 654
         spt_dataid = #{sptDataid,jdbcType=VARCHAR},
644 655
       </if>
656
+      <if test="sjsynx != null">
657
+        sjsynx = #{sjsynx,jdbcType=INTEGER},
658
+      </if>
645 659
     </set>
646 660
     where id = #{id,jdbcType=VARCHAR}
647 661
   </update>
@@ -680,7 +694,8 @@
680 694
       jsdw = #{jsdw,jdbcType=VARCHAR},
681 695
       sjdw = #{sjdw,jdbcType=VARCHAR},
682 696
       jldw = #{jldw,jdbcType=VARCHAR},
683
-      spt_dataid = #{sptDataid,jdbcType=VARCHAR}
697
+      spt_dataid = #{sptDataid,jdbcType=VARCHAR},
698
+      sjsynx = #{sjsynx,jdbcType=INTEGER}
684 699
     where id = #{id,jdbcType=VARCHAR}
685 700
   </update>
686 701
 

+ 18 - 0
src/main/java/com/chinaitop/depot/basic/model/BasicTank.java

@@ -76,6 +76,8 @@ public class BasicTank {
76 76
     private String kqdm;
77 77
     //油罐货位欸标准编码
78 78
     private String yghwdm;
79
+    //设计使用年限
80
+    private Integer sjsynx;
79 81
 
80 82
     //业务字段:保管员名称
81 83
     private String keeperNames;
@@ -655,6 +657,22 @@ public class BasicTank {
655 657
 		this.yghwdm = yghwdm;
656 658
 	}
657 659
 
660
+	/**
661
+	 * 设计使用年限
662
+	 * @return
663
+	 */
664
+	public Integer getSjsynx() {
665
+		return sjsynx;
666
+	}
667
+
668
+	/**
669
+	 * 设计使用年限
670
+	 * @param jssynx
671
+	 */
672
+	public void setSjsynx(Integer sjsynx) {
673
+		this.sjsynx = sjsynx;
674
+	}
675
+
658 676
 	public String getKeeperNames() {
659 677
 		return keeperNames;
660 678
 	}

+ 6 - 0
src/main/java/com/chinaitop/depot/basic/service/impl/BasicTankServiceImpl.java

@@ -757,6 +757,12 @@ public class BasicTankServiceImpl implements BasicTankService {
757 757
 			tank.setJsdw(jsdw.trim());
758 758
 		}
759 759
 
760
+    	//建设使用年限
761
+    	String sjsynx = obj.getString("sjsynx");
762
+    	if (StringUtils.isNotBlank(sjsynx)) {
763
+			tank.setSjsynx(Integer.parseInt(jsdw.trim()));
764
+		}
765
+
760 766
     	//设计单位
761 767
     	String sjdw = obj.getString("sjdw");
762 768
     	if (StringUtils.isNotBlank(sjdw)) {