Browse Source

新增项目新增字段

anderx 3 years ago
parent
commit
ee3fba80ef

+ 10 - 10
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -26,8 +26,8 @@
     <result column="spot_check_count" jdbcType="INTEGER" property="spotCheckCount" />
     <result column="fail_count" jdbcType="INTEGER" property="failCount" />
     <result column="last_year" jdbcType="VARCHAR" property="lastYear" />
-    <result column="last_year_capital" jdbcType="VARCHAR" property="lastYearCapital" />
-    <result column="last_year_income" jdbcType="VARCHAR" property="lastYearIncome" />
+    <result column="last_year_capital" jdbcType="DECIMAL" property="lastYearCapital" />
+    <result column="last_year_income" jdbcType="DECIMAL" property="lastYearIncome" />
   </resultMap>
   <sql id="Base_Column_List">
     id, tid, cost_amount, party_amount, create_time, certificates_count, urgent_day,
@@ -63,8 +63,8 @@
       #{highNewRetrial,jdbcType=INTEGER}, #{dispatchCount,jdbcType=INTEGER}, #{stockCount,jdbcType=INTEGER},
       #{completeCount,jdbcType=INTEGER}, #{promulgateCount,jdbcType=INTEGER}, #{dispatchProvince,jdbcType=INTEGER},
       #{dutyDep,jdbcType=VARCHAR}, #{setUpCount,jdbcType=INTEGER}, #{spotCheckCount,jdbcType=INTEGER},
-      #{failCount,jdbcType=INTEGER}, #{lastYear,jdbcType=VARCHAR}, #{lastYearCapital,jdbcType=VARCHAR},
-      #{lastYearIncome,jdbcType=VARCHAR})
+      #{failCount,jdbcType=INTEGER}, #{lastYear,jdbcType=VARCHAR}, #{lastYearCapital,jdbcType=DECIMAL},
+      #{lastYearIncome,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TTaskMid" useGeneratedKeys="true">
     insert into t_task_mid
@@ -216,10 +216,10 @@
         #{lastYear,jdbcType=VARCHAR},
       </if>
       <if test="lastYearCapital != null">
-        #{lastYearCapital,jdbcType=VARCHAR},
+        #{lastYearCapital,jdbcType=DECIMAL},
       </if>
       <if test="lastYearIncome != null">
-        #{lastYearIncome,jdbcType=VARCHAR},
+        #{lastYearIncome,jdbcType=DECIMAL},
       </if>
     </trim>
   </insert>
@@ -296,10 +296,10 @@
         last_year = #{lastYear,jdbcType=VARCHAR},
       </if>
       <if test="lastYearCapital != null">
-        last_year_capital = #{lastYearCapital,jdbcType=VARCHAR},
+        last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
       </if>
       <if test="lastYearIncome != null">
-        last_year_income = #{lastYearIncome,jdbcType=VARCHAR},
+        last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -329,8 +329,8 @@
       spot_check_count = #{spotCheckCount,jdbcType=INTEGER},
       fail_count = #{failCount,jdbcType=INTEGER},
       last_year = #{lastYear,jdbcType=VARCHAR},
-      last_year_capital = #{lastYearCapital,jdbcType=VARCHAR},
-      last_year_income = #{lastYearIncome,jdbcType=VARCHAR}
+      last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      last_year_income = #{lastYearIncome,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

+ 7 - 6
src/main/java/com/goafanti/common/model/TTaskMid.java

@@ -132,12 +132,12 @@ public class TTaskMid implements Serializable {
     /**
      * 上年度总资本
      */
-    private String lastYearCapital;
+    private BigDecimal lastYearCapital;
 
     /**
      * 上年度总收入
      */
-    private String lastYearIncome;
+    private BigDecimal lastYearIncome;
 
     private static final long serialVersionUID = 1L;
 
@@ -333,21 +333,22 @@ public class TTaskMid implements Serializable {
         this.lastYear = lastYear;
     }
 
-    public String getLastYearCapital() {
+    public BigDecimal getLastYearCapital() {
         return lastYearCapital;
     }
 
-    public void setLastYearCapital(String lastYearCapital) {
+    public void setLastYearCapital(BigDecimal lastYearCapital) {
         this.lastYearCapital = lastYearCapital;
     }
 
-    public String getLastYearIncome() {
+    public BigDecimal getLastYearIncome() {
         return lastYearIncome;
     }
 
-    public void setLastYearIncome(String lastYearIncome) {
+    public void setLastYearIncome(BigDecimal lastYearIncome) {
         this.lastYearIncome = lastYearIncome;
     }
+
     public TTaskMid(Integer tid, BigDecimal costAmount) {
         this.tid = tid;
         this.costAmount = costAmount;

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -271,7 +271,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		tm.setHighNewRetrial(highNewRetrial);
 		tm.setLastYear(t.getLastYear());
-		tm.setLastYearCapital(new BigDecimal(t.getLastYearCapital()));
+		tm.setLastYearCapital(t.getLastYearCapital());
 		tm.setLastYearIncome(t.getLastYearIncome());
 		//获取派单省份与部门
 		TTaskMid dtails = tTaskMidMapper.getDtails(t.getId());