Browse Source

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

anderx 3 years ago
parent
commit
8fc33b4049

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

@@ -28,15 +28,13 @@
     <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, service_type, service_project
+    last_year_capital, last_year_income
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -57,8 +55,7 @@
       complete_count, promulgate_count, dispatch_province,
       duty_dep, set_up_count, spot_check_count,
       fail_count, last_year, last_year_capital,
-      last_year_income, service_type, service_project
-      )
+      last_year_income)
     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},
@@ -67,8 +64,7 @@
       #{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}, #{serviceType,jdbcType=VARCHAR}, #{serviceProject,jdbcType=VARCHAR}
-      )
+      #{lastYearIncome,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TTaskMid" useGeneratedKeys="true">
     insert into t_task_mid
@@ -148,12 +144,6 @@
       <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">
@@ -231,12 +221,6 @@
       <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">
@@ -317,12 +301,6 @@
       <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>
@@ -352,9 +330,7 @@
       fail_count = #{failCount,jdbcType=INTEGER},
       last_year = #{lastYear,jdbcType=VARCHAR},
       last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
-      last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
-      service_type = #{serviceType,jdbcType=VARCHAR},
-      service_project = #{serviceProject,jdbcType=VARCHAR}
+      last_year_income = #{lastYearIncome,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -362,11 +338,12 @@
 
   <update id="updatePaymentAmount">
     update t_task_mid
+    set party_amount = party_amount
     <if test="type == 0">
-      set party_amount = party_amount + #{paymentAmount,jdbcType=DECIMAL}
+       + #{paymentAmount,jdbcType=DECIMAL}
     </if>
     <if test="type == 1">
-      set party_amount = party_amount - #{paymentAmount,jdbcType=DECIMAL}
+       - #{paymentAmount,jdbcType=DECIMAL}
     </if>
     where tid = #{tid,jdbcType=INTEGER}
   </update>
@@ -466,12 +443,6 @@
       <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>

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

@@ -139,16 +139,6 @@ public class TTaskMid implements Serializable {
      */
     private BigDecimal lastYearIncome;
 
-    /**
-     * 服务类型
-     */
-    private String serviceType;
-
-    /**
-     * 服务项目
-     */
-    private String serviceProject;
-
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -359,22 +349,6 @@ 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;

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

@@ -438,7 +438,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(admin.getDepartmentId());
 		}
-		if (isSubmit==1) {//订单提交
+		//订单提交
+		if (isSubmit==1) {
 			t2.setApproval(t.getApproval());
 			if(t2.getProcessStatus()<ProcessStatus.YPYXGLY.getCode()) {
 				t.setOrderStatus(OrderNewState.QDDS.getCode());