采购合同金额字段

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/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/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/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/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/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/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;

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;

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 != ""'>