10-22-bug修复

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

@@ -379,7 +379,7 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
                     R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getSupervision());
                     if (byid2 != null) {
                         if (byid2.getData().getXzdCustomerinformation() != null) {
-                            vo.setOwnerName(byid2.getData().getXzdCustomerinformation().getUnitName());
+                            vo.setSupervisionName(byid2.getData().getXzdCustomerinformation().getUnitName());
                         }
                     }
                 }

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

@@ -81,6 +81,8 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
     private XzdSupplierOpenBankServiceImpl xzdSupplierOpenBankService;
     @Autowired
     private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
+    @Autowired
+    private XzdProjectTypeServiceImpl xzdProjectTypeService;
 
     /**
      * 查询承包合同信息
@@ -460,6 +462,10 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
                 if (projectVo != null) {
                     info.setProjectName(projectVo.getProjectName());
                     info.setProjectType(projectVo.getProjectTypeName());
+                    XzdProjectTypeVo bigType = xzdProjectTypeService.getBigType(projectVo.getProjectType());
+                    if (bigType != null){
+                        info.setProjectCategory(bigType.getTypeName());
+                    }
                 }
             }
             //甲方单位(客户信息列表)

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

@@ -184,4 +184,9 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    public void setValue(List<XzdContractTerminationVo> vos){
+
+    }
+
 }

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

@@ -758,8 +758,9 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
             bankLambdaQueryWrapper.clear();
             bankLambdaQueryWrapper.eq(XzdSupplierOpenBank::getSupplierId,vo.getId());
             List<XzdSupplierOpenBank> openBanks = xzdSupplierOpenBankService.list(bankLambdaQueryWrapper);
-            vo.getSettlement().setOpenBanks(openBanks);
+            if (vo.getSettlement() != null && openBanks != null && !openBanks.isEmpty()) {
-
+                vo.getSettlement().setOpenBanks(openBanks);
+            }
             //处理业务信息
             LambdaQueryWrapper<XzdBusinessInfo> businessInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
             businessInfoLambdaQueryWrapper.eq(XzdBusinessInfo::getCustomerinformationId,vo.getId()).eq(XzdBusinessInfo::getType,"2");

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java

@@ -70,6 +70,11 @@ public class XzdContractPaymentVo implements Serializable {
     @ExcelProperty(value = "合同id")
     private Long contractId;
 
+    /**
+     * 合同名称
+     */
+    private String contractName;
+
     /**
      * 合同编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java

@@ -297,6 +297,8 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
                     xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
                     //合同编码
                     vo.setContractCode(xzdContractDetailsVo.getContractCode());
+                    //合同名称
+                    vo.setContractName(xzdContractDetailsVo.getContractName());
                 }
             }
             //收款银行名称