10-27-修改bug

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/controller/XzdContractPaymentController.java

@@ -1,26 +1,27 @@
 package org.dromara.xzd.skyfk.cbhtsc.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
+import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.validation.annotation.Validated;
+import jakarta.validation.constraints.NotEmpty;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import jakarta.validation.constraints.NotNull;
-import org.dromara.common.log.annotation.Log;
+import lombok.RequiredArgsConstructor;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.xzd.skyfk.cbhtsc.domain.vo.XzdContractPaymentVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.xzd.skyfk.cbhtsc.domain.bo.XzdContractPaymentBo;
+import org.dromara.common.log.annotation.Log;
-import org.dromara.xzd.skyfk.cbhtsc.service.IXzdContractPaymentService;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.xzd.skyfk.cbhtsc.domain.bo.XzdContractPaymentBo;
+import org.dromara.xzd.skyfk.cbhtsc.domain.vo.XzdContractPaymentVo;
+import org.dromara.xzd.skyfk.cbhtsc.service.IXzdContractPaymentService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 承包合同收款
@@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/skyfk/contractPayment")
+@RequestMapping("/xzd/skyfk/contractPayment")
 public class XzdContractPaymentController extends BaseController {
 
     private final IXzdContractPaymentService xzdContractPaymentService;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/XzdSpykpSjsqd.java

@@ -1,17 +1,17 @@
 package org.dromara.xzd.spykp.sjsqd.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serial;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import java.io.Serial;
-
 /**
  * 收据申请单对象 xzd_spykp_sjsqd
  *
@@ -32,6 +32,11 @@ public class XzdSpykpSjsqd extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 1承包2分包3采购4综合
+     */
+    private String htlx;
+
     /**
      * 部门id
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java

@@ -1,14 +1,15 @@
 package org.dromara.xzd.spykp.sjsqd.domain.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
@@ -31,6 +32,11 @@ public class XzdSpykpSjsqdBo extends BaseEntity {
 //    @NotNull(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
+    /**
+     * 1承包2分包3采购4综合
+     */
+    private String htlx;
+
     /**
      * 类型id
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java

@@ -36,6 +36,11 @@ public class XzdSpykpSjsqdVo implements Serializable {
     @ExcelProperty(value = "id")
     private Long id;
 
+    /**
+     * 1承包2分包3采购4综合
+     */
+    private String htlx;
+
     /**
      *  类型
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java

@@ -17,13 +17,16 @@ 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.comprehensive.domain.XzdCsContractInformation;
+import org.dromara.xzd.comprehensive.service.impl.XzdCsContractInformationServiceImpl;
+import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract;
+import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.impl.XzdSubcontractServiceImpl;
+import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation;
+import org.dromara.xzd.contractManagement.purchaseManagement.service.impl.XzdPurchaseContractInformationServiceImpl;
 import org.dromara.xzd.domain.XzdContractDetails;
 import org.dromara.xzd.domain.XzdProject;
-import org.dromara.xzd.domain.vo.XzdSolutionSelectionVo;
-import org.dromara.xzd.service.IXzdCorrespondentList;
 import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl;
 import org.dromara.xzd.service.impl.XzdProjectServiceImpl;
-import org.dromara.xzd.service.impl.XzdSolutionSelectionServiceImpl;
 import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
 import org.dromara.xzd.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo;
 import org.dromara.xzd.spykp.sjsqd.domain.vo.XzdSpykpSjsqdVo;
@@ -57,11 +60,13 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
     @Autowired
     private XzdContractDetailsServiceImpl xzdContractDetailsService;
     @Autowired
-    private IXzdCorrespondentList iXzdCorrespondentList;
-    @Autowired
     private SysDeptServiceImpl sysDeptService;
     @Autowired
-    private XzdSolutionSelectionServiceImpl xzdSolutionSelectionService;
+    private XzdCsContractInformationServiceImpl xzdCsContractInformationService;
+    @Autowired
+    private XzdSubcontractServiceImpl xzdSubcontractService;
+    @Autowired
+    private XzdPurchaseContractInformationServiceImpl xzdPurchaseContractInformationService;
 
     /**
      * 查询收据申请单
@@ -221,6 +226,7 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
     }
 
     public void setValue(List<XzdSpykpSjsqdVo> vos){
+        //1承包2分包3采购4综合
         for (XzdSpykpSjsqdVo vo : vos) {
             //申请人名称
             if (vo.getSqrId() != null){
@@ -243,6 +249,10 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
             }
             //合同名称
             if (vo.getHtId() != null){
+
+                switch (vo.getHtlx()){
+                    case "1":
+                        //承包合同
                         XzdContractDetails xzdContractDetailsVo = xzdContractDetailsService.getBaseMapper().selectById(vo.getHtId());
                         if (xzdContractDetailsVo != null){
                             vo.setHtmc(xzdContractDetailsVo.getContractName());
@@ -251,21 +261,46 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
                             //合同金额
                             vo.setHtje(xzdContractDetailsVo.getContractAmount());
                         }
+                        break;
+
+                    case "2":
+                        //分包
+                        XzdSubcontract xzdSubcontract = xzdSubcontractService.getBaseMapper().selectById(vo.getHtId());
+                        if (xzdSubcontract != null){
+                            vo.setHtmc(xzdSubcontract.getContractName());
+                            //合同编号
+                            vo.setHtbh(xzdSubcontract.getContractCode());
+                            //合同金额
+                            vo.setHtje(xzdSubcontract.getTaxInclusiveContractAmount());
                         }
-            //付款单位名称
+                        break;
-//            if (vo.getFkdwId() != null){
+
-//                R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getFkdwId());
+                    case "3":
-//                if (byid2 != null) {
+                        //采购
-//                    if (byid2.getData().getXzdCustomerinformation() != null) {
+                        XzdPurchaseContractInformation selectById = xzdPurchaseContractInformationService.getBaseMapper().selectById(vo.getHtId());
-//                        vo.setFkdwmc(byid2.getData().getXzdCustomerinformation().getUnitName());
+                        if (selectById != null){
-//                    }
+                            vo.setHtmc(selectById.getContractName());
-//                }
+                            //合同编号
-//            }
+                            vo.setHtbh(selectById.getContractCode());
-            //类型名称
+                            //合同金额
-            if (vo.getType() != null){
+                            vo.setHtje(selectById.getTaxInclusiveContractAmount());
-                XzdSolutionSelectionVo solutionSelectionVo = xzdSolutionSelectionService.queryById(vo.getType());
+                        }
-                if (solutionSelectionVo != null){
+                        break;
-                    vo.setTypeName(solutionSelectionVo.getName());
+
+                    case "4":
+                        //综合
+                        XzdCsContractInformation information = xzdCsContractInformationService.getBaseMapper().selectById(vo.getHtId());
+                        if (information != null){
+                            vo.setHtmc(information.getContractName());
+                            //合同编号
+                            vo.setHtbh(information.getContractCode());
+                            //合同金额
+                            vo.setHtje(information.getTaxIncludedAmount());
+                        }
+                        break;
+
+                        default:
+                        break;
                 }
             }
         }