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

10-28-bug修复

Browse Source
This commit is contained in:
青云
2025-10-28 15:52:07 +08:00
parent 275d640263
commit 82fa732db6
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ public class XzdProjectBo extends BaseEntity {
/**
* 项目备案经理
*/
private String xmbajl;
private Long xmbajl;
/**
* 分页大小

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

@ -242,7 +242,7 @@ public class XzdContractDetailsVo implements Serializable {
/**
* 签约组织名称
*/
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "signingOrganization")
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "signingOrganization")
private String signingOrganizationName;
/**

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

@ -8,6 +8,7 @@
SELECT
project.id,
project.city_code as cityCode,
project.shzt as shzt,
project.project_attribute as projectAttribute,
project.project_number as projectNumber,
project.project_name as projectName,
@ -42,7 +43,7 @@
LEFT JOIN xzd_project_profile as profile ON project.id = profile.xzd_project_id
# LEFT JOIN sys_user as user ON project.manager_execution = user.user_id
# LEFT JOIN sys_user as user2 ON project.filing_manager = user2.user_id
# LEFT JOIN xzd_project_manager_approval as approval3 ON project.filing_manager = approval3.id
LEFT JOIN sys_user as user3 ON project.create_by = user3.user_id
LEFT JOIN xzd_project_type as type ON project.project_type = type.id
LEFT JOIN xzd_project_manager_approval as approval1 ON project.filing_manager = approval1.id
@ -87,7 +88,7 @@
</if>
<if test='xmbajl != null and xmbajl != ""'>
AND user2.nick_name = #{xmbajl}
AND approval1.id = #{xmbajl}
</if>
<if test='selfId != null and selfId != ""'>
@ -96,6 +97,8 @@
</where>
order by project.create_time desc
<if test='pageNum != null and pageSize != null'>
LIMIT #{pageSize} OFFSET #{offset}
</if>

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

@ -11,6 +11,7 @@
# settlement.opening_bank as khyh,
# settlement.account_number as khhzh,
info.city_code as cityCode,
info.shzt as shzt,
bank.open_bank as khyh,
bank.account as khhzh,
supplement.creator as createByUser,