bug

pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java

@@ -120,7 +120,6 @@ public class PsCustomController extends BaseController {
      * @param queryBo 查询
      * @return
      */
-    @RepeatSubmit()
     @SaCheckPermission("business:customInfo:record")
     @Log(title = "客户档案" )
     @GetMapping("/record")

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

@@ -97,7 +97,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
                 .eq(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName())
                 //销售经理姓名
                 .exists(StringUtils.isNotBlank(bo.getCustomerManageName()),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+bo.getCustomerManageName()+"%")
-                .orderByAsc("app.approver_status").orderByAsc("app.approver_date");
+                .orderByAsc("app.approver_status").orderByDesc("app.apply_date");
         Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw);
         if(CollectionUtils.isNotEmpty(res.getRecords())){
             res.getRecords().forEach(item->{

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java

@@ -55,6 +55,11 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
         update.setId(Long.valueOf(psApproverRecord.getBusinessId()));
         update.setPayStatus(PayStatusEnum.SUCCESS.getCode());
         payService.updateById(update);
+        if(StringUtils.isNotBlank(info.getSrcContractCode())){
+            log.info("续费合同不需要生成任务"+info.getSrcContractCode());
+            return;
+        }
+
         List<PsContractPayVo> list = payService.queryListByContractCode(info.getContractCode(), PayBuinessStatusEnum.PAY.getCode(), PayStatusEnum.SUCCESS);
         //如果没有过回款记录初始化任务主表,并修改合同状态
         log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus());

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskCancellaApproverServiceImpl.java

@@ -8,6 +8,7 @@ import com.pusong.business.domain.PsTaskMain;
 import com.pusong.business.enums.ApproverTypeEnum;
 import com.pusong.business.enums.ContractStatusEnum;
 import com.pusong.business.enums.TaskStatusEnum;
+import com.pusong.business.mapper.PsApproverRecordMapper;
 import com.pusong.business.mapper.PsTaskAppointMapper;
 import com.pusong.business.mapper.PsTaskMainMapper;
 import com.pusong.business.service.IPsContractInfoService;
@@ -29,6 +30,7 @@ public class TaskCancellaApproverServiceImpl extends ApproverAbstractServiceImpl
     }
     private final PsTaskMainMapper taskMainMapper;
     private final PsTaskAppointMapper taskAppointMapper;
+    private final PsApproverRecordMapper baseMapper;
 
     /**
      * 1 审批成功 合同作废成功，合同状态显示为【已作废】
@@ -44,6 +46,7 @@ public class TaskCancellaApproverServiceImpl extends ApproverAbstractServiceImpl
         taskAppointMapper.update(Wrappers.<PsTaskAppoint>lambdaUpdate()
                 .set(PsTaskAppoint::getAppointStatus, TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())
                 .eq(PsTaskAppoint::getTaskId, info.getId()));
+
     }
 
     /**

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/TaskFinishApproverServiceImpl.java

@@ -11,6 +11,7 @@ import com.pusong.business.mapper.PsTaskAppointMapper;
 import com.pusong.business.mapper.PsTaskMainMapper;
 import com.pusong.business.service.IPsContractInfoService;
 import com.pusong.business.service.impl.PsContractInfoServiceImpl;
+import com.pusong.common.core.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -36,9 +37,11 @@ public class TaskFinishApproverServiceImpl extends ApproverAbstractServiceImpl {
     @Override
     public void success(PsApproverRecord psApproverRecord) {
         PsTaskAppoint info = taskAppointMapper.selectById(psApproverRecord.getBusinessId());
-        info.setAppointStatus(TaskStatusEnum.FINISH.getCode());
+        if(StringUtils.equals(info.getAppointStatus(),TaskStatusEnum.AppointStatusEnum.CANCEL.getCode())){
+            info.setAppointStatus(TaskStatusEnum.AppointStatusEnum.FINISH.getCode());
             taskAppointMapper.updateById(info);
         }
+    }
 
     /**
      * 审批拒绝 任务的状态变为进行中

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java

@@ -222,6 +222,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
         }else if (bo.getType() == 3){//已回款(要特定的作废数据)
             bo.setInContractStatus(ContractStatusEnum.getReturn());
         }else if (bo.getType() == 4){//托管续费合同
+            bo.setInContractStatus(List.of(ContractStatusEnum.SUCCESS.getCode()));
             log.info("托管服务");
         }
 
@@ -614,7 +615,7 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
         }
         //回传合同审批
         if(StringUtils.equals(CommonStatusEnum.FAIL.getCode(),vo.getRollBackStatus())){
-            vo.setRollBackFailDesc(approverRecordService.getLastFail(vo.getContractCode(),vo.getContractCode(),List.of(ApproverTypeEnum.SIGN.getCode())));
+            vo.setRollBackFailDesc(approverRecordService.getLastFail(vo.getContractCode(),vo.getContractCode(),List.of(ApproverTypeEnum.ROLBACK.getCode())));
         }
         //合同作废审批
         if(StringUtils.equals(CommonStatusEnum.FAIL.getCode(),vo.getIsCancel())){

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractPayServiceImpl.java

@@ -79,9 +79,9 @@ public class PsContractPayServiceImpl implements IPsContractPayService {
                 .orderByAsc(PsContractPay::getPayDate));
         list = list == null?new ArrayList<>():list;
         list.forEach(item->{
-            if(StringUtils.equals("2",item.getBusinessType()) &&  StringUtils.equals(PayStatusEnum.PAYAPPO.getCode(),item.getPayStatus())){
+            if(StringUtils.equals("2",item.getBusinessType()) &&  StringUtils.equals(PayStatusEnum.FILE.getCode(),item.getPayStatus())){
                 item.setPayStatusDesc(approverRecordService.getLastFail(item.getId()+"",null,List.of(ApproverTypeEnum.RETURN.getCode())));
-            }else if(StringUtils.equals("1",item.getBusinessType()) &&  StringUtils.equals(PayStatusEnum.PAYING.getCode(),item.getPayStatus())){
+            }else if(StringUtils.equals("1",item.getBusinessType()) &&  StringUtils.equals(PayStatusEnum.FILE.getCode(),item.getPayStatus())){
                 item.setPayStatusDesc(approverRecordService.getLastFail(item.getId()+"",null,List.of(ApproverTypeEnum.PAY.getCode())));
             }
         });
@@ -108,7 +108,7 @@ public class PsContractPayServiceImpl implements IPsContractPayService {
         baseMapper.insert(pay);
         //发起审批
         ApproverService service = container.getService(ApproverTypeEnum.PAY.getCode());
-        service.apply(pay.getId()+"",pay.getContractCode(),null, null);
+        service.apply(pay.getId()+"",pay.getContractCode(),payBo.getPayDesc(), null);
     }
     /**
      * 添加退款记录

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.pusong.business.domain.PsCompanyInfo;
+import com.pusong.business.domain.*;
-import com.pusong.business.domain.PsCustomCallback;
-import com.pusong.business.domain.PsCustomPrice;
 import com.pusong.business.domain.bo.*;
 import com.pusong.business.domain.vo.*;
 import com.pusong.business.enums.ApproverTypeEnum;
@@ -33,7 +31,6 @@ import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.pusong.business.domain.PsCustomInfo;
 import com.pusong.business.service.IPsCustomInfoService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -424,6 +421,12 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
         if(StringUtils.equals(CommonStatusEnum.Y.getCode(),psCustomInfo.getBlack()) || psCustomInfo.getDelFlag()!=0){
             throw new ServiceException("数据状态已变更，请刷新后重试");
         }
+        Long num = contractInfoMapper.selectCount(Wrappers.<PsContractInfo>lambdaQuery().eq(PsContractInfo::getCustomId, customerId)
+                .notIn(PsContractInfo::getContractStatus, List.of(ContractStatusEnum.INIT.getCode(), ContractStatusEnum.SUCCESS.getCode()))
+                .ne(PsContractInfo::getIsCancel, CommonStatusEnum.SUCCESS.getCode()));
+        if(num>=0){
+            throw new ServiceException("有未完成的合同，无法终止合作");
+        }
         psCustomInfo.setCustomStatus(CustomerStatusEnum.STOP.getCode());
         baseMapper.updateById(psCustomInfo);
     }

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java

@@ -100,7 +100,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
                 vo.setNumOfDat(DateUtils.calWorkDate(vo.getStartDate(),new Date()));
             }
             //任务作废审批
-            vo.setTaskStatusDesc(approverRecordService.getLastFail(vo.getId()+"",null,List.of(ApproverTypeEnum.TASKCANCE.getCode(),ApproverTypeEnum.TASKFINISH.getCode())));
+            vo.setTaskStatusDesc(approverRecordService.getLastFail(vo.getId()+"",null,List.of(ApproverTypeEnum.TASKCANCE.getCode())));
         }
         return TableDataInfo.build(page);
     }
@@ -123,6 +123,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
             if(vo.getStartDate() != null){
                 vo.setNumOfDat(DateUtils.calWorkDate(vo.getStartDate(),new Date()));
             }
+            vo.setTaskStatusDesc(approverRecordService.getLastFail(vo.getId()+"",null,List.of(ApproverTypeEnum.TASKFINISH.getCode())));
         }
         return TableDataInfo.build(page);
     }
@@ -252,7 +253,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
         list.removeIf(item->StringUtils.equals("-1", item) || ossIdList.contains(item));
         //2.3删除无用资料
         if(CollectionUtils.isNotEmpty(list)){
-            ossService.deleteWithValidByIds(list.stream().map(Long::parseLong).collect(Collectors.toList()),null);
+            ossService.deleteWithValidByIds(list.stream().map(Long::parseLong).collect(Collectors.toList()),false);
         }
     }
     /**

pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java

@@ -243,7 +243,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
+        if (isValid != null && isValid) {
             // 做一些业务上的校验,判断是否需要校验
         }
         List<SysOss> list = baseMapper.selectBatchIds(ids);