Browse Source

项目完成修改审计新增字段

anderx 3 years ago
parent
commit
10694d4ffb

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

@@ -28,13 +28,15 @@
     <result column="last_year" jdbcType="VARCHAR" property="lastYear" />
     <result column="last_year_capital" jdbcType="DECIMAL" property="lastYearCapital" />
     <result column="last_year_income" jdbcType="DECIMAL" property="lastYearIncome" />
+    <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
+    <result column="service_project" jdbcType="VARCHAR" property="serviceProject" />
   </resultMap>
   <sql id="Base_Column_List">
     id, tid, cost_amount, party_amount, create_time, certificates_count, urgent_day,
     if_material, reject_count, accept_count, end_count, authorize_count, apply_count,
     high_new_retrial, dispatch_count, stock_count, complete_count, promulgate_count,
     dispatch_province, duty_dep, set_up_count, spot_check_count, fail_count, last_year,
-    last_year_capital, last_year_income
+    last_year_capital, last_year_income, service_type, service_project
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -55,7 +57,8 @@
       complete_count, promulgate_count, dispatch_province,
       duty_dep, set_up_count, spot_check_count,
       fail_count, last_year, last_year_capital,
-      last_year_income)
+      last_year_income, service_type, service_project
+      )
     values (#{tid,jdbcType=INTEGER}, #{costAmount,jdbcType=DECIMAL}, #{partyAmount,jdbcType=DECIMAL},
       #{createTime,jdbcType=TIMESTAMP}, #{certificatesCount,jdbcType=INTEGER}, #{urgentDay,jdbcType=INTEGER},
       #{ifMaterial,jdbcType=INTEGER}, #{rejectCount,jdbcType=INTEGER}, #{acceptCount,jdbcType=INTEGER},
@@ -64,7 +67,8 @@
       #{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=DECIMAL},
-      #{lastYearIncome,jdbcType=DECIMAL})
+      #{lastYearIncome,jdbcType=DECIMAL}, #{serviceType,jdbcType=VARCHAR}, #{serviceProject,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TTaskMid" useGeneratedKeys="true">
     insert into t_task_mid
@@ -144,6 +148,12 @@
       <if test="lastYearIncome != null">
         last_year_income,
       </if>
+      <if test="serviceType != null">
+        service_type,
+      </if>
+      <if test="serviceProject != null">
+        service_project,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="tid != null">
@@ -221,6 +231,12 @@
       <if test="lastYearIncome != null">
         #{lastYearIncome,jdbcType=DECIMAL},
       </if>
+      <if test="serviceType != null">
+        #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceProject != null">
+        #{serviceProject,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TTaskMid">
@@ -301,6 +317,12 @@
       <if test="lastYearIncome != null">
         last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
       </if>
+      <if test="serviceType != null">
+        service_type = #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceProject != null">
+        service_project = #{serviceProject,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -330,7 +352,9 @@
       fail_count = #{failCount,jdbcType=INTEGER},
       last_year = #{lastYear,jdbcType=VARCHAR},
       last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
-      last_year_income = #{lastYearIncome,jdbcType=DECIMAL}
+      last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
+      service_type = #{serviceType,jdbcType=VARCHAR},
+      service_project = #{serviceProject,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -433,6 +457,21 @@
       <if test="failCount != null">
         fail_count = #{failCount,jdbcType=INTEGER},
       </if>
+      <if test="lastYear != null">
+        last_year = #{lastYear,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearCapital != null">
+        last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearIncome != null">
+        last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="serviceType != null">
+        service_type = #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceProject != null">
+        service_project = #{serviceProject,jdbcType=VARCHAR},
+      </if>
     </set>
     where tid = #{tid,jdbcType=INTEGER}
   </update>

+ 26 - 0
src/main/java/com/goafanti/common/model/TTaskMid.java

@@ -139,6 +139,16 @@ public class TTaskMid implements Serializable {
      */
     private BigDecimal lastYearIncome;
 
+    /**
+     * 服务类型
+     */
+    private String serviceType;
+
+    /**
+     * 服务项目
+     */
+    private String serviceProject;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -349,6 +359,22 @@ public class TTaskMid implements Serializable {
         this.lastYearIncome = lastYearIncome;
     }
 
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
     public TTaskMid(Integer tid, BigDecimal costAmount) {
         this.tid = tid;
         this.costAmount = costAmount;

+ 1 - 1
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -17,7 +17,7 @@ public class InputProjectStatistics {
 	private Integer pageNo;
 	private Integer pageSize;
 
-	/** 双软=2,软著=3,专利=4,高新=1,其他=0 */
+	// 0通用 1高新 2双软 3软著 4专利 5审计
 	private Integer status;
 	private String depName;
 	private String thchDepName;

+ 29 - 0
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -67,6 +67,35 @@ public class OutProjectStatistics {
 	private Integer yearSum;
 	private String contractTerm;
 
+	//审计
+	private String lastYear;
+	private BigDecimal lastYearCapital;
+	private BigDecimal lastYearIncome;
+
+	public String getLastYear() {
+		return lastYear;
+	}
+
+	public void setLastYear(String lastYear) {
+		this.lastYear = lastYear;
+	}
+
+	public BigDecimal getLastYearCapital() {
+		return lastYearCapital;
+	}
+
+	public void setLastYearCapital(BigDecimal lastYearCapital) {
+		this.lastYearCapital = lastYearCapital;
+	}
+
+	public BigDecimal getLastYearIncome() {
+		return lastYearIncome;
+	}
+
+	public void setLastYearIncome(BigDecimal lastYearIncome) {
+		this.lastYearIncome = lastYearIncome;
+	}
+
 	public String getServiceLife() {
 		return serviceLife;
 	}