LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:bug

Browse Source
This commit is contained in:
zhangqinlin
2022-01-11 17:35:54 +08:00
parent 075c0d337c
commit ee9e353c36
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
+1 -1
View File
@@ -15,7 +15,7 @@
</resultMap> </resultMap>
<select id="detail" resultMap="searchFile"> <select id="detail" resultMap="searchFile">
SELECT pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_council pcc where pcc.id=#{id} SELECT pcc.name,pcc.id,pcc.remarks,su.realname as principal ,#{userId} as userId FROM pay_case_council pcc left join sys_user su on(pcc.create_by_id =su.id) where pcc.id=#{id}
</select> </select>
<select id="listForChildren" resultType="com.jero.data.entity.Files"> <select id="listForChildren" resultType="com.jero.data.entity.Files">
SELECT ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_council pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file SELECT ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_council pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+1 -1
View File
@@ -135,7 +135,7 @@
order by pe.create_time desc order by pe.create_time desc
</select> </select>
<select id="listForChildrenTwo" resultType="com.jero.data.entity.subCouncil"> <select id="listForChildrenTwo" resultType="com.jero.data.entity.subCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as id SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.phone as phone,pt.post as post
from from
pay_case_council_subitem pm pay_case_council_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id) left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+1
View File
@@ -153,6 +153,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>(); QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_name",payResearchProject.getProjectName()); queryWrapper.eq("project_name",payResearchProject.getProjectName());
queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId()); queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId());
queryWrapper.ne("id",payResearchProject.getId());
int count = payResearchProjectService.count(queryWrapper); int count = payResearchProjectService.count(queryWrapper);
if (count>0) { if (count>0) {
return Result.error("项目名称已存在"); return Result.error("项目名称已存在");