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

Merge branch 'main' of http://192.168.18.119:3000/mengxu/pusong-crm into main

Browse Source
This commit is contained in:
mx 2024-12-27 09:48:36 +08:00
commit 2ff94c4500
6 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pusong-admin/src/main/resources/logback-plus.xml
View File

@ -28,7 +28,7 @@
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<level>DEBUG</level>
</filter>
</appender>
@ -47,7 +47,7 @@
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<level>DEBUG</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java
View File

@ -64,7 +64,7 @@ public class PsCompanyInfoController extends BaseController {
* 服务公司列表
*/
@SaCheckPermission("business:companyInfo:list")
@Log(title = "服务公司列表" )
// @Log(title = "服务公司列表" )
@GetMapping("/serviceList")
public TableDataInfo<PsCompanyInfoVo> serviceList(PsCompanyQueryBo queryBo, PageQuery pageQuery) {
return psCompanyInfoService.queryServiceCompany(queryBo, pageQuery);

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java
View File

@ -36,4 +36,8 @@ public interface PsCompanyInfoMapper extends BaseMapperPlus<PsCompanyInfo, PsCom
List<PsCompanyInfoVo> selectVoCustomManager(@Param(Constants.WRAPPER) Wrapper<PsCompanyInfo> queryWrapper, @Param("contractCode")String contractCode);
List<SysUserVo> selectFollowUser(@Param(Constants.WRAPPER) Wrapper<PsCompanyInfo> queryWrapper);
List<PsCompanyInfoVo> selectContractServiceCompany(@Param(Constants.WRAPPER) Wrapper<PsCompanyInfoVo> queryWrapper);
}

31
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.pusong.business.enums.ApproverStatusEnum;
import com.pusong.business.enums.ApproverTypeEnum;
import com.pusong.business.enums.PayStatusEnum;
import com.pusong.business.mapper.PsApproverRecordMapper;
import com.pusong.business.mapper.PsCompanyInfoMapper;
import com.pusong.business.mapper.PsContractPayMapper;
import com.pusong.business.service.IPsCompanyInfoService;
import com.pusong.business.service.approver.ApproverContainer;
@ -34,6 +35,8 @@ import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 审批记录Service接口
@ -54,6 +57,8 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
private IPsCompanyInfoService companyInfoService;
@Resource
private ISysNoticeService noticeService;
@Resource
private PsCompanyInfoMapper companyInfoMapper;
/**
* 通用申请方法
* @param bussinessId
@ -129,18 +134,28 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
}
Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay());
List<String> codes = res.getRecords().stream().map(PsApproverRecordVo::getContractCode).toList();
QueryWrapper<PsCompanyInfoVo> wq = Wrappers.<PsCompanyInfoVo>query()
.eq("com.del_flag", "0")
.eq("pcc.del_flag","0")
.in("pcc.contract_code", codes);
List<PsCompanyInfoVo> list = companyInfoMapper.selectContractServiceCompany(wq);
Map<String, List<PsCompanyInfoVo>> contractCompanyMap = list.stream().collect(Collectors.groupingBy(PsCompanyInfoVo::getContractCode));
if(CollectionUtils.isNotEmpty(res.getRecords())){
res.getRecords().forEach(item->{
if (item.getContractAmount() != null)
item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney()));
//装填回款周期
List<PsContractPayVo> payList = queryListByContractCode(item.getContractCode(),"1", PayStatusEnum.SUCCESS);
if(CollectionUtils.isNotEmpty(payList)){
item.setPeriod(DateUtils.calWorkDate(payList.get(0).getPayDate(),payList.get(payList.size()-1).getPayDate()));
}
// List<PsContractPayVo> payList = queryListByContractCode(item.getContractCode(),"1", PayStatusEnum.SUCCESS);
// if(CollectionUtils.isNotEmpty(payList)){
// item.setPeriod(DateUtils.calWorkDate(payList.get(0).getPayDate(), payList.get(payList.size() - 1).getPayDate()));
// }
//装填服务公司信息
List<PsCompanyInfoVo> list = companyInfoService.getServiceCompany(item.getContractCode());
item.setServicePsCompanyInfoVo(list);
// List<PsCompanyInfoVo> list = companyInfoService.getServiceCompany(item.getContractCode());
item.setServicePsCompanyInfoVo(contractCompanyMap.get(item.getContractCode()));
});
}
return res;
@ -155,7 +170,9 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
* @return
*/
public List<PsContractPayVo> queryListByContractCode(String contractCode, String business, PayStatusEnum enu){
if(StringUtils.isBlank(contractCode)){return new ArrayList<>();}
if(StringUtils.isBlank(contractCode)){
return new ArrayList<>();
}
List<PsContractPayVo> list = baseMapper.selectVoList(Wrappers.<PsContractPay>lambdaQuery().
eq(PsContractPay::getContractCode, contractCode).eq(PsContractPay::getDelFlag,0)
.eq(StringUtils.isNotBlank(business),PsContractPay::getBusinessType,business)

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

@ -191,7 +191,6 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date");
lqw.orderByDesc("finish_date");
// lqw.groupBy("com.id");
Page<PsCompanyInfoVo> result = baseMapper.selectPageList2(pageQuery.build(), lqw);
if (!result.getRecords().isEmpty()){
@ -229,7 +228,6 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
}
}
}
return TableDataInfo.build(result);
}

9
pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml
View File

@ -130,6 +130,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ps_contract_business_detail det on det.business_id = bus.id
${ew.getCustomSqlSegment}
</select>
<select id="selectContractServiceCompany" resultMap="serviceCompanyServiceResult2">
select pcc.contract_code,com.*
from ps_contract_company pcc
inner join ps_company_info com on pcc.company_id = com.id
${ew.getCustomSqlSegment}
</select>
<select id="selectFollowUser" resultType="com.pusong.system.domain.vo.SysUserVo">
select u.*,cf.company_id from ps_company_follow cf
inner join sys_user u on u.user_id = cf.user_id