mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-11-29 18:04:08 +08:00
parent aba87556be
commit 54f8a71d8a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
View File

@ -186,7 +186,7 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
sql.append("and business_type = '2' and is_proxy = '2'"); sql.append("and business_type = '2' and is_proxy = '2'");
} }
lqw.exists(bo.getType() != 1, sql.toString()); lqw.exists(bo.getType() != 1, sql.toString());
lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END"); lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date");
lqw.orderByDesc("finish_date"); lqw.orderByDesc("finish_date");
// lqw.groupBy("com.id"); // lqw.groupBy("com.id");
Page<PsCompanyInfoVo> result = baseMapper.selectPageList2(pageQuery.build(), lqw); Page<PsCompanyInfoVo> result = baseMapper.selectPageList2(pageQuery.build(), lqw);
@ -208,20 +208,20 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
} }
for (PsCompanyInfoVo record : result.getRecords()) { for (PsCompanyInfoVo record : result.getRecords()) {
record.setFollowUsers(userMap.get(record.getId())); record.setFollowUsers(userMap.get(record.getId()));
record.setBusinessVoList(contractBusinessVoMap.get(record.getId()));
if (record.getBusinessVoList() == null){ if (record.getBusinessVoList() == null){
continue; continue;
} }
boolean hasDate = false; boolean hasData = false;
for (PsContractBusinessVo psContractBusinessVo : record.getBusinessVoList()) { for (PsContractBusinessVo psContractBusinessVo : record.getBusinessVoList()) {
if (psContractBusinessVo.getEndDate() != null){
hasDate = true;
}
int diffDay = DateUtils.diffDay(new Date(), psContractBusinessVo.getEndDate()); int diffDay = DateUtils.diffDay(new Date(), psContractBusinessVo.getEndDate());
psContractBusinessVo.setRemainingDay(diffDay); psContractBusinessVo.setRemainingDay(diffDay);
if (psContractBusinessVo.getEndDate() != null){
hasData = true;
}
} }
if (hasDate){ if (!hasData){
record.setBusinessVoList(contractBusinessVoMap.get(record.getId())); record.setBusinessVoList(null);
} }
} }
} }