diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java index dbc5e68..19b6ed1 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java @@ -156,8 +156,8 @@ public class PsContractInfoController extends BaseController { @SaCheckPermission("business:contractInfo:list") @Log(title = "根据合同编码查询合同信息", businessType = BusinessType.INSERT) @GetMapping("/queryServiceByCode") - public R> queryServiceByCode(@NotBlank String contractCode) { - return R.ok(businessService.selectBusinessList(List.of(contractCode))); + public R> queryServiceByCode(@NotBlank String contractCode, @RequestParam(required = false) Long serviceCompanyId) { + return R.ok(businessService.selectBusinessList(List.of(contractCode), serviceCompanyId)); } @@ -210,7 +210,7 @@ public class PsContractInfoController extends BaseController { @Log(title = "根据合同编码查询服务进度") @SaCheckPermission("business:task:list") @GetMapping("/queryScheduleByCode") - public R queryScheduleByCode(@NotBlank String contractCode, @NotBlank Long serviceCompanyId) { + public R queryScheduleByCode(@NotNull String contractCode, @NotNull Long serviceCompanyId) { return R.ok(psContractInfoService.queryScheduleByCode(contractCode, serviceCompanyId)); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java index 5914bf3..486d86b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java @@ -157,7 +157,7 @@ public class PsCompanyInfo extends TenantEntity { /** * 是否进出口0否1是 */ - private String inout; + private String inoutType; /** * 是否申请发票0否1是 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java index 1bb38fb..497e656 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java @@ -33,10 +33,7 @@ public class PsApproverRecordBo { */ @NotNull(message = "关联业务id不能为空") private String businessId; - /** - * 合同编码 - */ - private String contractCode; + /** * 审批业务类型 */ @@ -87,13 +84,32 @@ public class PsApproverRecordBo { * 客户电话 */ private String customMobile; + + + + /** - * 公司姓名 + * 合同编码 + */ + private String contractCode; + /** + * 回、退款方式 + */ + private String pay; + + /** + * 申请人 + */ + private String applicant; + /** + * 服务签约公司名称 + * 服务公司和签约公司统一使用 */ private String companyName; + /** * 销售经理姓名 + * 认领人和销售经理为统一字段 */ private String customManagerName; - } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java index 8a06613..84eb2ad 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java @@ -187,7 +187,7 @@ public class PsCompanyInfoBo { /** * 是否进出口 0否1是 */ - private String inout; + private String inoutType; /** * 是否申请发票 0否1是 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java index e18df3e..359f266 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java @@ -56,7 +56,7 @@ public class PsCompanyQueryBo { /** * 跟进人员 */ - private String followUser; + private String userName; /** * 1全部 2非托管服务 3 托管代账 4托管不代账 diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java index 2899ca7..5e1fd64 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoBo.java @@ -101,6 +101,7 @@ public class PsContractInfoBo { /** * 是否续费 + * o新签 1续费 */ private String isDue; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java index effe852..47ae831 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java @@ -87,5 +87,10 @@ public class PsContractInfoQueryBo { */ private List serviceProjects; + /** + * o新签 1续费 + */ + private String isDue; + } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java index 8aa7884..63af9e5 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsTaskQueryBo.java @@ -97,4 +97,20 @@ public class PsTaskQueryBo { */ private String isProxy; + + /** + * 合同编码 + */ + private String contractCode; + + /** + * 主任务状态 + */ + private String taskStatus; + + /** + * 子任务状态 + */ + private String appointStatus; + } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java index 01773e5..bf9c087 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java @@ -216,7 +216,7 @@ public class PsCompanyInfoVo implements Serializable { /** * 是否进出口 0否1是 */ - private String inout; + private String inoutType; /** * 是否申请发票 0否1是 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/ServiceScheduleVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/ServiceScheduleVo.java index cf2e3be..8381d49 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/ServiceScheduleVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/ServiceScheduleVo.java @@ -85,6 +85,21 @@ public class ServiceScheduleVo { this.status = status; } + public Long getUid() { + return uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } } public void addIn(UserAndStatus userAndStatus){ @@ -96,4 +111,29 @@ public class ServiceScheduleVo { public void addSecret(UserAndStatus userAndStatus){ this.secret.add(userAndStatus); } + + public Integer getInStatus(){ + for (UserAndStatus userAndStatus : in) { + if (userAndStatus.status == 0){ + return 0; + } + } + return 1; + } + public Integer getOutStatus(){ + for (UserAndStatus userAndStatus : out) { + if (userAndStatus.status == 0){ + return 0; + } + } + return 1; + } + public Integer getSecretStatus(){ + for (UserAndStatus userAndStatus : secret) { + if (userAndStatus.status == 0){ + return 0; + } + } + return 1; + } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/ApproverTypeEnum.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/ApproverTypeEnum.java index 3f20ea0..2da8af4 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/ApproverTypeEnum.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/ApproverTypeEnum.java @@ -19,7 +19,7 @@ public enum ApproverTypeEnum { TASKCANCE("taskcance","任务作废审批"), RETURN("RETURN","退款审批"), FREE("free","免费工单审批"), - TERMINATIONSERVICE("terminationService","终止合作"); + STOPACCOUNT("stopAccount","停止代账"); private String code; private String text; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsApproverRecordMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsApproverRecordMapper.java index 1780bdc..6e308c4 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsApproverRecordMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsApproverRecordMapper.java @@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Param; */ public interface PsApproverRecordMapper extends BaseMapperPlus { - Page selectPageApproverList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageApproverList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper, @Param("pay") String payModel); Page selectPageFreeApproverList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); Page selectPagePublicList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractBusinessMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractBusinessMapper.java index d8fe083..28dfe0d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractBusinessMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractBusinessMapper.java @@ -17,5 +17,5 @@ import java.util.List; public interface PsContractBusinessMapper extends BaseMapperPlus { - List selectBusinessList(@Param("contractCode") List contractCode); + List selectBusinessList(@Param("contractCode") List contractCode, @Param("serviceCompanyId")Long serviceCompanyId); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractBusinessService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractBusinessService.java index 59f4e27..c980eed 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractBusinessService.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractBusinessService.java @@ -39,6 +39,12 @@ public interface IPsContractBusinessService { * @return */ List selectBusinessList(List contractCode); + /** + * 根据合同编码查询服务信息 + * @param contractCode + * @return + */ + List selectBusinessList(List contractCode, Long serviceCompanyId); /** * 查询合同服务类别 * diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractInfoService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractInfoService.java index f2a597c..afe2bb4 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractInfoService.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsContractInfoService.java @@ -29,7 +29,7 @@ public interface IPsContractInfoService { * @param type 操作类型 1保存2暂存 * @return 是否新增成功 */ - Long createContract(PsContractInfoBo bo,Integer type); + String createContract(PsContractInfoBo bo,Integer type); /** * 预览合同 * diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java index a6f48b8..75a8b33 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java @@ -99,10 +99,11 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { .eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) .like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) .like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) + .like(StringUtils.isNotBlank(bo.getContractCode()),"app.contract_code",bo.getContractCode()) //销售经理姓名 .exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = info.custom_manager and su.nick_name like '%"+bo.getCustomManagerName()+"%'") .orderByAsc("app.approver_status").orderByDesc("app.apply_date"); - Page res = recordMapper.selectPageApproverList(pageQuery.build(), lqw); + Page res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay()); if(CollectionUtils.isNotEmpty(res.getRecords())){ res.getRecords().forEach(item->{ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/FreeApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/FreeApproverServiceImpl.java index 5fe7363..7385df1 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/FreeApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/FreeApproverServiceImpl.java @@ -92,9 +92,9 @@ public class FreeApproverServiceImpl extends ApproverAbstractServiceImpl { QueryWrapper lqw = Wrappers.query().eq("app.business_type", approverType()) .eq(bo.getId()!=null,"app.id",bo.getId()) .eq("app.del_flag","0") - .eq(com.pusong.common.core.utils.StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) - .like(com.pusong.common.core.utils.StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) - .like(com.pusong.common.core.utils.StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) + .eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status", bo.getApproverStatus()) + .like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name", bo.getCustomerName()) + .like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name", bo.getCompanyName()) //销售经理姓名 .exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = info.custom_manager and su.nick_name like '%"+bo.getCustomManagerName()+"%'") .orderByAsc("app.approver_status").orderByDesc("app.apply_date"); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TerminationServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/StopAccountServiceImpl.java similarity index 57% rename from pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TerminationServiceImpl.java rename to pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/StopAccountServiceImpl.java index 320e9c3..3beeb85 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TerminationServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/StopAccountServiceImpl.java @@ -1,44 +1,27 @@ package com.pusong.business.service.approver.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pusong.business.domain.PsApproverRecord; -import com.pusong.business.domain.PsTaskMain; -import com.pusong.business.domain.bo.PsApproverRecordBo; -import com.pusong.business.domain.vo.PsApproverRecordVo; -import com.pusong.business.domain.vo.PsCompanyInfoVo; -import com.pusong.business.domain.vo.PsContractPayVo; import com.pusong.business.enums.ApproverTypeEnum; -import com.pusong.business.enums.PayStatusEnum; -import com.pusong.business.enums.TaskStatusEnum; -import com.pusong.business.enums.TaskTypeEnum; import com.pusong.business.mapper.PsApproverRecordMapper; import com.pusong.business.mapper.PsTaskAppointMapper; import com.pusong.business.mapper.PsTaskMainMapper; import com.pusong.business.service.IPsCompanyInfoService; import com.pusong.business.service.IPsContractInfoService; -import com.pusong.common.core.utils.DateUtils; -import com.pusong.common.core.utils.StringUtils; -import com.pusong.common.mybatis.core.page.PageQuery; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - /** * 免费工单审批 */ @RequiredArgsConstructor @Service @Slf4j -public class TerminationServiceImpl extends ApproverAbstractServiceImpl { +public class StopAccountServiceImpl extends ApproverAbstractServiceImpl { @Override public String approverType() { - return ApproverTypeEnum.TERMINATIONSERVICE.getCode(); + return ApproverTypeEnum.STOPACCOUNT.getCode(); } private final PsTaskMainMapper taskMainMapper; private final PsTaskAppointMapper taskAppointMapper; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java index 976e19c..42ec6db 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java @@ -129,7 +129,7 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService { lqw.like(bo.getCustomMobile() != null,"cus.custom_mobile",bo.getCustomMobile()); lqw.like(bo.getCompanyName() != null,"com.company_name",bo.getCompanyName()); lqw.eq(bo.getServiceStatus() != null,"com.service_status",bo.getServiceStatus()); - lqw.exists(StringUtils.isNotBlank(bo.getFollowUser()),"select 1 from sys_user fsu where fsu.user_id = cf.user_id and fsu.nick_name like '%"+bo.getFollowUser()+"%'"); + lqw.exists(StringUtils.isNotBlank(bo.getUserName()),"select 1 from sys_user fsu where fsu.user_id = cf.user_id and fsu.nick_name like '%"+bo.getUserName()+"%'"); StringBuilder sql = new StringBuilder("select 1 from ps_contract_business cb where cb.company_id = com.id "); if (bo.getType() == 2){ //非托管 @@ -279,7 +279,7 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService { */ public void terminationService(Long serviceCompanyId) { //发起审批 - ApproverService service = container.getService(ApproverTypeEnum.TERMINATIONSERVICE.getCode()); + ApproverService service = container.getService(ApproverTypeEnum.STOPACCOUNT.getCode()); service.apply(serviceCompanyId + "", "",null, null); } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractBusinessServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractBusinessServiceImpl.java index 98065ac..f280d26 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractBusinessServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractBusinessServiceImpl.java @@ -86,19 +86,20 @@ public class PsContractBusinessServiceImpl implements IPsContractBusinessService return lqw; } + public List selectBusinessList(List contractCode){ + return this.selectBusinessList(contractCode, null); + } /** * 根据合同编码查询服务信息 * @param contractCode * @return */ - public List selectBusinessList(List contractCode) { + public List selectBusinessList(List contractCode, Long serviceCompanyId) { if(CollectionUtils.isEmpty(contractCode)){return new ArrayList<>();} - return baseMapper.selectBusinessList(contractCode); + return baseMapper.selectBusinessList(contractCode, serviceCompanyId); } - - /* *//** * 查询合同服务类别 * diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index 8eb4cbc..bb22e9a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -98,7 +98,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { */ @Override @Transactional//开启事务 - public Long createContract(PsContractInfoBo bo, Integer type) { + public String createContract(PsContractInfoBo bo, Integer type) { if (bo.getFirstPartyType() == PsContractInfoBo.FIRSTPARTYTYPE.INDIVIDUALS.getType()){ bo.setContactPersonName(bo.getCompanyInfoBo().getLegalPersonName()); bo.setContactPersonPhone(bo.getCompanyInfoBo().getLegalPersonPhone()); @@ -179,7 +179,8 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { //4.删除所有服务类型和服务项目,.插入服务类型 businessService.saveList(list, add.getContractCode()); //7.生成合同 - return makePdf(add, bo,true); + makePdf(add, bo,true); + return add.getContractCode(); } /** * 预览合同 @@ -523,9 +524,10 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { if(StringUtils.equals(CustomerStatusEnum.STOP.getCode(),infoVo.getPsCustomInfoVo().getCustomStatus())){ throw new ServiceException("操作失败，客户已终止合作"); } - + fillMoney(infoVo); //没有任何一笔收款：点击【作废】，直接作废合同 - if(CollectionUtils.isEmpty(infoVo.getContractPayVoList())){ + // if(CollectionUtils.isEmpty(infoVo.getContractPayVoList())){ + if (infoVo.getPayMoney().compareTo(BigDecimal.ZERO) == 0){ info.setIsCancel(CommonStatusEnum.SUCCESS.getCode()); }else{ if(StringUtils.isBlank(desc)){throw new ServiceException("请填写作废原因");} @@ -810,11 +812,11 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { if(CollectionUtils.isNotEmpty(appointList)){ appointList.forEach(item->{ if(StringUtils.equals("1",item.getAppointType())){ - serviceScheduleVo.addIn(new ServiceScheduleVo.UserAndStatus(item.getExecutor(), StringUtils.equals(AppointStatusEnum.FINISH.getCode(),item.getAppointStatus())?1:0)); + serviceScheduleVo.addIn(new ServiceScheduleVo.UserAndStatus(item.getExecutor(), StringUtils.equals(AppointStatusEnum.FINISH.getCode(), item.getAppointStatus()) ? 1 : 0)); }else if(StringUtils.equals("2",item.getAppointType())){ - serviceScheduleVo.addOut(new ServiceScheduleVo.UserAndStatus(item.getExecutor(), StringUtils.equals(AppointStatusEnum.FINISH.getCode(),item.getAppointStatus())?1:0)); + serviceScheduleVo.addOut(new ServiceScheduleVo.UserAndStatus(item.getExecutor(), StringUtils.equals(AppointStatusEnum.FINISH.getCode(), item.getAppointStatus()) ? 1 : 0)); }else{ - serviceScheduleVo.addSecret(new ServiceScheduleVo.UserAndStatus(item.getExecutor(), StringUtils.equals(AppointStatusEnum.FINISH.getCode(),item.getAppointStatus())?1:0)); + serviceScheduleVo.addSecret(new ServiceScheduleVo.UserAndStatus(item.getExecutor(), StringUtils.equals(AppointStatusEnum.FINISH.getCode(), item.getAppointStatus()) ? 1 : 0)); } }); } @@ -848,6 +850,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { qw.in( CollectionUtils.isNotEmpty(bo.getInContractStatus()),"info.contract_status", bo.getInContractStatus()); qw.notIn( CollectionUtils.isNotEmpty(bo.getNotInContractStatus()),"info.contract_status", bo.getNotInContractStatus()); qw.eq( StringUtils.isNotBlank(bo.getContractCode()),"info.contract_code", bo.getContractCode()); + qw.eq( StringUtils.isNotBlank(bo.getIsDue()),"info.is_due", bo.getIsDue()); //客户表条件 qw.like( StringUtils.isNotBlank(bo.getCustomName()),"cus.custom_name", bo.getCustomName()); qw.like( StringUtils.isNotBlank(bo.getCustomMobile()),"cus.custom_mobile", bo.getCustomMobile()); @@ -944,7 +947,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { BigDecimal netPay = returnList.stream().map(PsContractPayVo::getMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal pay = netPay.subtract(vo.getReturnMoney()); //已付金额(收款-退款) - vo.setPayMoney(pay.compareTo(BigDecimal.ZERO)>=0?pay:BigDecimal.ZERO); + vo.setPayMoney(pay.compareTo(BigDecimal.ZERO) >= 0 ? pay : BigDecimal.ZERO); //未付金额(合同金额-已付金额) vo.setResidualMoney((vo.getContractAmount() == null ? BigDecimal.ZERO:vo.getContractAmount()).subtract(vo.getPayMoney())); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index fdf2e51..9f91d7c 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -160,6 +160,7 @@ public class PsTaskServiceImpl implements IPsTaskService { lqw.exists(StringUtils.isNotBlank(ex), "select 1 from sys_user su where appo.executor = su.user_id and su.nick_name like '%" + ex + "%'"); lqw.eq("appo.appoint_type",bo.getAppointType()); lqw.eq(id != null,"appo.id",id); + lqw.eq(StringUtils.isNotBlank(bo.getAppointStatus()),"appo.appoint_status", bo.getAppointStatus()); log.info(lqw.getCustomSqlSegment()); Page page = baseMapper.queryChildTaskPageList(pageQuery.build(), lqw); fillInfo(page); @@ -260,7 +261,7 @@ public class PsTaskServiceImpl implements IPsTaskService { // throw new ServiceException("任务已完成，无法修改"); // } customerId = taskMain.getCustomId(); - companyId = taskMain.getCompanyId(); + companyId = taskMain.getServiceCompanyId(); }else if(StringUtils.isNotBlank(save.getContractCode())){ PsContractInfo con = contractInfoMapper.selectOne(Wrappers.lambdaQuery().eq(PsContractInfo::getContractCode, save.getContractCode())); customerId = con.getCustomId(); @@ -456,12 +457,19 @@ public class PsTaskServiceImpl implements IPsTaskService { private QueryWrapper buildQueryWrapper(PsTaskQueryBo bo) { QueryWrapper lqw = new QueryWrapper(); lqw.eq("main.del_flag","0"); - lqw.ne("main.task_status",TaskStatusEnum.CANCEL.getCode()); - if(StringUtils.equals(bo.getType(),"1")){ - lqw.in(StringUtils.isNotBlank(bo.getType()),"main.task_type",List.of("1","2")); + + + lqw.ne(StringUtils.isBlank(bo.getTaskStatus()), "main.task_status", TaskStatusEnum.CANCEL.getCode()); + lqw.eq(StringUtils.isNotBlank(bo.getTaskStatus()),"main.task_status", bo.getTaskStatus()); + + if(bo.getType() == null){ + lqw.in("main.task_type", List.of("1", "2")); }else{ - lqw.eq(StringUtils.isNotBlank(bo.getType()),"main.task_type",bo.getType()); + lqw.eq("main.task_type", bo.getType()); } + + + lqw.eq(bo.getId() != null,"main.id",bo.getId()); lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), "com.company_name", bo.getCompanyName());//公司名称 lqw.like(StringUtils.isNotBlank(bo.getCustomerNum()), "com.customer_num", bo.getCustomerNum());//纳税人识别号 diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsApproverRecordMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsApproverRecordMapper.xml index 2fbd363..7ada9e9 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsApproverRecordMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsApproverRecordMapper.xml @@ -6,7 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + @@ -35,10 +37,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" , (select IFNULL(sum(pa.money),0) from ps_contract_pay pa where pa.pay_status = 1 and pa.business_type = 1 and pa.contract_code = info.contract_code )-(select IFNULL(sum(pay.money),0) from ps_contract_pay pay where pay.pay_status = 1 and pay.business_type = 2 and pay.contract_code = info.contract_code) as pay_money + + ,pay.* + from ps_approver_record app left join ps_contract_info info on app.contract_code = info.contract_code and app.del_flag = 0 left join ps_company_info com on info.company_id = com.id left join ps_custom_info cus on cus.id = info.custom_id + + inner join ps_contract_pay pay on pay.id = app.business_id and pay.pay_mode = ${pay} + + ${ew.getCustomSqlSegment} @@ -55,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" , cus.custom_mobile , cus.custom_manager from ps_approver_record app - left join ps_company_info com on app.business_id = com.id + inner join ps_company_info com on app.business_id = com.id left join ps_custom_info cus on cus.id = com.custom_id ${ew.getCustomSqlSegment} diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml index b19ffdb..1138871 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml @@ -29,5 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{code} + + and company_id = ${serviceCompanyId} + +