Browse Source

审核接口开发

anderx 3 years ago
parent
commit
aefc0ab1a1

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -793,7 +793,7 @@
     a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
     a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
     a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum,
-    ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome
+    ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,ttm.stop_status stopStatus
     from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
     left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
     left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id

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

@@ -39,7 +39,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="stopStatus" jdbcType="INTEGER" property="stopstatus" />
+    <result column="stop_status" jdbcType="INTEGER" property="stopStatus" />
   </resultMap>
   <sql id="Base_Column_List">
     id, tid, cost_amount, party_amount, create_time, certificates_count, urgent_day,
@@ -48,7 +48,7 @@
     dispatch_province, duty_dep, set_up_count, spot_check_count, fail_count, last_year,
     last_year_capital, last_year_income, 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, stopStatus
+    expect_profit, actual_profit, stop_status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -73,7 +73,7 @@
       patent_cost_actual, soft_cost, soft_cost_actual,
       audit_cost, audit_cost_actual, other_cost,
       other_cost_actual, expect_profit, actual_profit,
-      stopStatus)
+      stop_status)
     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},
@@ -86,7 +86,7 @@
       #{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},
-      #{stopstatus,jdbcType=INTEGER})
+      #{stopStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TTaskMid" useGeneratedKeys="true">
     insert into t_task_mid
@@ -199,8 +199,8 @@
       <if test="actualProfit != null">
         actual_profit,
       </if>
-      <if test="stopstatus != null">
-        stopStatus,
+      <if test="stopStatus != null">
+        stop_status,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -312,8 +312,8 @@
       <if test="actualProfit != null">
         #{actualProfit,jdbcType=DECIMAL},
       </if>
-      <if test="stopstatus != null">
-        #{stopstatus,jdbcType=INTEGER},
+      <if test="stopStatus != null">
+        #{stopStatus,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -428,8 +428,8 @@
       <if test="actualProfit != null">
         actual_profit = #{actualProfit,jdbcType=DECIMAL},
       </if>
-      <if test="stopstatus != null">
-        stopStatus = #{stopstatus,jdbcType=INTEGER},
+      <if test="stopStatus != null">
+        stop_status = #{stopStatus,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -472,7 +472,7 @@
       other_cost_actual = #{otherCostActual,jdbcType=DECIMAL},
       expect_profit = #{expectProfit,jdbcType=DECIMAL},
       actual_profit = #{actualProfit,jdbcType=DECIMAL},
-      stopStatus = #{stopstatus,jdbcType=INTEGER}
+      stop_status = #{stopStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -197,7 +197,7 @@ public class TTaskMid implements Serializable {
     /**
      * 项目暂停状态 0否 1已发起
      */
-    private Integer stopstatus;
+    private Integer stopStatus;
 
     private static final long serialVersionUID = 1L;
 
@@ -497,15 +497,14 @@ public class TTaskMid implements Serializable {
         this.actualProfit = actualProfit;
     }
 
-    public Integer getStopstatus() {
-        return stopstatus;
+    public Integer getStopStatus() {
+        return stopStatus;
     }
 
-    public void setStopstatus(Integer stopstatus) {
-        this.stopstatus = stopstatus;
+    public void setStopStatus(Integer stopStatus) {
+        this.stopStatus = stopStatus;
     }
 
-
     public TTaskMid(Integer tid, BigDecimal costAmount) {
         this.tid = tid;
         this.costAmount = costAmount;

+ 11 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -49,11 +49,22 @@ public class TOrderTaskBo extends TOrderTask{
 	private String	serviceYear;
 	private String contractTerm;
 	private Integer	yearSum;
+	private Integer	stopStatus;
 
 	private String lastYear;
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
+
+
+	public Integer getStopStatus() {
+		return stopStatus;
+	}
+
+	public void setStopStatus(Integer stopStatus) {
+		this.stopStatus = stopStatus;
+	}
+
 	public String getLastYear() {
 		return lastYear;
 	}

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

@@ -1484,7 +1484,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			taskSoptLogMapper.insertSelective(log);
 			TTaskMid tt=new TTaskMid();
 			tt.setTid(id);
-			tt.setStopstatus(1);
+			tt.setStopStatus(1);
 			tTaskMidMapper.updateByTid(tt);
 		}
 
@@ -1577,7 +1577,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tOrderTaskMapper.updateByPrimaryKeySelective(task2);
 			TTaskMid tt=new TTaskMid();
 			tt.setTid(use.getTid());
-			tt.setStopstatus(0);
+			tt.setStopStatus(0);
 			tTaskMidMapper.updateByTid(tt);
 		}else if(in.getStatus()==2) {
 			t.setStatus(2);