10-13-承包合同信息完善，合作协议完善

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

@@ -97,4 +97,10 @@ public class XzdProjectTypeController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(xzdProjectTypeService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    @GetMapping("/getBigType/{id}")
+    public R<XzdProjectTypeVo> getBigType(@PathVariable Long id) {
+        return R.ok(xzdProjectTypeService.getBigType(id));
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractAgreement.java

@@ -63,7 +63,7 @@ public class XzdContractAgreement extends BaseEntity {
     /**
      * 公司名称
      */
-    private String companyName;
+//    private String companyName;
 
     /**
      * 签订日期

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java

@@ -129,7 +129,7 @@ public class XzdProject extends BaseEntity {
     /**
      * 涉及财务组织
      */
-    private Long involvedFinancialOrganization;
+    private String involvedFinancialOrganization;
 
     /**
      * 经营模式
@@ -179,7 +179,7 @@ public class XzdProject extends BaseEntity {
     /**
      * 共享组织
      */
-    private Long sharingOrganization;
+    private String sharingOrganization;
 
     /**
      * 目标中标金额

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java

@@ -152,7 +152,7 @@ public class XzdProjectBo extends BaseEntity {
     /**
      * 涉及财务组织
      */
-    private Long involvedFinancialOrganization;
+    private String involvedFinancialOrganization;
 
     /**
      * 涉及财务组织名
@@ -209,7 +209,7 @@ public class XzdProjectBo extends BaseEntity {
     /**
      * 共享组织
      */
-    private Long sharingOrganization;
+    private String sharingOrganization;
 
     /**
      * 共享组织名

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java

@@ -240,6 +240,11 @@ public class XzdContractDetailsVo implements Serializable {
     @ExcelProperty(value = "项目责任人")
     private Long projectResponsiblePerson;
 
+    /**
+     * 项目责任责任人名称
+     */
+    private String projectResponsiblePersonName;
+
     /**
      * 是否需备案
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java

@@ -181,7 +181,7 @@ public class XzdProjectVo implements Serializable {
      * 涉及财务组织
      */
     @ExcelProperty(value = "涉及财务组织")
-    private Long involvedFinancialOrganization;
+    private String involvedFinancialOrganization;
 
     /**
      * 涉及财务组织名
@@ -251,7 +251,7 @@ public class XzdProjectVo implements Serializable {
      * 共享组织
      */
     @ExcelProperty(value = "共享组织")
-    private Long sharingOrganization;
+    private String sharingOrganization;
 
     /**
      * 共享组织名

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

@@ -63,4 +63,6 @@ public interface IXzdProjectTypeService extends IService<XzdProjectType>{
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<Tree<String>> buildMenuTreeSelect(List<XzdProjectTypeVo> list);
+
+    XzdProjectTypeVo getBigType(Long id);
 }

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

@@ -103,7 +103,7 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
         lqw.eq(bo.getDocumentDate() != null, XzdContractAgreement::getDocumentDate, bo.getDocumentDate());
         lqw.eq(bo.getPartyAUnit() != null, XzdContractAgreement::getPartyAUnit, bo.getPartyAUnit());
         lqw.eq(bo.getPartyBUnit() != null, XzdContractAgreement::getPartyBUnit, bo.getPartyBUnit());
-        lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), XzdContractAgreement::getCompanyName, bo.getCompanyName());
+//        lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), XzdContractAgreement::getCompanyName, bo.getCompanyName());
         lqw.eq(bo.getSigningDate() != null, XzdContractAgreement::getSigningDate, bo.getSigningDate());
         lqw.eq(bo.getTotalTaxInclusiveAmount() != null, XzdContractAgreement::getTotalTaxInclusiveAmount, bo.getTotalTaxInclusiveAmount());
         lqw.eq(StringUtils.isNotBlank(bo.getAgreementType()), XzdContractAgreement::getAgreementType, bo.getAgreementType());
@@ -159,7 +159,9 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
                 deleteIds.add(Long.valueOf(oldFile));
             }
         }
+        if (!deleteIds.isEmpty()) {
             sysOssService.deleteWithValidByIds(deleteIds, false);
+        }
 
         return baseMapper.updateById(update) > 0;
     }
@@ -196,17 +198,21 @@ public class XzdContractAgreementServiceImpl extends ServiceImpl<XzdContractAgre
     public void setValue(List<XzdContractAgreementVo> vos){
         for (XzdContractAgreementVo vo : vos) {
             //客户单位
+            if (vo.getPartyAUnit() != null) {
                 R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getPartyAUnit());
                 if (byid != null) {
                     if (byid.getData().getXzdCustomerinformation() != null) {
                         vo.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
                     }
                 }
+            }
             //供应商单位
+            if (vo.getPartyBUnit() != null) {
                 XzdSupplierInfoVo supplierInfoVo = xzdSupplierInfoService.queryById(vo.getPartyBUnit());
                 if (supplierInfoVo != null) {
                     vo.setPartyBUnitName(supplierInfoVo.getUnitName());
                 }
+            }
             //部门公司
             SysDeptVo sysDeptVo = sysDeptService.selectDeptById(vo.getCompanyId());
             if (sysDeptVo != null){

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

@@ -14,8 +14,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.ctr.domain.ContractPaymentClause;
 import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.impl.SysDeptServiceImpl;
 import org.dromara.system.service.impl.SysOssServiceImpl;
+import org.dromara.system.service.impl.SysUserServiceImpl;
 import org.dromara.xzd.domain.*;
 import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
 import org.dromara.xzd.domain.vo.*;
@@ -65,6 +67,8 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
     private XzdSupplierInfoServiceImpl xzdSupplierInfoService;
     @Autowired
     private XzdBusinessSealServiceImpl xzdBusinessSealService;
+    @Autowired
+    private SysUserServiceImpl sysUserService;
 
     /**
      * 查询承包合同信息
@@ -432,6 +436,11 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
             List<XzdContractDepositInfo> list3 = xzdContractDepositInfoService.list(lambdaQueryWrapper4);
             info.setHtzytqyd(list3);
 
+            //项目责任人
+            SysUserVo sysUserVo = sysUserService.selectUserById(info.getProjectResponsiblePerson());
+            if (sysUserVo != null){
+                info.setProjectResponsiblePersonName(sysUserVo.getNickName());
+            }
         }
     }
 

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

@@ -598,23 +598,52 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
         /**
          * 涉及财务组织
          */
-        if (entity.getInvolvedFinancialOrganization() != null){
+        if (entity.getInvolvedFinancialOrganization() != null && !entity.getInvolvedFinancialOrganization().isEmpty()){
-            SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getInvolvedFinancialOrganization());
+
+            List<String> list = Arrays.stream(entity.getInvolvedFinancialOrganization().split(",")).toList();
+
+            List<String> name = new ArrayList<>();
+
+            for (String s : list) {
+                SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(Long.valueOf(s));
                 if (sysDeptVo != null) {
-                entity.setInvolvedFinancialOrganizationName(sysDeptVo.getDeptName());
+                    name.add(sysDeptVo.getDeptName());
+                }
+            }
+
+
+            if (!name.isEmpty()){
+                entity.setInvolvedFinancialOrganizationName(String.join(",", name));
             }
         }
 
         /**
          * 共享组织
          */
-        if (entity.getSharingOrganization() != null){
+        if (entity.getSharingOrganization() != null && !entity.getSharingOrganization().isEmpty()){
-            SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getSharingOrganization());
+
+            List<String> list = Arrays.stream(entity.getSharingOrganization().split(",")).toList();
+
+            List<String> name = new ArrayList<>();
+
+            for (String s : list) {
+                SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(Long.valueOf(s));
                 if (sysDeptVo != null) {
-                entity.setSharingOrganizationName(sysDeptVo.getDeptName());
+                    name.add(sysDeptVo.getDeptName());
                 }
             }
 
+
+            if (!name.isEmpty()){
+                entity.setSharingOrganizationName(String.join(",", name));
+            }
+
+//            SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getSharingOrganization());
+//            if (sysDeptVo != null){
+//                entity.setSharingOrganizationName(sysDeptVo.getDeptName());
+//            }
+        }
+
     }
 
 }

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

@@ -185,4 +185,11 @@ public class XzdProjectTypeServiceImpl extends ServiceImpl<XzdProjectTypeMapper,
 //
 //        return treeList;
     }
+
+    @Override
+    public XzdProjectTypeVo getBigType(Long id){
+
+        return null;
+    }
+
 }