Browse Source

变更新增合同

anderx 3 years ago
parent
commit
1b40d4708a

+ 1 - 1
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -40,4 +40,4 @@ public interface NewOrderChangeMapper {
     NewOrderChangeBo selectByChangeId(String changeId);
 
     NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
-}
+}

+ 20 - 6
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -34,13 +34,15 @@
     <result column="refund_url" jdbcType="VARCHAR" property="refundUrl" />
     <result column="back_status" jdbcType="INTEGER" property="backStatus" />
     <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
+    <result column="contract_picture_url" jdbcType="VARCHAR" property="contractPictureUrl" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, process_state, `status`, `type`, create_time, remarks, voucher_url,
     total_amount, settlement_amount, change_amount, applicant, dep_name, project_state,
     zxs_cost, zxs_remarks, payment_time, payment_amount, invoice_time, invoice_amount,
     invoice_type, cw_cost, refundable_amount, cw_remarks, estimate_cost, estimate_refundable,
-    refund_Invoice, used_order, refund_status, refund_url, back_status, attachment_url
+    refund_Invoice, used_order, refund_status, refund_url, back_status, attachment_url,
+    contract_picture_url
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -63,7 +65,7 @@
       refundable_amount, cw_remarks, estimate_cost,
       estimate_refundable, refund_Invoice, used_order,
       refund_status, refund_url, back_status,
-      attachment_url)
+      attachment_url, contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
       #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
       #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
@@ -74,7 +76,7 @@
       #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}, #{estimateCost,jdbcType=DECIMAL},
       #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}, #{usedOrder,jdbcType=VARCHAR},
       #{refundStatus,jdbcType=INTEGER}, #{refundUrl,jdbcType=VARCHAR}, #{backStatus,jdbcType=INTEGER},
-      #{attachmentUrl,jdbcType=VARCHAR})
+      #{attachmentUrl,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.NewOrderChange" useGeneratedKeys="true">
     insert into new_order_change
@@ -172,6 +174,9 @@
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
+      <if test="contractPictureUrl != null">
+        contract_picture_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -267,6 +272,9 @@
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=VARCHAR},
       </if>
+      <if test="contractPictureUrl != null">
+        #{contractPictureUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.NewOrderChange">
@@ -365,6 +373,9 @@
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
       </if>
+      <if test="contractPictureUrl != null">
+        contract_picture_url = #{contractPictureUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -400,7 +411,8 @@
       refund_status = #{refundStatus,jdbcType=INTEGER},
       refund_url = #{refundUrl,jdbcType=VARCHAR},
       back_status = #{backStatus,jdbcType=INTEGER},
-      attachment_url = #{attachmentUrl,jdbcType=VARCHAR}
+      attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      contract_picture_url = #{contractPictureUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
@@ -411,7 +423,8 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks from new_order_change a where 1 = 1
+	a.cw_remarks cwRemarks,a.contract_picture_url contractPictureUrl
+    from new_order_change a where 1 = 1
 	and a.order_no= #{orderNo}
 	order by a.create_time desc limit 1
   </select>
@@ -423,7 +436,8 @@ select
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,
 	date_format(a. invoice_time, '%Y-%m-%d') invoiceTimes, a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
-	a.cw_remarks cwRemarks,a.back_status backStatus from new_order_change a where 1 = 1 and status!=4
+	a.cw_remarks cwRemarks,a.back_status backStatus ,a.contract_picture_url contractPictureUrl
+    from new_order_change a where 1 = 1 and status!=4
 	and a.id= #{ChangeId}
 	order by a.create_time desc
   </select>

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

@@ -169,6 +169,11 @@ public class NewOrderChange implements Serializable {
      */
     private String attachmentUrl;
 
+    /**
+     * 合同图片
+     */
+    private String contractPictureUrl;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -426,4 +431,12 @@ public class NewOrderChange implements Serializable {
     public void setAttachmentUrl(String attachmentUrl) {
         this.attachmentUrl = attachmentUrl;
     }
+
+    public String getContractPictureUrl() {
+        return contractPictureUrl;
+    }
+
+    public void setContractPictureUrl(String contractPictureUrl) {
+        this.contractPictureUrl = contractPictureUrl;
+    }
 }

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

@@ -742,6 +742,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		um.setTaskNames(taskNames);
 		if (nb.getType()==0)um.setChargeback(1);
 		userMidMapper.updateByUid(um);
+		//如果合同不是空,则修改合同
+		if (nob.getContractPictureUrl()==null)o.setContractPictureUrl(nob.getContractPictureUrl());
 		tOrderNewMapper.updateByPrimaryKeySelective(o);
 		return o;
 	}