bug

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<SalasVo> salasData(@RequestParam() Integer type) {
-        return R.ok(homeService.salasData(type));
+        return R.ok(homeService.salasData(type, LoginHelper.getUserId()));
     }
 }

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);
 }

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){

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<String, Object> 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")
+    @Cacheable(cacheNames = CacheNames.HOME_G, key = "#type+'_' + #uid")
-    public SalasVo salasData(Integer type){
+    public SalasVo salasData(Integer type, Long uid){
         Map<String, Object> mapParam = this.getDateByUser(type);
         LocalDate startDate = (LocalDate)mapParam.get("startDate");
         LocalDate endDate = (LocalDate)mapParam.get("endDate");

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<PsTaskMain> lqw = buildQueryWrapper(bo);
         Page<PsTaskMainVo> 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;
     }
 

pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (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 )