客户银行添加

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java

@@ -427,6 +427,13 @@ public class XzdSubcontractVo implements Serializable {
 
 
 
+    /**
+     * 竣工日期
+     */
+    @ExcelProperty(value = "竣工日期")
+    private LocalDate actualCompletionDate;
+
+
     /**
      * 创建者
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java

@@ -33,10 +33,7 @@ import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
 import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
 import org.dromara.xzd.enums.XzdClassEnum;
 import org.dromara.xzd.enums.ZxdEnum;
-import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
+import org.dromara.xzd.service.*;
-import org.dromara.xzd.service.IXzdContractClauseService;
-import org.dromara.xzd.service.IXzdCorrespondentList;
-import org.dromara.xzd.service.IXzdDeductionItemsService;
 import org.dromara.xzd.service.impl.*;
 import org.dromara.xzd.utilS.AreaUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,8 +75,8 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
     @Autowired
     private XzdContractDepositInfoServiceImpl xzdContractDepositInfoService;
 
-    @Autowired
+    private final IXzdProjectService xzdProjectService;
-    private XzdProjectServiceImpl xzdProjectService;
+
     @Autowired
     private IXzdCorrespondentList iXzdCorrespondentList;
     @Autowired
@@ -159,6 +156,14 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
                 }
             }
             item.setSealInfo(xzdBusinessChanges);
+//            竣工日期回填
+            if(item.getProject() != null){
+                XzdProject byId = xzdProjectService.getById(item.getProject());
+                if(byId != null){
+                    item.setActualCompletionDate(byId.getActualCompletionDate());
+                }
+
+            }
 //            //合同文本-预收款项
             LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdCorrespondentList.java

@@ -85,7 +85,7 @@ public class XzdCorrespondentList {
     /**
      * 客户类型列表
      */
-    @SaCheckPermission("xzd:customertypeInfo:query")
+//    @SaCheckPermission("xzd:customertypeInfo:query")
     @PostMapping("/queryCustomertypeList")
     public R<List<XzdCustomertypeVo>> queryCustomertypeList() {
         return iXzdCustomertypeService.queryCustomertypeList();

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdCorrespondentList.java

@@ -15,15 +15,31 @@ public interface IXzdCorrespondentList {
 
     R<XzdPoiAreaVo> queryPageList();
 
+    /**
+     * 客户信息添加
+     */
     R<String> addCorrespondent(AddCorrespondentDto dto);
 
+    /**
+     * 客户信息删除
+     */
     R<String> delCorrespondent(Long[] dto);
 
+    /**
+     * 客户信息列表
+     */
     R<XzdClienteleListSumVo> queryCustomertype(XzdClienteleListDto dto, PageQuery pageQuery);
 
+    /**
+     * 客户信息修改
+     */
     R<String> putCorrespondent(AddCorrespondentDto dto);
 
+    /**
+     * 客户详情
+     */
     R<QuerCorrespondentDto> getCustomerByid(Long id);
 
+
     String queryNameById(Long partyAUnit);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java

@@ -33,10 +33,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -98,6 +95,11 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
     private final IXzdCustomerSupplierYybService iXzdCustomerSupplierYybService;
 
+    @Autowired
+    private XzdYhxxServiceImpl xzdYhxxService;
+
+
+
 
 
 
@@ -112,6 +114,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         return R.ok("成功",areaList);
     }
 
+    /**
+     * 客户信息添加
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<String> addCorrespondent(AddCorrespondentDto dto) {
@@ -159,8 +164,6 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
                     }
                 }
             }
-
-
         }
 
 //        tab客户信息添加
@@ -256,17 +259,32 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
             xzdSettlementInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
             XzdSettlementInfo info = new XzdSettlementInfo();
             BeanUtil.copyProperties(xzdSettlementInfo, info);
-            System.out.println(info);
+
+            //开户银行
+            if(xzdSettlementInfo.getOpenBanks() != null && !xzdSettlementInfo.getOpenBanks().isEmpty()){
+                ArrayList<XzdYhxx> xzdYhxxes = new ArrayList<>();
+                for (XzdSupplierOpenBank bank : xzdSettlementInfo.getOpenBanks()) {
+                    XzdYhxx xzdYhxxBo = new XzdYhxx();
+                    xzdYhxxBo.setYhId(bank.getId());
+                    xzdYhxxBo.setMainId(id);
+                    xzdYhxxBo.setSfmr(bank.getIsDefault());
+                    xzdYhxxBo.setType("2");
+                    xzdYhxxes.add(xzdYhxxBo);
+
+                }
+                xzdYhxxService.saveBatch(xzdYhxxes);
+            }
+
             xzdSettlementInfoService.save(info);
             }
 
-        //开户银行
+//        //开户银行
-        if(dto.getXzdSettlementInfo().getOpenBanks() != null && !dto.getXzdSettlementInfo().getOpenBanks().isEmpty()){
+//        if(dto.getXzdSettlementInfo().getOpenBanks() != null && !dto.getXzdSettlementInfo().getOpenBanks().isEmpty()){
-            for (XzdSupplierOpenBank openBank : dto.getXzdSettlementInfo().getOpenBanks()) {
+//            for (XzdSupplierOpenBank openBank : dto.getXzdSettlementInfo().getOpenBanks()) {
-//                openBank.setSupplierId(id);
+////                openBank.setSupplierId(id);
-            }
+//            }
-            xzdSupplierOpenBankService.saveBatch(dto.getXzdSettlementInfo().getOpenBanks());
+//            xzdSupplierOpenBankService.saveBatch(dto.getXzdSettlementInfo().getOpenBanks());
-        }
+//        }
 
 
         //      业务信息添加
@@ -323,6 +341,12 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         return R.ok("添加成功");
     }
 
+    /**
+     * 删除客户信息
+     *
+     * @param dto
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<String> delCorrespondent(Long[] dto) {
@@ -335,6 +359,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
     }
 
+    /**
+     * 客户信息列表
+     */
     @Override
     public R<XzdClienteleListSumVo> queryCustomertype(XzdClienteleListDto dto, PageQuery pageQuery) {
         XzdClienteleListSumVo xzdClienteleListSumVo = new XzdClienteleListSumVo();
@@ -355,6 +382,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         }
     }
 
+    /**
+     * 客户信息修改
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<String> putCorrespondent(AddCorrespondentDto dto) {
@@ -451,17 +481,23 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
         //      结算信息
         XzdSettlementInfoBo xzdSettlementInfo = dto.getXzdSettlementInfo();
-//        xzdSupplierOpenBankService.getBaseMapper().delete(new LambdaQueryWrapper<XzdSupplierOpenBank>().eq(XzdSupplierOpenBank::getSupplierId, dto.getXzdCustomerinformation().getId()));
+        xzdYhxxService.getBaseMapper().delete(new LambdaQueryWrapper<XzdYhxx>().eq(XzdYhxx::getMainId, dto.getXzdCustomerinformation().getId()));
         if (xzdSettlementInfo != null) {
             xzdSettlementInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
             xzdSettlementInfo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
             xzdSettlementInfoService.saveOrUpdate(MapstructUtils.convert(xzdSettlementInfo, XzdSettlementInfo.class));
             //开户银行
-            if(dto.getXzdSettlementInfo().getOpenBanks() != null && !dto.getXzdSettlementInfo().getOpenBanks().isEmpty()){
+            if(xzdSettlementInfo.getOpenBanks() != null && !xzdSettlementInfo.getOpenBanks().isEmpty()){
-                for (XzdSupplierOpenBank openBank : dto.getXzdSettlementInfo().getOpenBanks()) {
+                ArrayList<XzdYhxx> xzdYhxxes = new ArrayList<>();
-//                    openBank.setSupplierId(dto.getXzdCustomerinformation().getId());
+                for (XzdSupplierOpenBank bank : xzdSettlementInfo.getOpenBanks()) {
+                    XzdYhxx xzdYhxxBo = new XzdYhxx();
+                    xzdYhxxBo.setYhId(bank.getId());
+                    xzdYhxxBo.setMainId(dto.getXzdCustomerinformation().getId());
+                    xzdYhxxBo.setSfmr(bank.getIsDefault());
+                    xzdYhxxBo.setType("2");
+                    xzdYhxxes.add(xzdYhxxBo);
                 }
-                xzdSupplierOpenBankService.saveBatch(dto.getXzdSettlementInfo().getOpenBanks());
+                xzdYhxxService.saveBatch(xzdYhxxes);
             }
         }
 
@@ -512,6 +548,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
     }
 
+    /**
+     * 客户详情
+     */
     @Override
     public R<QuerCorrespondentDto> getCustomerByid(Long id) {
         QuerCorrespondentDto dto = new QuerCorrespondentDto();
@@ -555,14 +594,38 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         //      结算信息
 
         XzdSettlementInfo xzdSettlementInfo = xzdSettlementInfoService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdSettlementInfo>().eq(XzdSettlementInfo::getCustomerinformationId, id));
-//        List<XzdSupplierOpenBank> xzdSupplierOpenBanks = xzdSupplierOpenBankService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdSupplierOpenBank>().eq(XzdSupplierOpenBank::getSupplierId, id));
         dto.setXzdSettlementInfo(MapstructUtils.convert(xzdSettlementInfo, XzdSettlementInfoVo.class));
         if ( dto.getXzdSettlementInfo() != null) {
-//            dto.getXzdSettlementInfo().setOpenBanks(xzdSupplierOpenBanks);
+            //处理开户银行
+            LambdaQueryWrapper<XzdYhxx> bankLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            bankLambdaQueryWrapper.eq(XzdYhxx::getMainId,dto.getXzdSettlementInfo().getId());
+            List<XzdYhxx> xzdYhxxList = xzdYhxxService.list(bankLambdaQueryWrapper);
+            if (xzdYhxxList!= null && !xzdYhxxList.isEmpty()) {
+                List<XzdSupplierOpenBank> openBanks = new ArrayList<>();
+                for (XzdYhxx yhxx : xzdYhxxList) {
+                    XzdSupplierOpenBank byId = xzdSupplierOpenBankService.getById(yhxx.getYhId());
+                    if (byId != null){
+                        openBanks.add(byId);
+                    }
+                    if ( yhxx != null && "1".equals(yhxx.getSfmr())){
+                        if (byId!= null){
+                            dto.getXzdSettlementInfo().setOpeningBank(byId.getOpenBank());
+                            dto.getXzdSettlementInfo().setAccountNumber(byId.getAccount());
+                            dto.getXzdSettlementInfo().setAccountName(byId.getOpenBank());
+                        }else {
+                            dto.getXzdSettlementInfo().setOpeningBank("暂无数据");
+                            dto.getXzdSettlementInfo().setAccountNumber("暂无数据");
+                            dto.getXzdSettlementInfo().setAccountName("暂无数据");
+                        }
+                    }
+                }
+                dto.getXzdSettlementInfo().setOpenBanks(openBanks);
+            }
 
         }
 
 
+
         //      业务信息
 
         XzdBusinessInfo xzdBusinessInfo = xzdBusinessInfoService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdBusinessInfo>().eq(XzdBusinessInfo::getCustomerinformationId, id));
@@ -679,7 +742,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         //      结算信息
 
         xzdSettlementInfoService.removeByMap(temp);
-//        xzdSupplierOpenBankService.getBaseMapper().delete(new LambdaQueryWrapper<XzdSupplierOpenBank>().eq(XzdSupplierOpenBank::getSupplierId, dto));
+        xzdYhxxService.getBaseMapper().delete(new LambdaQueryWrapper<XzdYhxx>().eq(XzdYhxx::getMainId, dto));
 
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/controller/SettlementOfSubcontractingCompletionController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysWgcbtbService;
 import org.dromara.xzd.domain.vo.XzdSettlementRulesVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +38,8 @@ public class SettlementOfSubcontractingCompletionController extends BaseControll
 
     private final ISettlementOfSubcontractingCompletionService settlementOfSubcontractingCompletionService;
 
+    private final IXzdCbysWgcbtbService xzdCbysWgcbtbService;
+
     /**
      * 查询分包合同竣工结算列表
      */
@@ -118,4 +121,5 @@ public class SettlementOfSubcontractingCompletionController extends BaseControll
 
 
 
+
 }