From 4fa5b24bb94deadb77e6907b994c275bb1c6ef2d Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Thu, 21 Nov 2024 09:22:52 +0800 Subject: [PATCH] bug --- .../com/pusong/business/controller/HomeController.java | 3 ++- .../java/com/pusong/business/service/HomeService.java | 2 +- .../approver/impl/PayContractApproverServiceImpl.java | 4 ++-- .../com/pusong/business/service/impl/HomeServiceImpl.java | 8 +++++--- .../pusong/business/service/impl/PsTaskServiceImpl.java | 7 ++++++- .../main/resources/mapper/business/PsTaskMainMapper.xml | 4 +++- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java index 45a7d5f..86de616 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java @@ -11,6 +11,7 @@ import com.pusong.business.service.IPsSalaryService; import com.pusong.common.core.domain.R; import com.pusong.common.mybatis.core.page.PageQuery; import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; import com.pusong.common.web.core.BaseController; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -162,6 +163,6 @@ public class HomeController extends BaseController { */ @GetMapping("/salasData") public R salasData(@RequestParam() Integer type) { - return R.ok(homeService.salasData(type)); + return R.ok(homeService.salasData(type, LoginHelper.getUserId())); } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/HomeService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/HomeService.java index 27c6bd6..47c3afc 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/HomeService.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/HomeService.java @@ -43,5 +43,5 @@ public interface HomeService { * @param type * @return */ - SalasVo salasData(Integer type); + SalasVo salasData(Integer type, Long uid); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java index d865989..e15c1aa 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java @@ -102,7 +102,7 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl PsContractPayVo psContractPayVo = payService.queryById(Long.valueOf(psApproverRecord.getBusinessId())); - if (psContractPayVo.getMoney().equals(info.getResidualMoney())){ + if (psContractPayVo.getMoney().equals(info.getPayMoney())){ noticeService.sendNotice(SysNoticeBo.getFirstPayInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName())); }else{ if (info.getResidualMoney().doubleValue() > 0){ @@ -123,7 +123,7 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl PsContractPayVo psContractPayVo = payService.queryById(Long.valueOf(psApproverRecord.getBusinessId())); PsContractInfoVo info = psContractInfoService.queryContractByCode(psApproverRecord.getContractCode()); - if (ContractStatusEnum.CREATE.getCode().equals(info.getContractStatus())){ + if (info.getPayMoney().doubleValue() == 0){ noticeService.sendNotice(SysNoticeBo.getFirstPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc())); }else{ if (info.getResidualMoney().subtract(psContractPayVo.getMoney()).doubleValue() > 0){ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java index 5146278..7554511 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java @@ -254,6 +254,7 @@ public class HomeServiceImpl implements HomeService { // .between("end_date", startDate, endDate) .ge(startDate != null,"end_date", startDate) .lt(endDate != null,"end_date", endDate) + .exists("select 1 from ps_contract_info info where info.contract_code = ps_contract_business.contract_code and info.is_cancel != '03' ") .groupBy("company_id") .groupBy("contract_code"); //到期的合同 @@ -281,6 +282,7 @@ public class HomeServiceImpl implements HomeService { .lt(endDate != null,"apply_date", endDate) .eq("con.is_due", 1) .in("cc.company_id", companyIds) + .ne("con.is_cancel", "03") // .notIn("cc.contract_code", contractCodeList) ; //已续费的合同 @@ -312,7 +314,7 @@ public class HomeServiceImpl implements HomeService { * @param isCaiwu * @return */ -// @Cacheable(cacheNames = CacheNames.HOME_E, key = "#type+'_' + #tabType") + @Cacheable(cacheNames = CacheNames.HOME_E, key = "#type+'_' + #tabType") public UserAmountVo getUserContractSourceAmountsByDeptId(Integer type, int tabType){ Map mapParam = this.getDate(type); LocalDate startDate = (LocalDate)mapParam.get("startDate"); @@ -780,8 +782,8 @@ public class HomeServiceImpl implements HomeService { * @param type * @return */ - @Cacheable(cacheNames = CacheNames.HOME_G, key = "#type") - public SalasVo salasData(Integer type){ + @Cacheable(cacheNames = CacheNames.HOME_G, key = "#type+'_' + #uid") + public SalasVo salasData(Integer type, Long uid){ Map mapParam = this.getDateByUser(type); LocalDate startDate = (LocalDate)mapParam.get("startDate"); LocalDate endDate = (LocalDate)mapParam.get("endDate"); 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 762a96e..7c32436 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 @@ -46,6 +46,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 主任务Service业务层处理 @@ -110,6 +111,7 @@ public class PsTaskServiceImpl implements IPsTaskService { QueryWrapper lqw = buildQueryWrapper(bo); Page page; if(StringUtils.equals(TaskTypeEnum.INVOICE.getCode(), bo.getType())){//发票任务无需数据权限 + lqw.orderByDesc("main.create_time"); page = baseMapper.queryInvoiceTaskPageList(pageQuery.build(), lqw); for (PsTaskMainVo vo : page.getRecords()) { PsInvoiceVo psInvoiceVo = JSONObject.parseObject(vo.getExtend(), PsInvoiceVo.class); @@ -117,6 +119,9 @@ public class PsTaskServiceImpl implements IPsTaskService { vo.setExtend(null); } }else{ + lqw.orderByAsc("CASE WHEN main.task_status = '30' THEN 1 ELSE 0 END "); + lqw.orderByAsc("assigned"); + lqw.orderByDesc("main.create_time"); page = baseMapper.queryTaskPageList(pageQuery.build(), lqw); } @@ -661,7 +666,7 @@ public class PsTaskServiceImpl implements IPsTaskService { .exists("com.company_name", bo.getAppKeyWord()) ); - lqw.orderByDesc("main.create_time"); + return lqw; } diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml index 3d75726..06be121 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml @@ -58,9 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cus.custom_manager cus_custom_manager, usr.nick_name cus_custom_manager_name, - (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=1 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as inAppo, + (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=1 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as inAppo, (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=2 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as outAppo, (select pta.id from ps_task_appoint pta where pta.task_id=main.id and pta.appoint_type=3 and pta.appoint_status != '50' and pta.del_flag = '0' order by id desc limit 0,1) as secAppo, + + (select 1 from ps_task_appoint pta where pta.task_id = main.id and pta.appoint_type in(1,2,3) and pta.appoint_status != '50' and pta.del_flag = '0' limit 1) assigned , (CASE WHEN (con.contract_amount - (select IFNULL(sum(money),0) from ps_contract_pay pay where pay.business_type =1 and pay.contract_code = main.contract_code and pay.pay_status = '1' ) + (select IFNULL(sum(money),0) from ps_contract_pay cpay where cpay.business_type =2 and cpay.contract_code = main.contract_code )