Merge remote-tracking branch 'origin/dev' into dev

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java

@@ -129,4 +129,10 @@ public class XzdPurchaseContractSuspendBo extends BaseEntity {
     private String auditStatus;
 
 
+    private LocalDate startDate;
+
+
+    private LocalDate endDate;
+
+
 }

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

@@ -150,6 +150,11 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
         lqw.eq(StringUtils.isNotBlank(bo.getReceiptsCode()), XzdPurchaseContractSuspend::getReceiptsCode, bo.getReceiptsCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdPurchaseContractSuspend::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getDocumentDate());
+        lqw.ge(bo.getStartDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getStartDate());
+        lqw.le(bo.getEndDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getEndDate());
+
+
+
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdPurchaseContractSuspend::getContractName, bo.getContractName());
         lqw.eq(bo.getTerminationDate() != null, XzdPurchaseContractSuspend::getTerminationDate, bo.getTerminationDate());
         lqw.eq(StringUtils.isNotBlank(bo.getProject()), XzdPurchaseContractSuspend::getProject, bo.getProject());

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

@@ -91,6 +91,9 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
     @Override
     public XzdSubcontractVo queryById(Long id){
         XzdSubcontractVo xzdSubcontractVo = baseMapper.selectVoById(id);
+        if (xzdSubcontractVo == null){
+            return null;
+        }
         List<XzdSubcontractVo> informationVo = List.of(xzdSubcontractVo);
         //        装填数据
         setValue(informationVo);

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

@@ -153,6 +153,7 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      * 管理组织名称
      */
     @ExcelProperty(value = "管理组织名称")
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "managementOrganization")
     private String managementOrganizationName;
 
     /**
@@ -239,7 +240,6 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      * 其他收入合同项目名称
      */
     @ExcelProperty(value = "其他收入合同项目名称")
-    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "otherIncomeContractProject")
     private String otherIncomeContractProjectName;
 
     /**
@@ -316,6 +316,12 @@ public class XzdPurchaseContractInformationVo implements Serializable {
     @ExcelProperty(value = "关联主合同")
     private String associatedMainContract;
 
+    /**
+     * 关联主合同
+     */
+    @ExcelProperty(value = "关联主合同")
+    private String associatedMainContractName;
+
     /**
      * 项目责任人
      */

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

@@ -410,6 +410,17 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
                     item.setProjectName(projectName);
                 }
             }
+
+            //其他项目名称
+            if (item.getProject() != null){
+                if (StringUtils.isNotEmpty(item.getAssociatedMainContract())){
+                    String projectName = xzdProjectService.queryNameById(Long.parseLong(item.getAssociatedMainContract()));
+                    if (projectName != null){
+                        item.setAssociatedMainContractName(projectName);
+                    }
+                }
+
+            }
             //其他收入合同项目名称
             if (item.getOtherIncomeContractProject() != null){
                 String projectName = xzdProjectService.queryNameById(item.getOtherIncomeContractProject());
@@ -431,12 +442,12 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
                     item.setPartyBUnitName(unitName);
                 }
             }
