修改对接人

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -226,6 +226,9 @@ public class InsPlyIncome extends BaseModel {
     @ExcelProperty("对接人")
     private String contactPerson;
 
+    @Schema(description = "对接人手机号")
+    private String contactPersonPhone;
+
     @Schema(description = "系统code")
     @ExcelProperty("系统code")
     private String systemCode;

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -19,6 +19,7 @@ import com.jzg.commons.entity.finance.dto.*;
 import com.jzg.commons.entity.finance.po.*;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.po.PtlAgreement;
@@ -103,7 +104,6 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Autowired
     private PtlAgreementMapper ptlAgreementMapper;
-
     @Autowired
     private SysUploadFilesMapper sysUploadFilesMapper;
 
@@ -1439,6 +1439,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 log.info("批量修改应收订单。序号为[{}]的应收订单不存在", incomeId);
                 continue;
             }
+            InsOrders insOrders = new InsOrders();
+            insOrders.setId(insPlyIncomeSource.getOrderNo());
             InsPlyIncome insPlyIncome = new InsPlyIncome();
             insPlyIncome.setId(insPlyIncomeSource.getId());
             if (Objects.nonNull(batchModifyVo.getJqSuperviseCostsProportion()) && batchModifyVo.getJqSuperviseCostsProportion().compareTo(BigDecimal.ZERO) > 0) {
@@ -1472,24 +1474,36 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
             if (batchModifyVo.getSigningTime() != null){
                 insPlyIncome.setSigningTime(batchModifyVo.getSigningTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                insOrders.setSigningTime(batchModifyVo.getSigningTime());
+            }
+
+            if(StrUtil.isNotEmpty(batchModifyVo.getContractUserName())){
+                insPlyIncome.setContactPerson(batchModifyVo.getContractUserName());
+                insOrders.setDockingPerson(batchModifyVo.getContractUserName());
+            }
+            if(StrUtil.isNotEmpty(batchModifyVo.getContractPhone())){
+                insPlyIncome.setContactPersonPhone(batchModifyVo.getContractPhone());
+                insOrders.setDockingPersonPhone(batchModifyVo.getContractPhone());
+
             }
-            updateInsPlyIncome.add(insPlyIncome);
+            //updateInsPlyIncome.add(insPlyIncome);
         }
-        baseMapper.updateById(updateInsPlyIncome);
-        return true;
+//        baseMapper.updateById(updateInsPlyIncome);
+//        return true;
 
-        // 批量修改
-//        baseMapper.update(new InsPlyIncome(), new LambdaUpdateWrapper<InsPlyIncome>()
-//                .set(InsPlyIncome::getJqSuperviseCostsProportion, batchModifyVo.getJqSuperviseCostsProportion())
-//                .set(InsPlyIncome::getSySuperviseCostsProportion, batchModifyVo.getSySuperviseCostsProportion())
+         // 批量修改
+        baseMapper.update(new InsPlyIncome(), new LambdaUpdateWrapper<InsPlyIncome>()
+                .set(InsPlyIncome::getJqSuperviseCostsProportion, batchModifyVo.getJqSuperviseCostsProportion())
+                .set(InsPlyIncome::getSySuperviseCostsProportion, batchModifyVo.getSySuperviseCostsProportion())
 //                .set(InsPlyIncome::getJySuperviseCostsProportion, batchModifyVo.getJySuperviseCostsProportion())
 //                .set(InsPlyIncome::getJqOtherCostsProportion, batchModifyVo.getJqOtherCostsProportion())
 //                .set(InsPlyIncome::getSyOtherCostsProportion, batchModifyVo.getSyOtherCostsProportion())
 //                .set(InsPlyIncome::getJyOtherCostsProportion, batchModifyVo.getJyOtherCostsProportion())
-////                .set(InsPlyIncome::getSigningTime, batchModifyVo.getSigningTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
-//                .in(InsPlyIncome::getId, batchModifyVo.getIncomeIds()));
-
-//        return false;
+                .set(InsPlyIncome::getSigningTime, batchModifyVo.getSigningTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                .set(InsPlyIncome::getContactPerson, batchModifyVo.getContractUserName())
+                .set(InsPlyIncome::getContactPersonPhone, batchModifyVo.getContractPhone())
+                .in(InsPlyIncome::getId, batchModifyVo.getIncomeIds()));
+        return true;
     }
 
     @Override