详情权限取消

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java

@@ -668,11 +668,13 @@ public class MatMaterialsServiceImpl extends ServiceImpl<MatMaterialsMapper, Mat
             BeanUtils.copyProperties(material, vo);
             Long id = material.getId();
             MatMaterialsInventory put = putMap.get(id);
-            vo.setSupplier(put.getRecipient());
+            if (put != null) {
-            vo.setInventoryId(put.getId());
+                vo.setSupplier(put.getRecipient());
-            vo.setNumber(put.getNumber());
+                vo.setInventoryId(put.getId());
-            vo.setOperator(put.getOperator());
+                vo.setNumber(put.getNumber());
-            vo.setEnterTime(put.getCreateTime());
+                vo.setOperator(put.getOperator());
+                vo.setEnterTime(put.getCreateTime());
+            }
             if (CollUtil.isNotEmpty(outList)) {
                 List<MatMaterialsInventory> outs = outList.stream()
                     .filter(inventory -> inventory.getMaterialsId().equals(id))

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java

@@ -333,10 +333,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             }
 
             //打卡范围
-            if (!checkInRange(req)) {
+            if (!"1".equals(req.getSource())){
-                throw new ServiceException("打卡位置不在范围内", HttpStatus.ERROR);
+                if (!checkInRange(req)) {
+                    throw new ServiceException("打卡位置不在范围内", HttpStatus.ERROR);
+                }
             }
-
             //用户信息校验
             SubConstructionUser constructionUser = constructionUserService.getBySysUserId(userId);
             if ("1".equals(constructionUser.getStatus())) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdBidPreProjectController.java

@@ -81,7 +81,7 @@ public class XzdBidPreProjectController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingManagement:bidPreProject:query")
+    //@SaCheckPermission("biddingManagement:bidPreProject:query")
     @GetMapping("/{id}")
     public R<QuerListXzdBidPreVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/controller/XzdProjectRiskAssessmentController.java

@@ -62,7 +62,7 @@ public class XzdProjectRiskAssessmentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:projectRiskAssessment:query")
+    //@SaCheckPermission("xzd:projectRiskAssessment:query")
     @GetMapping("/{id}")
     public R<XzdProjectRiskAssessmentVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/controller/XzdBiddingFileEstimateController.java

@@ -61,7 +61,7 @@ public class XzdBiddingFileEstimateController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:biddingFileEstimate:query")
+   // @SaCheckPermission("biddingDocument:biddingFileEstimate:query")
     @GetMapping("/{id}")
     public R<XzdBiddingFileEstimateVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdBiddingDocumentController.java

@@ -64,7 +64,7 @@ public class XzdBiddingDocumentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:biddingDocument:query")
+  //  @SaCheckPermission("biddingDocument:biddingDocument:query")
     @GetMapping("/{id}")
     public R<XzdBiddingDocumentVoBylist> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdTbwjBusinessBidController.java

@@ -62,7 +62,7 @@ public class XzdTbwjBusinessBidController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:tbwjBusinessBid:query")
+   // @SaCheckPermission("biddingDocument:tbwjBusinessBid:query")
     @GetMapping("/{id}")
     public R<XzdTbwjBusinessBidVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdTbwjBusinessBidRequirementsController.java

@@ -62,7 +62,7 @@ public class XzdTbwjBusinessBidRequirementsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:tbwjBusinessBidRequirements:query")
+   // @SaCheckPermission("biddingDocument:tbwjBusinessBidRequirements:query")
     @GetMapping("/{id}")
     public R<XzdTbwjBusinessBidRequirementsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdTbwjQualificationRequirementsController.java

@@ -62,7 +62,7 @@ public class XzdTbwjQualificationRequirementsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:tbwjQualificationRequirements:query")
+   // @SaCheckPermission("biddingDocument:tbwjQualificationRequirements:query")
     @GetMapping("/{id}")
     public R<XzdTbwjQualificationRequirementsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdTbwjTechnicalBidController.java

@@ -62,7 +62,7 @@ public class XzdTbwjTechnicalBidController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:tbwjTechnicalBid:query")
+   // @SaCheckPermission("biddingDocument:tbwjTechnicalBid:query")
     @GetMapping("/{id}")
     public R<XzdTbwjTechnicalBidVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/controller/XzdTbwjTechnicalBidRequirementsController.java

@@ -62,7 +62,7 @@ public class XzdTbwjTechnicalBidRequirementsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingDocument:tbwjTechnicalBidRequirements:query")
+   // @SaCheckPermission("biddingDocument:tbwjTechnicalBidRequirements:query")
     @GetMapping("/{id}")
     public R<XzdTbwjTechnicalBidRequirementsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java

@@ -74,6 +74,12 @@ public class XzdBiddingDocumentVo implements Serializable {
     @ExcelProperty(value = "项目类型ID")
     private Long projectType;
 
+    /**
+     * 项目类型ID
+     */
+    @ExcelProperty(value = "项目类型ID")
+    private String projectTypeName;
+
     /**
      * 投标单位
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java

@@ -25,6 +25,8 @@ import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdBidding
 import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjBusinessBidService;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjTechnicalBidService;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjZsyqService;
+import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
+import org.dromara.xzd.service.IXzdProjectTypeService;
 import org.dromara.xzd.utilS.AreaUtil;
 import org.locationtech.jts.edgegraph.HalfEdge;
 import org.springframework.beans.BeanUtils;
@@ -59,6 +61,8 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
 
     private final IXzdTbwjZsyqService iXzdTbwjZsyqService;
 
+    private final IXzdProjectTypeService xzdProjectTypeService;
+
     /**
      * 查询投标文件
      *
@@ -94,9 +98,25 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
     public TableDataInfo<XzdBiddingDocumentVo> queryPageList(XzdBiddingDocumentBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<XzdBiddingDocument> lqw = buildQueryWrapper(bo);
         Page<XzdBiddingDocumentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::getName);
+
         return TableDataInfo.build(result);
     }
 
+    private void getName(XzdBiddingDocumentVo xzdBiddingDocumentVo) {
+
+        if (xzdBiddingDocumentVo != null){
+            Long projectType = xzdBiddingDocumentVo.getProjectType();
+            if (projectType != null){
+                XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(projectType);
+                if (xzdProjectTypeVo != null){
+                    xzdBiddingDocumentVo.setProjectTypeName(xzdProjectTypeVo.getTypeName());
+                }
+            }
+        }
+
+    }
+
     /**
      * 查询符合条件的投标文件列表
      *

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoney/controller/XzdBidDepositPaymentController.java

@@ -63,7 +63,7 @@ public class XzdBidDepositPaymentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("earnestMoney:bidDepositPayment:query")
+    //@SaCheckPermission("earnestMoney:bidDepositPayment:query")
     @GetMapping("/{id}")
     public R<XzdBidDepositPaymentByBqlx> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/controller/XzdBidDepositRecoveryController.java

@@ -63,7 +63,7 @@ public class XzdBidDepositRecoveryController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("biddingManagement:bidDepositRecovery:query")
+   // @SaCheckPermission("biddingManagement:bidDepositRecovery:query")
     @GetMapping("/{id}")
     public R<XzdBidDepositRecoveryXqVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/controller/XzdBiddingAgencyFeePaymentController.java

@@ -61,7 +61,7 @@ public class XzdBiddingAgencyFeePaymentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("paymentapplication:biddingAgencyFeePayment:query")
+   // @SaCheckPermission("paymentapplication:biddingAgencyFeePayment:query")
     @GetMapping("/{id}")
     public R<XzdBiddingAgencyFeePaymentVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/controller/XzdPostBidAnalysisController.java

@@ -62,7 +62,7 @@ public class XzdPostBidAnalysisController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("postAnalysis:postBidAnalysis:query")
+   // @SaCheckPermission("postAnalysis:postBidAnalysis:query")
     @GetMapping("/{id}")
     public R<XzdPostBidAnalysisVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/XzdPostBidAnalysis.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -44,7 +45,7 @@ public class XzdPostBidAnalysis extends BaseEntity {
     /**
      * 工程造价(万元)
      */
-    private Long projectCost;
+    private BigDecimal projectCost;
 
     /**
      * 项目类型
@@ -79,12 +80,12 @@ public class XzdPostBidAnalysis extends BaseEntity {
     /**
      * 招标控制价(万元)
      */
-    private Long controlPrice;
+    private BigDecimal controlPrice;
 
     /**
      * 最终报价(万元)
      */
-    private Long finalQuote;
+    private BigDecimal finalQuote;
 
     /**
      * 投标结果
@@ -104,7 +105,7 @@ public class XzdPostBidAnalysis extends BaseEntity {
     /**
      * 最终报价(元)
      */
-    private Long finalQuoteYuan;
+    private BigDecimal finalQuoteYuan;
 
     /**
      * 最终报价(大写)

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/bo/XzdPostBidAnalysisBo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -45,7 +46,7 @@ public class XzdPostBidAnalysisBo extends BaseEntity {
     /**
      * 工程造价(万元)
      */
-    private Long projectCost;
+    private BigDecimal projectCost;
 
     /**
      * 项目类型
@@ -80,12 +81,12 @@ public class XzdPostBidAnalysisBo extends BaseEntity {
     /**
      * 招标控制价(万元)
      */
-    private Long controlPrice;
+    private BigDecimal controlPrice;
 
     /**
      * 最终报价(万元)
      */
-    private Long finalQuote;
+    private BigDecimal finalQuote;
 
     /**
      * 投标结果
@@ -106,7 +107,7 @@ public class XzdPostBidAnalysisBo extends BaseEntity {
     /**
      * 最终报价(元)
      */
-    private Long finalQuoteYuan;
+    private BigDecimal finalQuoteYuan;
 
     /**
      * 最终报价(大写)

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java

@@ -1,7 +1,11 @@
 package org.dromara.xzd.biddingManagement.postAnalysis.domain.vo;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -9,6 +13,8 @@ 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.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdBhfxDwpm;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdPostBidAnalysis;
 
@@ -54,7 +60,7 @@ public class XzdPostBidAnalysisVo implements Serializable {
      * 工程造价(万元)
      */
     @ExcelProperty(value = "工程造价(万元)")
-    private Long projectCost;
+    private BigDecimal projectCost;
 
     /**
      * 项目类型
@@ -96,13 +102,13 @@ public class XzdPostBidAnalysisVo implements Serializable {
      * 招标控制价(万元)
      */
     @ExcelProperty(value = "招标控制价(万元)")
-    private Long controlPrice;
+    private BigDecimal controlPrice;
 
     /**
      * 最终报价(万元)
      */
     @ExcelProperty(value = "最终报价(万元)")
-    private Long finalQuote;
+    private BigDecimal finalQuote;
 
     /**
      * 投标结果
@@ -127,7 +133,7 @@ public class XzdPostBidAnalysisVo implements Serializable {
      * 最终报价(元)
      */
     @ExcelProperty(value = "最终报价(元)")
-    private Long finalQuoteYuan;
+    private BigDecimal finalQuoteYuan;
 
     /**
      * 最终报价(大写)
@@ -153,6 +159,24 @@ public class XzdPostBidAnalysisVo implements Serializable {
     @ExcelProperty(value = "审核状态")
     private String auditStatus;
 
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
     private List<XzdBhfxDwpmVo> pm;
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java

@@ -61,7 +61,7 @@ public class XzdPurchaseContractSuspendController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("contractTermination:purchaseContractSuspend:query")
+//    @SaCheckPermission("contractTermination:purchaseContractSuspend:query")
     @GetMapping("/{id}")
     public R<XzdPurchaseContractSuspendVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/controller/XzdPurchaseContractAlterationController.java

@@ -61,7 +61,7 @@ public class XzdPurchaseContractAlterationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("hetongbiangeng:purchaseContractAlteration:query")
+  //  @SaCheckPermission("hetongbiangeng:purchaseContractAlteration:query")
     @GetMapping("/{id}")
     public R<XzdPurchaseContractAlterationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/controller/XzdSubcontractChangeController.java

@@ -61,7 +61,7 @@ public class XzdSubcontractChangeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("fenbaohetongbiangg:subcontractChange:query")
+   // @SaCheckPermission("fenbaohetongbiangg:subcontractChange:query")
     @GetMapping("/{id}")
     public R<XzdSubcontractChangeVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java

@@ -61,7 +61,7 @@ public class XzdSubcontractTerminationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("fenbaohetongzhongzhi:subcontractTermination:query")
+//    @SaCheckPermission("fenbaohetongzhongzhi:subcontractTermination:query")
     @GetMapping("/{id}")
     public R<XzdSubcontractTerminationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -64,7 +65,7 @@ public class XzdPurchaseContractInformation extends BaseEntity {
     /**
      * 原合同造价
      */
-    private Long originalContractCost;
+    private BigDecimal originalContractCost;
 
     /**
      * 签订日期
@@ -79,7 +80,7 @@ public class XzdPurchaseContractInformation extends BaseEntity {
     /**
      * 含税合同金额
      */
-    private Long taxInclusiveContractAmount;
+    private BigDecimal taxInclusiveContractAmount;
 
     /**
      * 合同状态，例如：新增
@@ -89,7 +90,7 @@ public class XzdPurchaseContractInformation extends BaseEntity {
     /**
      * 累计变更金额
      */
-    private Long cumulativeChangeAmount;
+    private BigDecimal cumulativeChangeAmount;
 
 
     private Long deptId;

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -68,7 +69,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity {
     /**
      * 原合同造价
      */
-    private Long originalContractCost;
+    private BigDecimal originalContractCost;
 
     /**
      * 签订日期
@@ -85,7 +86,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity {
     /**
      * 含税合同金额
      */
-    private Long taxInclusiveContractAmount;
+    private BigDecimal taxInclusiveContractAmount;
 
     /**
      * 合同状态，例如：新增
@@ -95,7 +96,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity {
     /**
      * 累计变更金额
      */
-    private Long cumulativeChangeAmount;
+    private BigDecimal cumulativeChangeAmount;
 
     /**
      * 归档日期

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

@@ -1,5 +1,6 @@
 package org.dromara.xzd.contractManagement.purchaseManagement.domain.vo;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -102,7 +103,7 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      * 原合同造价
      */
     @ExcelProperty(value = "原合同造价")
-    private Long originalContractCost;
+    private BigDecimal originalContractCost;
 
     /**
      * 签订日期
@@ -127,7 +128,7 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      * 含税合同金额
      */
     @ExcelProperty(value = "含税合同金额")
-    private Long taxInclusiveContractAmount;
+    private BigDecimal taxInclusiveContractAmount;
 
     /**
      * 合同状态，例如：新增
@@ -139,7 +140,7 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      * 累计变更金额
      */
     @ExcelProperty(value = "累计变更金额")
-    private Long cumulativeChangeAmount;
+    private BigDecimal cumulativeChangeAmount;
 
     /**
      * 归档日期

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

@@ -61,7 +61,7 @@ public class XzdBudgetClassificationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:budgetClassification:query")
+   // @SaCheckPermission("xzd:budgetClassification:query")
     @GetMapping("/{id}")
     public R<XzdBudgetClassificationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdBusinessSealController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:businessSeal:query")
+   // @SaCheckPermission("xzd:businessSeal:query")
     @GetMapping("/{id}")
     public R<XzdBusinessSealVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdContractAccountController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:contractAccount:query")
+   // @SaCheckPermission("xzd:contractAccount:query")
     @GetMapping("/{id}")
     public R<XzdContractAccountVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdContractAgreementController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:contractAgreement:query")
+   // @SaCheckPermission("xzd:contractAgreement:query")
     @GetMapping("/{id}")
     public R<XzdContractAgreementVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdContractDetailsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:contractDetails:query")
+  //  @SaCheckPermission("xzd:contractDetails:query")
     @GetMapping("/{id}")
     public R<XzdContractDetailsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdContractProgressSettlementController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:contractProgressSettlement:query")
+    //@SaCheckPermission("xzd:contractProgressSettlement:query")
     @GetMapping("/{id}")
     public R<XzdContractProgressSettlementVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdContractProgressSettlementDateController extends BaseController
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:contractProgressSettlementDate:query")
+    //@SaCheckPermission("xzd:contractProgressSettlementDate:query")
     @GetMapping("/{id}")
     public R<XzdContractProgressSettlementDateVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdContractTerminationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:contractTermination:query")
+    //@SaCheckPermission("xzd:contractTermination:query")
     @GetMapping("/{id}")
     public R<XzdContractTerminationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -75,7 +75,7 @@ public class XzdCorrespondentList {
     /**
      * 客户信息列表
      */
-    @SaCheckPermission("xzd:customertypeInfo:query")
+    //@SaCheckPermission("xzd:customertypeInfo:query")
     @GetMapping("/queryCustomertype")
     public R<XzdClienteleListSumVo> queryCustomertype( XzdClienteleListDto dto,  PageQuery pageQuery) {
         return iXzdCorrespondentList.queryCustomertype(dto, pageQuery);
@@ -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/controller/XzdProjectController.java

@@ -61,7 +61,7 @@ public class XzdProjectController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:project:query")
+  //  @SaCheckPermission("xzd:project:query")
     @GetMapping("/{id}")
     public R<XzdProjectVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdProjectManagerApprovalController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:approval:query")
+   // @SaCheckPermission("xzd:approval:query")
     @GetMapping("/{id}")
     public R<XzdProjectManagerApprovalVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdSolutionSelectionController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:solutionSelection:query")
+    //@SaCheckPermission("xzd:solutionSelection:query")
     @GetMapping("/{id}")
     public R<XzdSolutionSelectionVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -63,7 +63,7 @@ public class XzdSupplierInfoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:supplierInfo:query")
+   // @SaCheckPermission("xzd:supplierInfo:query")
     @GetMapping("/{id}")
     public R<XzdSupplierInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -62,7 +62,7 @@ public class XzdSupplierOpenBankController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:supplierOpenBank:query")
+    //@SaCheckPermission("xzd:supplierOpenBank:query")
     @GetMapping("/{id}")
     public R<XzdSupplierOpenBankVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdWorkcontractCompletionAdjustController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("xzd:workcontractCompletionAdjust:query")
+ //   @SaCheckPermission("xzd:workcontractCompletionAdjust:query")
     @GetMapping("/{id}")
     public R<XzdWorkcontractCompletionAdjustVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java

@@ -61,7 +61,7 @@ public class XzdCbysJdcbfjController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysJdcbfj:query")
+   // @SaCheckPermission("costBudget:cbysJdcbfj:query")
     @GetMapping("/{id}")
     public R<XzdCbysJdcbfjVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjFubiaoController.java

@@ -61,7 +61,7 @@ public class XzdCbysJdcbfjFubiaoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysJdcbfjFubiao:query")
+   // @SaCheckPermission("costBudget:cbysJdcbfjFubiao:query")
     @GetMapping("/{id}")
     public R<XzdCbysJdcbfjFubiaoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysSscbController.java

@@ -61,7 +61,7 @@ public class XzdCbysSscbController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysSscb:query")
+   // @SaCheckPermission("costBudget:cbysSscb:query")
     @GetMapping("/{id}")
     public R<XzdCbysSscbVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbController.java

@@ -61,7 +61,7 @@ public class XzdCbysWgcbtbController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysWgcbtb:query")
+    //@SaCheckPermission("costBudget:cbysWgcbtb:query")
     @GetMapping("/{id}")
     public R<XzdCbysWgcbtbVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysWgcbtbFubiaoController.java

@@ -61,7 +61,7 @@ public class XzdCbysWgcbtbFubiaoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysWgcbtbFubiao:query")
+   // @SaCheckPermission("costBudget:cbysWgcbtbFubiao:query")
     @GetMapping("/{id}")
     public R<XzdCbysWgcbtbFubiaoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java

@@ -61,7 +61,7 @@ public class XzdCbysZjhcbAlterationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysZjhcbAlteration:query")
+    //@SaCheckPermission("costBudget:cbysZjhcbAlteration:query")
     @GetMapping("/{id}")
     public R<XzdCbysZjhcbAlterationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbController.java

@@ -61,7 +61,7 @@ public class XzdCbysZjhcbController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysZjhcb:query")
+   // @SaCheckPermission("costBudget:cbysZjhcb:query")
     @GetMapping("/{id}")
     public R<XzdCbysZjhcbVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZtjhcbBgjlController.java

@@ -61,7 +61,7 @@ public class XzdCbysZtjhcbBgjlController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("costBudget:cbysZtjhcbBgjl:query")
+   // @SaCheckPermission("costBudget:cbysZtjhcbBgjl:query")
     @GetMapping("/{id}")
     public R<XzdCbysZtjhcbBgjlVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/controller/XzdGuaranteeChangeInfoController.java

@@ -61,7 +61,7 @@ public class XzdGuaranteeChangeInfoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("backletter:guaranteeChangeInfo:query")
+   // @SaCheckPermission("backletter:guaranteeChangeInfo:query")
     @GetMapping("/{id}")
     public R<XzdGuaranteeChangeInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/controller/XzdGuaranteeInfoController.java

@@ -62,7 +62,7 @@ public class XzdGuaranteeInfoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("deposit:guaranteeInfo:query")
+    //@SaCheckPermission("deposit:guaranteeInfo:query")
     @GetMapping("/{id}")
     public R<XzdGuaranteeInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/controller/XzdDepositApplicationController.java

@@ -62,7 +62,7 @@ public class XzdDepositApplicationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("earnestMoney:depositApplication:query")
+   // @SaCheckPermission("earnestMoney:depositApplication:query")
     @GetMapping("/{id}")
     public R<XzdDepositApplicationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/controller/XzdFbhtzbjthController.java

@@ -61,7 +61,7 @@ public class XzdFbhtzbjthController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("refundDeposit:fbhtzbjth:query")
+   // @SaCheckPermission("refundDeposit:fbhtzbjth:query")
     @GetMapping("/{id}")
     public R<XzdFbhtzbjthVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -32,6 +32,11 @@ public class XzdProject extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 区域码
+     */
+    private Long cityCode;
+
     /**
      * 项目编号
      */

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

@@ -1,13 +1,13 @@
 package org.dromara.xzd.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 项目经理推荐及审批对象 xzd_project_manager_approval
@@ -29,6 +29,11 @@ public class XzdProjectManagerApproval extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 区域码
+     */
+    private Long cityCode;
+
     /**
      * 单据编号
      */

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

@@ -34,7 +34,7 @@ public class XzdSupplierInfo extends BaseEntity {
     /**
      * 区域编码
      */
-    private String cityCode;
+    private Long cityCode;
 
     /**
      * 单位编号

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

@@ -28,6 +28,11 @@ public class XzdProjectBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 区域码
+     */
+    private Long cityCode;
+
     /**
      * 项目编号
      */

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

@@ -1,15 +1,16 @@
 package org.dromara.xzd.domain.bo;
 
-import org.dromara.xzd.domain.XzdProjectManagerApproval;
-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.domain.XzdProjectManagerApproval;
+
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 项目经理推荐及审批业务对象 xzd_project_manager_approval
@@ -28,6 +29,11 @@ public class XzdProjectManagerApprovalBo extends BaseEntity {
     @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
     private Long id;
 
+    /**
+     * 区域码
+     */
+    private Long cityCode;
+
     /**
      * 单据编号
      */

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

@@ -34,7 +34,7 @@ public class XzdSupplierInfoBo extends BaseEntity {
     /**
      * 区域编码
      */
-    private String cityCode;
+    private Long cityCode;
 
     /**
      * 单位编号

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

@@ -1,14 +1,10 @@
 package org.dromara.xzd.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.xzd.domain.XzdProjectManagerApproval;
 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.domain.XzdProjectManagerApproval;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -36,6 +32,11 @@ public class XzdProjectManagerApprovalVo implements Serializable {
     @ExcelProperty(value = "主键ID")
     private Long id;
 
+    /**
+     * 区域码
+     */
+    private Long cityCode;
+
     /**
      * 单据编号
      */

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

@@ -37,6 +37,11 @@ public class XzdProjectVo implements Serializable {
     @ExcelProperty(value = "主键ID")
     private Long id;
 
+    /**
+     * 区域码
+     */
+    private Long cityCode;
+
     /**
      * 项目编号
      */

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

@@ -39,7 +39,7 @@ public class XzdSupplierInfoVo implements Serializable {
     /**
      * 区域编码
      */
-    private String cityCode;
+    private Long cityCode;
 
     /**
      * 单位编号

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/TaxInfoController.java

@@ -61,7 +61,7 @@ public class TaxInfoController extends BaseController {
      *
      * @param levyCode 主键
      */
-    @SaCheckPermission("zengzhishui:info:query")
+   // @SaCheckPermission("zengzhishui:info:query")
     @GetMapping("/{levyCode}")
     public R<TaxInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String levyCode) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/interceptor/RequestLogInterceptor.java

@@ -1,5 +1,6 @@
 package org.dromara.xzd.interceptor;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -27,11 +28,6 @@ public class RequestLogInterceptor implements HandlerInterceptor {
 
     @Autowired
     private XzdCustomerSupplierYybMapper customerSupplierYybMapper;
-    @Autowired
-    private AutoIncrementIdHolder autoIncrementIdHolder;
-
-    // 需要拦截的请求方法
-    private static final List<String> INTERCEPT_METHODS = Arrays.asList("POST", "PUT", "DELETE");
 
     // 需要提取的请求体字段(根据实际需求修改)
     private static final List<String> EXTRACT_FIELDS = Arrays.asList("id",
@@ -130,7 +126,9 @@ public class RequestLogInterceptor implements HandlerInterceptor {
 
         String uri = (String) cachedData.get("uri");
         Map<String, Object> extractedParams = (Map<String, Object>) cachedData.get("extractedParams");
-
+        if (extractedParams == null || extractedParams.isEmpty()) {
+            return;
+        }
         // 1. 尝试从请求参数获取ID（前端传入的情况，如非自增ID）
         Long newId = convertToLong(extractedParams.get("id"));
         // 2. 从AOP存入的ThreadLocal获取ID（数据库自增/雪花算法生成的情况）
@@ -151,6 +149,12 @@ public class RequestLogInterceptor implements HandlerInterceptor {
             if ("id".equals(k)){
                 continue;
             }
+            if (ObjectUtil.isEmpty(v)) {
+                continue;
+            }
+            if (convertToLong(v) == null){
+                continue;
+            }
             XzdCustomerSupplierYyb entity = new XzdCustomerSupplierYyb();
             entity.setUri(uri);
             entity.setCSId(convertToLong(v));
@@ -167,6 +171,9 @@ public class RequestLogInterceptor implements HandlerInterceptor {
     private void handlePutOrDelete(HttpServletRequest request, String method) {
         String uri = request.getRequestURI();
         Map<String, Object> extractedParams = RequestParamExtractor.extractParams(request, method, EXTRACT_FIELDS);
+        if (extractedParams == null || extractedParams.isEmpty()) {
+            return;
+        }
         if ("PUT".equals(method)) {
             Long mainTableId = convertToLong(extractedParams.get("id"));
             customerSupplierYybMapper.delete(new LambdaQueryWrapper<XzdCustomerSupplierYyb>().eq(XzdCustomerSupplierYyb::getMainTableId, mainTableId));
@@ -178,6 +185,12 @@ public class RequestLogInterceptor implements HandlerInterceptor {
                 if ("id".equals(k)){
                     continue;
                 }
+                if (ObjectUtil.isEmpty(v)) {
+                    continue;
+                }
+                if (convertToLong(v) == null){
+                    continue;
+                }
                 XzdCustomerSupplierYyb customerSupplierYyb = new XzdCustomerSupplierYyb();
                 customerSupplierYyb.setUri(uri);
                 customerSupplierYyb.setCSId(convertToLong(v));

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

@@ -61,7 +61,7 @@ public class XzdSfkFapiaoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("paymentsReceipts:sfkFapiao:query")
+    //@SaCheckPermission("paymentsReceipts:sfkFapiao:query")
     @GetMapping("/{id}")
     public R<XzdSfkFapiaoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -61,7 +61,7 @@ public class XzdSfkFukuanController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("paymentsReceipts:sfkFukuan:query")
+    //@SaCheckPermission("paymentsReceipts:sfkFukuan:query")
     @GetMapping("/{id}")
     public R<XzdSfkFukuanVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -309,6 +309,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R<String> delCorrespondent(Long[] dto) {
 
         for (int i = dto.length - 1; i >= 0; i--) {
@@ -571,8 +572,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
     public void delCorrespondentVoid(Long dto){
 //        删除中间表
-        XzdCustomerSupplierYyb xzdCustomerSupplierYyb = iXzdCustomerSupplierYybService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdCustomerSupplierYyb>().eq(XzdCustomerSupplierYyb::getCSId, dto));
+        List<XzdCustomerSupplierYyb> xzdCustomerSupplierYyb = iXzdCustomerSupplierYybService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdCustomerSupplierYyb>().eq(XzdCustomerSupplierYyb::getCSId, dto));
-        if (xzdCustomerSupplierYyb == null) {
+
+        if (xzdCustomerSupplierYyb == null || xzdCustomerSupplierYyb.size() == 0) {
             iXzdCustomerSupplierService.getBaseMapper().delete(new LambdaQueryWrapper<XzdCustomerSupplier>().eq(XzdCustomerSupplier::getCSId, dto));
         }else {
             throw new RuntimeException("该客户信息已被使用，无法删除");

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

@@ -2,7 +2,11 @@ package org.dromara.xzd.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos;
 import org.dromara.common.core.service.XzdCustomerSupplierService;
 import org.dromara.common.core.service.XzdCustomerinformationService;
@@ -10,25 +14,19 @@ import org.dromara.common.core.service.XzdSupplierInfoService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.dromara.xzd.domain.XzdCustomerinformation;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.dromara.system.domain.vo.SysDeptVo;
-import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
-import org.springframework.stereotype.Service;
 import org.dromara.xzd.domain.bo.XzdCustomerinformationBo;
 import org.dromara.xzd.domain.vo.XzdCustomerinformationVo;
-import org.dromara.xzd.domain.XzdCustomerinformation;
 import org.dromara.xzd.mapper.XzdCustomerinformationMapper;
 import org.dromara.xzd.service.IXzdCustomerinformationService;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 客户信息Service业务层处理
@@ -194,7 +192,7 @@ public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerin
             if (ObjectUtil.isEmpty(xzdCustomerSuppliervo) ){
                 return null;
             }
-            if (xzdCustomerSuppliervo.getType().equals("1")){
+            if (xzdCustomerSuppliervo.getType()!= null && xzdCustomerSuppliervo.getType().equals("1")){
                 XzdCustomerinformationVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
                 if (ObjectUtil.isNotNull(vo)) {
                     list.add(vo.getUnitName());

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

@@ -1,28 +1,30 @@
 package org.dromara.xzd.service.impl;
 
-import cn.hutool.core.util.HashUtil;
 import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.utils.BatchNumberGenerator;
 import org.dromara.system.service.impl.SysOssServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.dromara.xzd.domain.XzdProjectManagerApproval;
-import org.springframework.stereotype.Service;
 import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo;
 import org.dromara.xzd.domain.vo.XzdProjectManagerApprovalVo;
-import org.dromara.xzd.domain.XzdProjectManagerApproval;
 import org.dromara.xzd.mapper.XzdProjectManagerApprovalMapper;
 import org.dromara.xzd.service.IXzdProjectManagerApprovalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 项目经理推荐及审批Service业务层处理
@@ -80,6 +82,7 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl<XzdProject
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<XzdProjectManagerApproval> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getId() != null, XzdProjectManagerApproval::getId, bo.getId());
+        lqw.eq(bo.getCityCode() != null, XzdProjectManagerApproval::getCityCode, bo.getCityCode());
         lqw.orderByDesc(XzdProjectManagerApproval::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdProjectManagerApproval::getDocumentNumber, bo.getDocumentNumber());
         lqw.between(params.get("beginRecordDate") != null && params.get("endRecordDate") != null,

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

@@ -561,7 +561,6 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        boolean b = baseMapper.deleteByIds(ids) > 0;
 
         for (Long id : ids) {
 
@@ -694,7 +693,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
             xzdContractInfoService.remove(contractInfoLambdaQueryWrapper);
         }
 
-        return b;
+        return baseMapper.deleteByIds(ids) > 0;
     }
 
 

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

@@ -61,7 +61,7 @@ public class XzdJsDeductionItemsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("settlement:jsDeductionItems:query")
+   // @SaCheckPermission("settlement:jsDeductionItems:query")
     @GetMapping("/{id}")
     public R<XzdJsDeductionItemsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/controller/SettlementOfSubcontractingContractController.java

@@ -61,7 +61,7 @@ public class SettlementOfSubcontractingContractController extends BaseController
      *
      * @param id 主键
      */
-    @SaCheckPermission("fenbaohetongjingdu:ofSubcontractingContract:query")
+    //@SaCheckPermission("fenbaohetongjingdu:ofSubcontractingContract:query")
     @GetMapping("/{id}")
     public R<SettlementOfSubcontractingContractVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -62,7 +62,7 @@ public class SettlementOfSubcontractingCompletionController extends BaseControll
      *
      * @param id 主键
      */
-    @SaCheckPermission("fenbaohetongjungong:ofSubcontractingCompletion:query")
+   // @SaCheckPermission("fenbaohetongjungong:ofSubcontractingCompletion:query")
     @GetMapping("/{id}")
     public R<SettlementOfSubcontractingCompletionVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/controller/SettlementOfSubcontractingAdjustmentController.java

@@ -61,7 +61,7 @@ public class SettlementOfSubcontractingAdjustmentController extends BaseControll
      *
      * @param id 主键
      */
-    @SaCheckPermission("fenbaohetongtiaozheng:ofSubcontractingAdjustment:query")
+   // @SaCheckPermission("fenbaohetongtiaozheng:ofSubcontractingAdjustment:query")
     @GetMapping("/{id}")
     public R<SettlementOfSubcontractingAdjustmentVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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;
@@ -61,7 +62,7 @@ public class XzdContractPaymentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("skyfk:contractPayment:query")
+   // @SaCheckPermission("skyfk:contractPayment:query")
     @GetMapping("/{id}")
     public R<XzdContractPaymentVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java

@@ -61,7 +61,7 @@ public class XzdSkyfkFbhtfkController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("fbhtfk:skyfkFbhtfk:query")
+   // @SaCheckPermission("fbhtfk:skyfkFbhtfk:query")
     @GetMapping("/{id}")
     public R<XzdSkyfkFbhtfkVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java

@@ -1,26 +1,27 @@
 package org.dromara.xzd.spykp.kpsq.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.spykp.kpsq.domain.vo.XzdSpykpKpsqVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.xzd.spykp.kpsq.domain.bo.XzdSpykpKpsqBo;
+import org.dromara.common.log.annotation.Log;
-import org.dromara.xzd.spykp.kpsq.service.IXzdSpykpKpsqService;
+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.spykp.kpsq.domain.bo.XzdSpykpKpsqBo;
+import org.dromara.xzd.spykp.kpsq.domain.vo.XzdSpykpKpsqVo;
+import org.dromara.xzd.spykp.kpsq.service.IXzdSpykpKpsqService;
+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("/kpsq/kpsq")
+@RequestMapping("/xzd/kpsq/kpsq")
 public class XzdSpykpKpsqController extends BaseController {
 
     private final IXzdSpykpKpsqService xzdSpykpKpsqService;
@@ -61,7 +62,7 @@ public class XzdSpykpKpsqController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("kpsq:kpsq:query")
+   // @SaCheckPermission("kpsq:kpsq:query")
     @GetMapping("/{id}")
     public R<XzdSpykpKpsqVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java

@@ -1,26 +1,27 @@
 package org.dromara.xzd.spykp.sjsqd.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.spykp.sjsqd.domain.vo.XzdSpykpSjsqdVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.xzd.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo;
+import org.dromara.common.log.annotation.Log;
-import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService;
+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.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo;
+import org.dromara.xzd.spykp.sjsqd.domain.vo.XzdSpykpSjsqdVo;
+import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService;
+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("/sjsqd/sjsqd")
+@RequestMapping("/xzd/sjsqd/sjsqd")
 public class XzdSpykpSjsqdController extends BaseController {
 
     private final IXzdSpykpSjsqdService xzdSpykpSjsqdService;
@@ -61,7 +62,7 @@ public class XzdSpykpSjsqdController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("sjsqd:sjsqd:query")
+   // @SaCheckPermission("sjsqd:sjsqd:query")
     @GetMapping("/{id}")
     public R<XzdSpykpSjsqdVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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,29 +249,58 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
             }
             //合同名称
             if (vo.getHtId() != null){
-                XzdContractDetails xzdContractDetailsVo = xzdContractDetailsService.getBaseMapper().selectById(vo.getHtId());
+
-                if (xzdContractDetailsVo != null){
+                switch (vo.getHtlx()){
-                    vo.setHtmc(xzdContractDetailsVo.getContractName());
+                    case "1":
-                    //合同编号
+                        //承包合同
-                    vo.setHtbh(xzdContractDetailsVo.getContractCode());
+                        XzdContractDetails xzdContractDetailsVo = xzdContractDetailsService.getBaseMapper().selectById(vo.getHtId());
-                    //合同金额
+                        if (xzdContractDetailsVo != null){
-                    vo.setHtje(xzdContractDetailsVo.getContractAmount());
+                            vo.setHtmc(xzdContractDetailsVo.getContractName());
-                }
+                            //合同编号
-            }
+                            vo.setHtbh(xzdContractDetailsVo.getContractCode());
-            //付款单位名称
+                            //合同金额
-//            if (vo.getFkdwId() != null){
+                            vo.setHtje(xzdContractDetailsVo.getContractAmount());
-//                R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getFkdwId());
+                        }
-//                if (byid2 != null) {
+                        break;
-//                    if (byid2.getData().getXzdCustomerinformation() != null) {
+
-//                        vo.setFkdwmc(byid2.getData().getXzdCustomerinformation().getUnitName());
+                    case "2":
-//                    }
+                        //分包
-//                }
+                        XzdSubcontract xzdSubcontract = xzdSubcontractService.getBaseMapper().selectById(vo.getHtId());
-//            }
+                        if (xzdSubcontract != null){
-            //类型名称
+                            vo.setHtmc(xzdSubcontract.getContractName());
-            if (vo.getType() != null){
+                            //合同编号
-                XzdSolutionSelectionVo solutionSelectionVo = xzdSolutionSelectionService.queryById(vo.getType());
+                            vo.setHtbh(xzdSubcontract.getContractCode());
-                if (solutionSelectionVo != null){
+                            //合同金额
-                    vo.setTypeName(solutionSelectionVo.getName());
+                            vo.setHtje(xzdSubcontract.getTaxInclusiveContractAmount());
+                        }
+                        break;
+
+                    case "3":
+                        //采购
+                        XzdPurchaseContractInformation selectById = xzdPurchaseContractInformationService.getBaseMapper().selectById(vo.getHtId());
+                        if (selectById != null){
+                            vo.setHtmc(selectById.getContractName());
+                            //合同编号
+                            vo.setHtbh(selectById.getContractCode());
+                            //合同金额
+                            vo.setHtje(selectById.getTaxInclusiveContractAmount());
+                        }
+                        break;
+
+                    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;
                 }
             }
         }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java

@@ -61,7 +61,7 @@ public class XzdSpykpSpdjController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("spdj:spdj:query")
+   // @SaCheckPermission("spdj:spdj:query")
     @GetMapping("/{id}")
     public R<XzdSpykpSpdjVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

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

@@ -62,7 +62,7 @@ public class CbsTreeStructureController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:treeStructure:query")
+   // @SaCheckPermission("system:treeStructure:query")
     @GetMapping("/{id}")
     public R<CbsTreeStructureVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/controller/FinancialRevenuePlanAlterationController.java

@@ -62,7 +62,7 @@ public class FinancialRevenuePlanAlterationController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("yueduzijinbiangeng:revenuePlanAlteration:query")
+    //@SaCheckPermission("yueduzijinbiangeng:revenuePlanAlteration:query")
     @GetMapping("/{id}")
     public R<FinancialRevenuePlanAlterationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/controller/FinancialRevenueExpenditurePlanController.java

@@ -64,7 +64,7 @@ public class FinancialRevenueExpenditurePlanController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("yueduzijinjihua:revenueExpenditurePlan:query")
+   // @SaCheckPermission("yueduzijinjihua:revenueExpenditurePlan:query")
     @GetMapping("/{id}")
     public R<FinancialRevenueExpenditurePlanVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml

@@ -7,6 +7,7 @@
     <select id="search" resultType="org.dromara.xzd.domain.vo.XzdProjectVo">
         SELECT
             project.id,
+            project.city_code as cityCode,
             project.project_attribute as projectAttribute,
             project.project_number as projectNumber,
             project.project_name as projectName,
@@ -53,6 +54,10 @@
             AND project.project_number LIKE CONCAT('%',#{projectNumber},'%')
         </if>
 
+         <if test="cityCode != null and cityCode != ''">
+             AND project.city_code = #{cityCode}
+         </if>
+
         <if test='projectName != null and projectName != ""'>
             AND project.project_name LIKE CONCAT('%',#{projectName},'%')
         </if>

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml

@@ -47,7 +47,11 @@
             </if>
 
              <if test='bo.cityCode != null and bo.cityCode != ""'>
-                AND info.city_code = #{cityCode}
+                AND info.city_code = #{bo.cityCode}
+            </if>
+
+            <if test='bo.unitCode != null and bo.unitCode != ""'>
+                AND info.unit_code = #{bo.unitCode}
             </if>
 
             <if test='bo.fgbm != null and bo.fgbm != ""'>