From f4220be9d6a3fbc365b8c790b9c76d4201d1be0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 27 Oct 2025 10:29:27 +0800 Subject: [PATCH] =?UTF-8?q?10-27-=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzdSpykpKpsqController.java | 33 ++++++++++--------- .../controller/XzdSpykpSjsqdController.java | 33 ++++++++++--------- .../mapper/xzd/XzdSupplierInfoMapper.xml | 4 +++ 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java index f102fb3f..b895370b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/kpsq/controller/XzdSpykpKpsqController.java +++ b/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 org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; 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.xzd.spykp.kpsq.domain.bo.XzdSpykpKpsqBo; -import org.dromara.xzd.spykp.kpsq.service.IXzdSpykpKpsqService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java index 867cc57c..d84cd570 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/controller/XzdSpykpSjsqdController.java +++ b/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 org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; 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.xzd.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo; -import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml index 7d367c97..5a4fed96 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml @@ -50,6 +50,10 @@ AND info.city_code = #{bo.cityCode} + + AND info.unit_code = #{bo.unitCode} + + AND supplement.responsible_department = #{bo.fgbm}