lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-27-修改bug

Browse Source
This commit is contained in:
青云
2025-10-27 10:29:27 +08:00
parent 8252fd7216
commit f4220be9d6
3 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,27 @@
package org.dromara.xzd.spykp.kpsq.controller; 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 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.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; 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.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 @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/kpsq/kpsq") @RequestMapping("/xzd/kpsq/kpsq")
public class XzdSpykpKpsqController extends BaseController { public class XzdSpykpKpsqController extends BaseController {
private final IXzdSpykpKpsqService xzdSpykpKpsqService; private final IXzdSpykpKpsqService xzdSpykpKpsqService;

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

@ -1,26 +1,27 @@
package org.dromara.xzd.spykp.sjsqd.controller; 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 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.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; 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.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 @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/sjsqd/sjsqd") @RequestMapping("/xzd/sjsqd/sjsqd")
public class XzdSpykpSjsqdController extends BaseController { public class XzdSpykpSjsqdController extends BaseController {
private final IXzdSpykpSjsqdService xzdSpykpSjsqdService; private final IXzdSpykpSjsqdService xzdSpykpSjsqdService;

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

@ -50,6 +50,10 @@
AND info.city_code = #{bo.cityCode} AND info.city_code = #{bo.cityCode}
</if> </if>
<if test='bo.unitCode != null and bo.unitCode != ""'>
AND info.unit_code = #{bo.unitCode}
</if>
<if test='bo.fgbm != null and bo.fgbm != ""'> <if test='bo.fgbm != null and bo.fgbm != ""'>
AND supplement.responsible_department = #{bo.fgbm} AND supplement.responsible_department = #{bo.fgbm}
</if> </if>