From a68bf12a2975405f57f9a9d51b91c13a93c026f0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 31 一月 2024 21:01:36 +0800
Subject: [PATCH] Mr.Shi

---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index d9c548e..cf56469 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -431,10 +431,14 @@
     @Override
     public   void dealWaitSignedData(){
         List<InsuranceApply> applyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
-                .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WAIT_SIGNATURE)
+                .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
                 .isNotNull(InsuranceApply::getSignApplyNo));
         if(applyList !=null && applyList.size()>0 ){
             for(InsuranceApply model : applyList){
+                String status = signService.linkFileStatus(model.getSignApplyNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
                 String link = signService.linkFile(model.getSignApplyNo());
                 String fileUrl = uploadSignFile(link);
                 if(StringUtils.isBlank(fileUrl)){
@@ -446,10 +450,14 @@
             }
         }
         List<ApplyChange> chagneList = applyChangeMapper.selectList(new QueryWrapper<ApplyChange>().lambda()
-                .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.UPLOAD)
+                .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.UPLOAD.getKey())
                 .isNotNull(ApplyChange::getSignApplyNo));
         if(chagneList !=null && chagneList.size()>0 ){
             for(ApplyChange model : chagneList){
+                String status = signService.linkFileStatus(model.getSignApplyNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
                 String link = signService.linkFile(model.getSignApplyNo());
                 String fileUrl = uploadSignFile(link);
                 if(StringUtils.isBlank(fileUrl)){
@@ -919,6 +927,12 @@
         //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
         if(loginUserInfo.getType().equals(Constants.ONE)){
             queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+        }else{
+            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+                queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+            }else{
+                queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+            }
         }
         if (pageWrap.getModel().getSolutionId() != null) {
             queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
@@ -999,6 +1013,12 @@
         //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
         if(loginUserInfo.getType().equals(Constants.ONE)){
             queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+        }else{
+            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+                queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+            }else{
+                queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+            }
         }
         if (model.getSolutionId() != null) {
             queryWrapper.eq(InsuranceApply::getSolutionId, model.getSolutionId());

--
Gitblit v1.9.3