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-10 17:25:44 +08:00
parent 75b16d55b2
commit 010831d718
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
+4 -4
View File
@@ -157,13 +157,13 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeDTO.getName());
PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false);
if (!ObjectUtils.isEmpty(one)) {
return Result.error("分标委名已存在");
return Result.error("分标委名称已存在");
}
LambdaQueryWrapper<PayCaseCommittee> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeDTO.getAbbreviation());
PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false);
if (!ObjectUtils.isEmpty(one2)) {
return Result.error("分标简称已存在");
return Result.error("分标委简称已存在");
}
PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
@@ -190,14 +190,14 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
queryWrapper.ne(PayCaseCommittee::getId,payCaseCommitteeUpdateDTO.getId());
PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false);
if (!ObjectUtils.isEmpty(one)) {
return Result.error("分标委名已存在");
return Result.error("分标委名称已存在");
}
LambdaQueryWrapper<PayCaseCommittee> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeUpdateDTO.getAbbreviation());
queryWrapper2.ne(PayCaseCommittee::getId,payCaseCommitteeUpdateDTO.getId());
PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false);
if (!ObjectUtils.isEmpty(one2)) {
return Result.error("分标简称已存在");
return Result.error("分标委简称已存在");
}
PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
BeanUtils.copyProperties(payCaseCommitteeUpdateDTO, payCaseCommittee);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
+4 -1
View File
@@ -24,7 +24,10 @@
</resultMap>
<select id="detail" resultMap="searchFile">
SELECT pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_committee pcc where pcc.id=#{id}
SELECT pcc.name,pcc.id,pcc.remarks,su.realname as principal ,#{userId} as userId
FROM pay_case_committee pcc
left join sys_user su on(pcc.create_by_id =su.id)
where pcc.id=#{id}
</select>
<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_committee 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/PayCaseCommitteeSubitemMapper.xml
+1 -1
View File
@@ -22,7 +22,7 @@
left join pay_company_management pcm on(pm.company_id=pcm.id)
<if test=" userId!=null and userId != ''">
left join pay_meeting pme on (pe.id=pme.case_committee_id)
left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
left join pay_meeting_contacts pmc on pme.id = pmc.meeting_id
</if>
<where>
<if test=" name!=null and name != ''">
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDataFileMapper.xml
+2 -1
View File
@@ -7,7 +7,7 @@
pwgdf.id,
pwgdf.project_id,
pwgdf.file_id,
pwgdf.create_by,
su.realname as create_by,
pwgdf.create_time,
pwgdf.update_by,
pwgdf.update_time,
@@ -15,6 +15,7 @@
(SELECT count(*) FROM pay_file_download_record where file_id = pwgdf.file_id) AS downloadCount
FROM pay_working_group_data_file pwgdf
LEFT JOIN oss_file osf ON pwgdf.file_id = osf.id
left join sys_user su on(pwgdf.create_by=su.username)
where project_id = #{payWorkingGroupDataFile.projectId} AND project_type = #{payWorkingGroupDataFile.projectType}
<if test="payWorkingGroupDataFile.fileName != null and payWorkingGroupDataFile.fileName != ''">
AND osf.file_name LIKE CONCAT('%',CONCAT(#{payWorkingGroupDataFile.fileName},'%'))