-            //管理组织(供应商)
+//            //管理组织
-            String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit());
+//            String unitName = xzdSupplierInfoService.queryNameById(item.getManagementOrganization());
-
+//
-            if (unitName != null){
+//            if (unitName != null){
-                item.setManagementOrganizationName(unitName);
+//                item.setManagementOrganizationName(unitName);
-            }
+//            }
             //开票单位名称(供应商名称)
             String unitName1 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit());
             if (unitName1 != null){

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java

@@ -1,8 +1,6 @@
 package org.dromara.xzd.costProjectApproval.costBudget.domain.bo;
 
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysSscb;
+import org.dromara.xzd.costProjectApproval.costBudget.domain.*;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZjhcbAlteration;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -10,7 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZtjhcbBgjl;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -164,7 +161,7 @@ public class XzdCbysZjhcbAlterationBo extends BaseEntity {
     /**
      * 成本明细
      */
-    List<XzdCbysWgcbtbFubiao> xzdCbysWgcbtbFubiao;
+    List<XzdCbysZjhcbFubiao> xzdCbysWgcbtbFubiao;
 
     /**
      * 税收成本

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java

@@ -4,16 +4,13 @@ import java.math.BigDecimal;
 
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysSscb;
+import org.dromara.xzd.costProjectApproval.costBudget.domain.*;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZjhcbAlteration;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZtjhcbBgjl;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -223,7 +220,7 @@ public class XzdCbysZjhcbAlterationVo implements Serializable {
     /**
      * 成本明细
      */
-    List<XzdCbysWgcbtbFubiao> xzdCbysWgcbtbFubiao;
+    List<XzdCbysZjhcbFubiao> xzdCbysWgcbtbFubiao;
 
     /**
      * 税收成本

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java

@@ -13,21 +13,15 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.utils.BatchNumberGenerator;
 import org.dromara.system.service.ISysUserService;
 import org.dromara.system.service.impl.SysOssServiceImpl;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysSscb;
+import org.dromara.xzd.costProjectApproval.costBudget.domain.*;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysWgcbtbFubiao;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZtjhcbBgjl;
 import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbVo;
-import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysSscbService;
+import org.dromara.xzd.costProjectApproval.costBudget.service.*;
-import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysWgcbtbFubiaoService;
-import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZtjhcbBgjlService;
 import org.dromara.xzd.service.impl.XzdProjectServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.dromara.xzd.costProjectApproval.costBudget.domain.bo.XzdCbysZjhcbAlterationBo;
 import org.dromara.xzd.costProjectApproval.costBudget.domain.vo.XzdCbysZjhcbAlterationVo;
-import org.dromara.xzd.costProjectApproval.costBudget.domain.XzdCbysZjhcbAlteration;
 import org.dromara.xzd.costProjectApproval.costBudget.mapper.XzdCbysZjhcbAlterationMapper;
-import org.dromara.xzd.costProjectApproval.costBudget.service.IXzdCbysZjhcbAlterationService;
 
 import java.util.*;
 
@@ -57,6 +51,9 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl<XzdCbysZjhcbA
     @Autowired
     private ISysUserService sysUserService;
 
+
+    private final IXzdCbysZjhcbFubiaoService iXzdCbysZjhcbFubiaoService;
+
     /**
      * 查询立项及成本-成本预算-总体计划成本变更
      *
@@ -118,7 +115,9 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl<XzdCbysZjhcbA
         vo.setXzdCbysZtjhcbBgjl(xzdCbysZtjhcbBgjls);
         List<XzdCbysSscb> xzdCbysSscbs = xzdCbysSscbService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdCbysSscb>().eq(XzdCbysSscb::getMainDocumentId, vo.getId()));
         vo.setXzdCbysSscb(xzdCbysSscbs);
-        List<XzdCbysWgcbtbFubiao> xzdCbysWgcbtbFubiaos = fubiaoService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdCbysWgcbtbFubiao>().eq(XzdCbysWgcbtbFubiao::getMainDocId, vo.getId()));
+
+
+        List<XzdCbysZjhcbFubiao> xzdCbysWgcbtbFubiaos = iXzdCbysZjhcbFubiaoService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdCbysZjhcbFubiao>().eq(XzdCbysZjhcbFubiao::getMainDocumentId, vo.getId()));
         vo.setXzdCbysWgcbtbFubiao(xzdCbysWgcbtbFubiaos);
     }
     private LambdaQueryWrapper<XzdCbysZjhcbAlteration> buildQueryWrapper(XzdCbysZjhcbAlterationBo bo) {
@@ -177,8 +176,8 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl<XzdCbysZjhcbA
         xzdCbysSscbService.saveBatch(bo.getXzdCbysSscb());
         bo.getXzdCbysZtjhcbBgjl().forEach(item -> {item.setMainDocumentId(add.getId());});
         xzdCbysZtjhcbBgjlService.saveBatch(bo.getXzdCbysZtjhcbBgjl());
-        bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocId(add.getId());});
+        bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocumentId(add.getId());});
-        fubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao());
+        iXzdCbysZjhcbFubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao());
         if (flag) {
             bo.setId(add.getId());
         }
@@ -206,13 +205,13 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl<XzdCbysZjhcbA
         }
         xzdCbysZtjhcbBgjlService.remove(new LambdaQueryWrapper<XzdCbysZtjhcbBgjl>().eq(XzdCbysZtjhcbBgjl::getMainDocumentId, bo.getId()));
         xzdCbysSscbService.remove(new LambdaQueryWrapper<XzdCbysSscb>().eq(XzdCbysSscb::getMainDocumentId, bo.getId()));
-        fubiaoService.remove(new LambdaQueryWrapper<XzdCbysWgcbtbFubiao>().eq(XzdCbysWgcbtbFubiao::getMainDocId, bo.getId()));
+        iXzdCbysZjhcbFubiaoService.remove(new LambdaQueryWrapper<XzdCbysZjhcbFubiao>().eq(XzdCbysZjhcbFubiao::getMainDocumentId, bo.getId()));
         bo.getXzdCbysSscb().forEach(item -> {item.setMainDocumentId(bo.getId());});
         xzdCbysSscbService.saveBatch(bo.getXzdCbysSscb());
         bo.getXzdCbysZtjhcbBgjl().forEach(item -> {item.setMainDocumentId(bo.getId());});
         xzdCbysZtjhcbBgjlService.saveBatch(bo.getXzdCbysZtjhcbBgjl());
-        bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocId(bo.getId());});
+        bo.getXzdCbysWgcbtbFubiao().forEach(item -> {item.setMainDocumentId(bo.getId());});
-        fubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao());
+        iXzdCbysZjhcbFubiaoService.saveBatch(bo.getXzdCbysWgcbtbFubiao());
         return baseMapper.updateById(update) > 0;
     }
 

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

@@ -6,6 +6,8 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.xzd.domain.bo.XzdCustomerDetailBo;
 
 import java.util.Date;
@@ -61,6 +63,12 @@ public class XzdClienteleListVo {
      */
     private Long createBy;
 
+    /**
+     * 创建者
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
     /**
      * 创建时间
      */

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

@@ -134,7 +134,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
             xzdCustomertypeInfoService.saveBatch(collect);
 
             for (XzdCustomertypeInfo customertypeInfo : collect) {
-                if (customertypeInfo.getPrimaryClass() == "1"){
+                if (customertypeInfo.getPrimaryClass().equals("1")){
                     XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId());
                     if (xzdCustomertype != null){
                         customertype = xzdCustomertype.getCustomerType();
@@ -353,7 +353,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
             }).collect(Collectors.toList());
             xzdCustomertypeInfoService.saveBatch(collect);
             for (XzdCustomertypeInfo customertypeInfo : collect) {
-                if (customertypeInfo.getPrimaryClass() == "1"){
+                if (customertypeInfo.getPrimaryClass().equals("1")){
                     XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId());
                     if (xzdCustomertype != null){
                         customertype = xzdCustomertype.getCustomerType();