变更

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java

@@ -229,6 +229,18 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		return Result.OK("删除成功!");
 	}
 
+	 /**
+	  *
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "同步旧数据",operateType = 4)
+	 @ApiOperation(value="同步旧数据", notes="同步旧数据")
+	 @GetMapping(value = "/synContract")
+	 public Result<?> synContract() {
+		 paySpendingContractService.synContract();
+		 return Result.OK("同步成功!");
+	 }
 	/**
 	 *  批量删除
 	 *

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java

@@ -33,36 +33,36 @@ public interface IPaySpendingContractService extends IService<PaySpendingContrac
     * @Description 添加
     * @Author  lqt
     * @Date   2021/9/7
-    * @Param  
-    * @Return      
-    * @Exception   
+    * @Param
+    * @Return
+    * @Exception
     */
     PaySpendingContract addPaySpendingContractInput(PaySpendingContractInput input);
     /**
     * @Description 编辑
     * @Author  lqt
     * @Date   2021/9/7
-    * @Param  
-    * @Return      
-    * @Exception   
+    * @Param
+    * @Return
+    * @Exception
     */
     void editPayIncomeContractInput(PaySpendingContractInput input);
     /**
     * @Description 通过id删除
     * @Author  lqt
     * @Date   2021/9/7
-    * @Param  
-    * @Return      
-    * @Exception   
+    * @Param
+    * @Return
+    * @Exception
     */
     void deletePaySpendingContractInputById(String id);
     /**
     * @Description 批量删除
     * @Author  lqt
     * @Date   2021/9/7
-    * @Param  
-    * @Return      
-    * @Exception   
+    * @Param
+    * @Return
+    * @Exception
     */
     void deleteSpendingContractInputByIds(List<String> ids);
     /**
@@ -110,4 +110,7 @@ public interface IPaySpendingContractService extends IService<PaySpendingContrac
      * @Exception
      */
     void updateArchive(PaySpendingContractAudit paySpendingContractAudit);
+
+    void synContract();
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -1163,6 +1163,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
         updatePayMailContract.eq(PayMailContract::getContractId,id);
         payMailContractService.remove(updatePayMailContract);
+        //删除邮寄列表
+
     }
 
     @Override

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java

@@ -2,7 +2,9 @@ package com.jero.contract.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -85,6 +87,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
     private SendMessageService sendMessageService;
 
 
+
     @Override
     public IPage<PaySpendingContract> queryPageList(Page<PaySpendingContract> page, PaySpendingContract paySpendingContract, String startTime, String endTime,String chargeStatus) {
         return paySpendingContractMapper.queryPageList(page,paySpendingContract,startTime,endTime,chargeStatus);
@@ -324,6 +327,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
         updatePaySpendingContractInstallment.eq(PaySpendingContractInstallment::getContractId,id);
         paySpendingContractInstallmentService.remove(updatePaySpendingContractInstallment);
+        payMailContractService.remove(new LambdaQueryWrapper<PayMailContract>().eq(PayMailContract::getContractId,id));
     }
 
     @Override
@@ -353,6 +357,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
         updatePaySpendingContractInstallment.in(PaySpendingContractInstallment::getContractId,ids);
         paySpendingContractInstallmentService.remove(updatePaySpendingContractInstallment);
+        payMailContractService.remove(new LambdaQueryWrapper<PayMailContract>().in(PayMailContract::getContractId,ids));
     }
 
     @Override
@@ -792,6 +797,26 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         paySpendingContractAuditService.save(paySpendingContractAudit);
     }
 
+    @Override
+    public void synContract() {
+        payMailContractService.update(new PayMailContract().setContractType(2),new UpdateWrapper<PayMailContract>().isNull("contract_type"));
+        payMailContractService.del();
+        List<PaySpendingContract> list = paySpendingContractService.list(null);
+        ArrayList<PayMailContract> arrayList = new ArrayList<>();
+        for(PaySpendingContract paySpendingContract:list){
+            PayMailContract payMailContract = new PayMailContract();
+            payMailContract.setContractId(paySpendingContract.getId());
+            payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
+//            payMailContract.setMobile(PasswordUtil.encrypt(paySpendingContract.getPhone()));
+//            payMailContract.setEmail("");
+            payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName());
+            payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1);
+            arrayList.add(payMailContract);
+        }
+        payMailContractService.saveBatch(arrayList);
+
+    }
+
 
     private PaySpendingContract setPaySpendingContractExcel(Map<Integer,String> map,Map<String, String> mapOpening,Map<String, String> mapPack,
                                                             int n,StringBuilder sb){