Browse Source

主项目本次派单关于新增、修改及变更等多接口修改

anderx 3 years ago
parent
commit
8693ef5e34

+ 11 - 25
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -27,7 +27,6 @@
     <result column="project_type" jdbcType="INTEGER" property="projectType" />
     <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
     <result column="service_project" jdbcType="VARCHAR" property="serviceProject" />
-    <result column="cost_actual" jdbcType="DECIMAL" property="costActual" />
     <result column="patent_cost" jdbcType="DECIMAL" property="patentCost" />
     <result column="patent_cost_actual" jdbcType="DECIMAL" property="patentCostActual" />
     <result column="soft_cost" jdbcType="DECIMAL" property="softCost" />
@@ -44,9 +43,8 @@
     final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables,
     order_arrears, payment_amount, cost_amount, dep_name, province_name, legal_affairs,
     dun_start_time, legal_affairs_type, operation_time, legal_affairs_status, project_type,
-    service_type, service_project, cost_actual, patent_cost, patent_cost_actual, soft_cost,
-    soft_cost_actual, audit_cost, audit_cost_actual, other_cost, other_cost_actual, expect_profit,
-    actual_profit
+    service_type, service_project, patent_cost, patent_cost_actual, soft_cost, soft_cost_actual,
+    audit_cost, audit_cost_actual, other_cost, other_cost_actual, expect_profit, actual_profit
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -67,11 +65,10 @@
       dep_name, province_name, legal_affairs,
       dun_start_time, legal_affairs_type, operation_time,
       legal_affairs_status, project_type, service_type,
-      service_project, cost_actual, patent_cost,
-      patent_cost_actual, soft_cost, soft_cost_actual,
-      audit_cost, audit_cost_actual, other_cost,
-      other_cost_actual, expect_profit, actual_profit
-      )
+      service_project, patent_cost, patent_cost_actual,
+      soft_cost, soft_cost_actual, audit_cost,
+      audit_cost_actual, other_cost, other_cost_actual,
+      expect_profit, actual_profit)
     values (#{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR},
       #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, #{finalReceivables,jdbcType=DECIMAL},
       #{finalReceivablesTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL},
@@ -80,11 +77,10 @@
       #{depName,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, #{legalAffairs,jdbcType=INTEGER},
       #{dunStartTime,jdbcType=TIMESTAMP}, #{legalAffairsType,jdbcType=INTEGER}, #{operationTime,jdbcType=DATE},
       #{legalAffairsStatus,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, #{serviceType,jdbcType=VARCHAR},
-      #{serviceProject,jdbcType=VARCHAR}, #{costActual,jdbcType=DECIMAL}, #{patentCost,jdbcType=DECIMAL},
-      #{patentCostActual,jdbcType=DECIMAL}, #{softCost,jdbcType=DECIMAL}, #{softCostActual,jdbcType=DECIMAL},
-      #{auditCost,jdbcType=DECIMAL}, #{auditCostActual,jdbcType=DECIMAL}, #{otherCost,jdbcType=DECIMAL},
-      #{otherCostActual,jdbcType=DECIMAL}, #{expectProfit,jdbcType=DECIMAL}, #{actualProfit,jdbcType=DECIMAL}
-      )
+      #{serviceProject,jdbcType=VARCHAR}, #{patentCost,jdbcType=DECIMAL}, #{patentCostActual,jdbcType=DECIMAL},
+      #{softCost,jdbcType=DECIMAL}, #{softCostActual,jdbcType=DECIMAL}, #{auditCost,jdbcType=DECIMAL},
+      #{auditCostActual,jdbcType=DECIMAL}, #{otherCost,jdbcType=DECIMAL}, #{otherCostActual,jdbcType=DECIMAL},
+      #{expectProfit,jdbcType=DECIMAL}, #{actualProfit,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderMid" useGeneratedKeys="true">
     insert into t_order_mid
@@ -161,9 +157,6 @@
       <if test="serviceProject != null">
         service_project,
       </if>
-      <if test="costActual != null">
-        cost_actual,
-      </if>
       <if test="patentCost != null">
         patent_cost,
       </if>
@@ -268,9 +261,6 @@
       <if test="serviceProject != null">
         #{serviceProject,jdbcType=VARCHAR},
       </if>
-      <if test="costActual != null">
-        #{costActual,jdbcType=DECIMAL},
-      </if>
       <if test="patentCost != null">
         #{patentCost,jdbcType=DECIMAL},
       </if>
@@ -378,9 +368,6 @@
       <if test="serviceProject != null">
         service_project = #{serviceProject,jdbcType=VARCHAR},
       </if>
-      <if test="costActual != null">
-        cost_actual = #{costActual,jdbcType=DECIMAL},
-      </if>
       <if test="patentCost != null">
         patent_cost = #{patentCost,jdbcType=DECIMAL},
       </if>
@@ -440,7 +427,6 @@
       project_type = #{projectType,jdbcType=INTEGER},
       service_type = #{serviceType,jdbcType=VARCHAR},
       service_project = #{serviceProject,jdbcType=VARCHAR},
-      cost_actual = #{costActual,jdbcType=DECIMAL},
       patent_cost = #{patentCost,jdbcType=DECIMAL},
       patent_cost_actual = #{patentCostActual,jdbcType=DECIMAL},
       soft_cost = #{softCost,jdbcType=DECIMAL},
@@ -724,7 +710,7 @@
     update t_order_mid
     <set>
       <if test="costActual != null">
-        cost_actual =cost_actual+ #{costActual,jdbcType=DECIMAL},
+        payment_amount =payment_amount+ #{paymentAmount,jdbcType=DECIMAL},
       </if>
       <if test="patentCost != null">
         patent_cost =patent_cost+ #{patentCost,jdbcType=DECIMAL},

+ 1 - 14
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -75,7 +75,7 @@ public class TOrderMid implements Serializable {
     private BigDecimal orderArrears;
 
     /**
-     * 支付金额
+     * 成本实付
      */
     private BigDecimal paymentAmount;
 
@@ -135,11 +135,6 @@ public class TOrderMid implements Serializable {
     private String serviceProject;
 
     /**
-     * 成本实付
-     */
-    private BigDecimal costActual;
-
-    /**
      * 专利成本
      */
     private BigDecimal patentCost;
@@ -391,14 +386,6 @@ public class TOrderMid implements Serializable {
         this.serviceProject = serviceProject;
     }
 
-    public BigDecimal getCostActual() {
-        return costActual;
-    }
-
-    public void setCostActual(BigDecimal costActual) {
-        this.costActual = costActual;
-    }
-
     public BigDecimal getPatentCost() {
         return patentCost;
     }