gaodd 5 months ago
parent
commit
bff83f1d97

+ 51 - 5
src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.xml

@@ -40,6 +40,10 @@
40 40
     
41 41
     <result column="tyygbm" property="tyygbm" jdbcType="VARCHAR" />
42 42
     
43
+    <result column="design_life" property="designLife" jdbcType="DECIMAL" />
44
+    <result column="start_date" property="startDate" jdbcType="TIMESTAMP" />
45
+    <result column="keeper" property="keeper" jdbcType="VARCHAR" />
46
+    
43 47
     
44 48
   </resultMap>
45 49
   <sql id="Example_Where_Clause" >
@@ -105,7 +109,7 @@
105 109
     heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, 
106 110
     tank_status, library_type, org_id, del_flag, updatetime, bottom_area, design_height, 
107 111
     oil_height, insport_height, tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx, jsdw, sjdw, jldw,
108
-    spt_dataid,tyygbm
112
+    spt_dataid,tyygbm,design_life,start_date,keeper
109 113
   </sql>
110 114
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" >
111 115
     select
@@ -147,7 +151,7 @@
147 151
       del_flag, updatetime, bottom_area, 
148 152
       design_height, oil_height, insport_height, 
149 153
       tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx, jsdw, sjdw, jldw,
150
-      spt_dataid,tyygbm
154
+      spt_dataid,tyygbm,design_life,start_date,keeper
151 155
       )
152 156
     values (#{id,jdbcType=VARCHAR}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
153 157
       #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
@@ -160,7 +164,7 @@
160 164
       #{tankChart,jdbcType=VARCHAR}, #{tanklibChart,jdbcType=VARCHAR}, #{basicTruckType,jdbcType=VARCHAR},
161 165
       #{crkStatus,jdbcType=VARCHAR},#{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR}, #{lylx,jdbcType=VARCHAR},
162 166
       #{jsdw,jdbcType=VARCHAR},#{sjdw,jdbcType=VARCHAR},#{jldw,jdbcType=VARCHAR},#{sptDataid,jdbcType=VARCHAR},
163
-      #{tyygbm,jdbcType=VARCHAR}
167
+      #{tyygbm,jdbcType=VARCHAR},#{designLife,jdbcType=DECIMAL},#{startDate,jdbcType=TIMESTAMP},#{keeper,jdbcType=VARCHAR}
164 168
       )
165 169
   </insert>
166 170
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank" >
@@ -274,6 +278,15 @@
274 278
       <if test="tyygbm != null">
275 279
         tyygbm,
276 280
       </if>
281
+      <if test="designLife != null">
282
+        design_life,
283
+      </if>
284
+      <if test="startDate != null">
285
+        start_date,
286
+      </if>
287
+      <if test="keeper != null">
288
+        keeper,
289
+      </if>
277 290
     </trim>
278 291
     <trim prefix="values (" suffix=")" suffixOverrides="," >
279 292
       <if test="id != null" >
@@ -384,6 +397,15 @@
384 397
       <if test="tyygbm != null">
385 398
         #{tyygbm,jdbcType=VARCHAR},
386 399
       </if>
400
+      <if test="designLife != null">
401
+        #{designLife,jdbcType=DECIMAL},
402
+      </if>
403
+      <if test="startDate != null">
404
+        #{startDate,jdbcType=TIMESTAMP},
405
+      </if>
406
+      <if test="keeper != null">
407
+        #{keeper,jdbcType=VARCHAR},
408
+      </if>
387 409
     </trim>
388 410
   </insert>
389 411
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultType="java.lang.Integer" >
@@ -503,6 +525,15 @@
503 525
       <if test="record.tyygbm != null">
504 526
         tyygbm = #{record.tyygbm,jdbcType=VARCHAR},
505 527
       </if>
528
+      <if test="record.designLife != null">
529
+        design_life = #{record.designLife,jdbcType=DECIMAL},
530
+      </if>
531
+      <if test="record.startDate != null">
532
+        start_date = #{record.startDate,jdbcType=TIMESTAMP},
533
+      </if>
534
+      <if test="record.keeper != null">
535
+        keeper = #{record.keeper,jdbcType=VARCHAR},
536
+      </if>
506 537
     </set>
507 538
     <if test="_parameter != null" >
508 539
       <include refid="Update_By_Example_Where_Clause" />
@@ -545,7 +576,10 @@
545 576
       sjdw = #{record.sjdw,jdbcType=VARCHAR},
546 577
       jldw = #{record.jldw,jdbcType=VARCHAR},
547 578
       spt_dataid = #{record.sptDataid,jdbcType=VARCHAR},
548
-      tyygbm = #{record.tyygbm,jdbcType=VARCHAR}
579
+      tyygbm = #{record.tyygbm,jdbcType=VARCHAR},
580
+      design_life = #{designLife,jdbcType=DECIMAL},
581
+      start_date = #{startDate,jdbcType=TIMESTAMP},
582
+      keeper = #{record.keeper,jdbcType=VARCHAR}
549 583
     <if test="_parameter != null" >
550 584
       <include refid="Update_By_Example_Where_Clause" />
551 585
     </if>
@@ -658,6 +692,15 @@
658 692
       <if test="tyygbm != null">
659 693
         tyygbm = #{tyygbm,jdbcType=VARCHAR},
660 694
       </if>
695
+      <if test="designLife != null">
696
+        design_life = #{designLife,jdbcType=DECIMAL},
697
+      </if>
698
+      <if test="startDate != null">
699
+        start_date = #{startDate,jdbcType=TIMESTAMP},
700
+      </if>
701
+      <if test="keeper != null">
702
+        keeper = #{keeper,jdbcType=VARCHAR},
703
+      </if>
661 704
     </set>
662 705
     where id = #{id,jdbcType=VARCHAR}
663 706
   </update>
@@ -697,7 +740,10 @@
697 740
       sjdw = #{sjdw,jdbcType=VARCHAR},
698 741
       jldw = #{jldw,jdbcType=VARCHAR},
699 742
       spt_dataid = #{sptDataid,jdbcType=VARCHAR},
700
-      tyygbm = #{tyygbm,jdbcType=VARCHAR}
743
+      tyygbm = #{tyygbm,jdbcType=VARCHAR},
744
+      design_life = #{designLife,jdbcType=DECIMAL},
745
+      start_date = #{startDate,jdbcType=TIMESTAMP},
746
+      keeper = #{keeper,jdbcType=VARCHAR}
701 747
     where id = #{id,jdbcType=VARCHAR}
702 748
   </update>
703 749
 

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

@@ -5,6 +5,40 @@ import java.util.Date;
5 5
 
6 6
 public class BasicTank {
7 7
 	
8
+	
9
+	private BigDecimal designLife; //设计年限
10
+
11
+    private Date startDate;//启用日期
12
+
13
+    private String keeper;//保管员
14
+    
15
+	
16
+    
17
+	
18
+	public BigDecimal getDesignLife() {
19
+		return designLife;
20
+	}
21
+
22
+	public void setDesignLife(BigDecimal designLife) {
23
+		this.designLife = designLife;
24
+	}
25
+
26
+	public Date getStartDate() {
27
+		return startDate;
28
+	}
29
+
30
+	public void setStartDate(Date startDate) {
31
+		this.startDate = startDate;
32
+	}
33
+
34
+	public String getKeeper() {
35
+		return keeper;
36
+	}
37
+
38
+	public void setKeeper(String keeper) {
39
+		this.keeper = keeper;
40
+	}
41
+
8 42
 	private String tyygbm;
9 43
 	
10 44
     public String getTyygbm() {