样品单合同旧合同ID逻辑更改

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -194,6 +194,7 @@ public class ContractUpdateFlow extends FlowDelegate {
         newContract.setStatus(FlowStatusEnum1.PASS.getKey());
         newContract.setApprovedDate(new Date());
         newContract.setUpId(temNewId);
+        newContract.setOldContractId(businessId);
         newContract.setIsShow(0);//显示新合同
         contractService.updateContract(newContract);
         //修改合同产品相关数据

hx-sale/src/main/java/com/fjhx/sale/flow/SampleUpdateFlow.java

@@ -179,6 +179,7 @@ public class SampleUpdateFlow extends FlowDelegate {
         newSample.setStatus(FlowStatusEnum1.PASS.getKey());
         newSample.setApprovedDate(new Date());
         newSample.setUpId(temNewId);
+        newSample.setOldSampleId(businessId);
         newSample.setIsShow(0);//显示新样品单
         sampleService.updateSample(newSample);
         //修改样品单产品相关数据

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -290,6 +290,7 @@
             <if test="status != null">status = #{status},</if>
             <if test="isChange != null">is_change = #{isChange},</if>
             <if test="isShow != null">is_show = #{isShow},</if>
+            <if test="oldContractId != null">old_contract_id = #{oldContractId},</if>
             <if test="approvedDate != null">approved_date = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%m:%s'),</if>
             update_time = sysdate()
         </set>

hx-sale/src/main/resources/mapper/sample/SampleMapper.xml

@@ -56,6 +56,7 @@
             <if test="id != null">id = #{id},</if>
             <if test="status != null">status = #{status},</if>
             <if test="isShow != null">is_show = #{isShow},</if>
+            <if test="oldSampleId != null">old_sample_id = #{oldSampleId},</if>
             <if test="approvedDate != null">approved_date = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%m:%s'),</if>
             update_time = sysdate()
         </set>