Browse Source

版本切换1.2.52

anderx 3 years ago
parent
commit
3abe5f9163

+ 51 - 4
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -37,6 +37,7 @@
     <result column="other_cost_actual" jdbcType="DECIMAL" property="otherCostActual" />
     <result column="expect_profit" jdbcType="DECIMAL" property="expectProfit" />
     <result column="actual_profit" jdbcType="DECIMAL" property="actualProfit" />
+    <result column="stop_project" jdbcType="INTEGER" property="stopProject" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables,
@@ -44,7 +45,8 @@
     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, patent_cost, patent_cost_actual, soft_cost, soft_cost_actual,
-    audit_cost, audit_cost_actual, other_cost, other_cost_actual, expect_profit, actual_profit
+    audit_cost, audit_cost_actual, other_cost, other_cost_actual, expect_profit, actual_profit,
+    stop_project
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -68,7 +70,8 @@
       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)
+      expect_profit, actual_profit, stop_project
+      )
     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,7 +83,8 @@
       #{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})
+      #{expectProfit,jdbcType=DECIMAL}, #{actualProfit,jdbcType=DECIMAL}, #{stopProject,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderMid" useGeneratedKeys="true">
     insert into t_order_mid
@@ -187,6 +191,9 @@
       <if test="actualProfit != null">
         actual_profit,
       </if>
+      <if test="stopProject != null">
+        stop_project,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -291,6 +298,9 @@
       <if test="actualProfit != null">
         #{actualProfit,jdbcType=DECIMAL},
       </if>
+      <if test="stopProject != null">
+        #{stopProject,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderMid">
@@ -398,6 +408,9 @@
       <if test="actualProfit != null">
         actual_profit = #{actualProfit,jdbcType=DECIMAL},
       </if>
+      <if test="stopProject != null">
+        stop_project = #{stopProject,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -436,7 +449,8 @@
       other_cost = #{otherCost,jdbcType=DECIMAL},
       other_cost_actual = #{otherCostActual,jdbcType=DECIMAL},
       expect_profit = #{expectProfit,jdbcType=DECIMAL},
-      actual_profit = #{actualProfit,jdbcType=DECIMAL}
+      actual_profit = #{actualProfit,jdbcType=DECIMAL},
+      stop_project = #{stopProject,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -558,6 +572,39 @@
       <if test="serviceProject != null">
         service_project = #{serviceProject,jdbcType=VARCHAR},
       </if>
+      <if test="patentCost != null">
+        patent_cost = #{patentCost,jdbcType=DECIMAL},
+      </if>
+      <if test="patentCostActual != null">
+        patent_cost_actual = #{patentCostActual,jdbcType=DECIMAL},
+      </if>
+      <if test="softCost != null">
+        soft_cost = #{softCost,jdbcType=DECIMAL},
+      </if>
+      <if test="softCostActual != null">
+        soft_cost_actual = #{softCostActual,jdbcType=DECIMAL},
+      </if>
+      <if test="auditCost != null">
+        audit_cost = #{auditCost,jdbcType=DECIMAL},
+      </if>
+      <if test="auditCostActual != null">
+        audit_cost_actual = #{auditCostActual,jdbcType=DECIMAL},
+      </if>
+      <if test="otherCost != null">
+        other_cost = #{otherCost,jdbcType=DECIMAL},
+      </if>
+      <if test="otherCostActual != null">
+        other_cost_actual = #{otherCostActual,jdbcType=DECIMAL},
+      </if>
+      <if test="expectProfit != null">
+        expect_profit = #{expectProfit,jdbcType=DECIMAL},
+      </if>
+      <if test="actualProfit != null">
+        actual_profit = #{actualProfit,jdbcType=DECIMAL},
+      </if>
+      <if test="stopProject != null">
+        stop_project = #{stopProject,jdbcType=INTEGER},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>

+ 13 - 0
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -184,6 +184,11 @@ public class TOrderMid implements Serializable {
      */
     private BigDecimal actualProfit;
 
+    /**
+     * 暂停项目  0无 1有
+     */
+    private Integer stopProject;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -465,4 +470,12 @@ public class TOrderMid implements Serializable {
     public void setActualProfit(BigDecimal actualProfit) {
         this.actualProfit = actualProfit;
     }
+
+    public Integer getStopProject() {
+        return stopProject;
+    }
+
+    public void setStopProject(Integer stopProject) {
+        this.stopProject = stopProject;
+    }
 }

+ 8 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1557,15 +1557,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			t.setStatus(1);
 			StringBuffer str =new StringBuffer();
 			str.append("项目状态修改为:");
+			Integer stopProject=0;
 			if (use.getType()==0){
 				task.setProjectStatus(NewProjectStatus.ZT.getCode());
 				str=str.append("已暂停");
-				examineProjectSotpAddNotice(task,1,use.getType());
+				stopProject=1;
 			}else {
 				task.setProcessStatus(NewProjectStatus.JXZ.getCode());
 				str=str.append("进行中");
-				examineProjectSotpAddNotice(task,1,use.getType());
 			}
+
 			TaskLog taskLog = new TaskLog();
 			taskLog.setStopId(in.getTaskStopId());
 			taskLog.setTaskId(use.getTid());
@@ -1580,6 +1581,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tt.setTid(use.getTid());
 			tt.setStopStatus(0);
 			tTaskMidMapper.updateByTid(tt);
+			TOrderMid tOrderMid = new TOrderMid();
+			tOrderMid.setOrderNo(task.getOrderNo());
+			tOrderMid.setStopProject(stopProject);
+			tOrderMidMapper.updateByOrderNo(tOrderMid);
+			examineProjectSotpAddNotice(task,1,use.getType());
 		}else if(in.getStatus()==2) {
 			t.setStatus(2);
 			examineProjectSotpAddNotice(task,2,use.getType());