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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
lg
2025-10-25 21:24:39 +08:00
parent 4ff87f3996 5f3ae0f9f1
commit f00b98714a
4 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,15 @@
package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.util.Date;
/**
* 供应商信息对象 xzd_supplier_info
@ -30,6 +31,11 @@ public class XzdSupplierInfo extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 区域编码
*/
private String cityCode;
/**
* 单位编号
*/

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

@ -1,19 +1,20 @@
package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.*;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
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.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 供应商信息业务对象 xzd_supplier_info
*
@ -30,6 +31,11 @@ public class XzdSupplierInfoBo extends BaseEntity {
*/
private Long id;
/**
* 区域编码
*/
private String cityCode;
/**
* 单位编号
*/

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

@ -36,6 +36,11 @@ public class XzdSupplierInfoVo implements Serializable {
@ExcelProperty(value = "")
private Long id;
/**
* 区域编码
*/
private String cityCode;
/**
* 单位编号
*/

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

@ -10,6 +10,7 @@
supplement.belonging_organization as sszz,
# settlement.opening_bank as khyh,
# settlement.account_number as khhzh,
info.city_code as cityCode,
bank.open_bank as khyh,
bank.account as khhzh,
supplement.creator as createByUser,
@ -45,6 +46,10 @@
AND info.unit_name LIKE CONCAT('%', #{bo.unitName}, '%')
</if>
<if test='bo.cityCode != null and bo.cityCode != ""'>
AND info.city_code = #{cityCode}
</if>
<if test='bo.fgbm != null and bo.fgbm != ""'>
AND supplement.responsible_department = #{bo.fgbm}
</if>