From cca6dd93779040e13d52981a55afd2dd7ee17b90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 12 六月 2024 17:16:03 +0800
Subject: [PATCH] sssssssssss

---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |  603 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 379 insertions(+), 224 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 07136ac..d650b07 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.constants.ResponseStatus;
@@ -93,6 +94,8 @@
 
     @Autowired
     private MemberMapper memberMapper;
+    @Autowired
+    private MemberJoinMapper memberJoinMapper;
     @Autowired
     private DuSolutionMapper duSolutionMapper;
     @Autowired
@@ -1171,218 +1174,350 @@
 
     }
     @Override
-    public   void dealSignResult(NotifyDataReq data){
+    public   String dealSignResult(NotifyDataReq data){
         if(data.getApplyNo() == null ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+        if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )
+                || Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
             //濡傛灉宸蹭繚鍏�,鍙笅杞界绾﹂檮浠�
             String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                     systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
-            //鐩翠繚 鎶曚繚鐢宠
-            InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
-                    new MPJLambdaWrapper<InsuranceApply>()
-                            .selectAll(InsuranceApply.class)
-                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
-                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
-                            .eq(Solutions::getType,Constants.ZERO)
-                            .eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
-                            .last("limit 1" ));
-            if(model != null && Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
+           String r = dealXBTBBiz(path,data,"鐩翠繚-鎶曚繚鐢宠绛剧讲");
+           if(StringUtils.isNotBlank(r)){
+               return  r;
+           }
+            r = dealWTBQYQRSBiz(path,data,"濮旀墭淇�-浼佷笟鏂规纭涔︾缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealWTBQYRYMQDBiz(path,data,"濮旀墭淇�-浼佷笟浜哄憳鍚嶅崟绛剧讲");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealWTBTBSQBiz(path,data,"濮旀墭淇�-鎶曚繚鐢宠涔︾缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealZBJJBQYBiz(path,data,"鐩翠繚-鍔犲噺淇濅紒涓氱缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealWTBJJBQYBiz(path,data,"濮旀墭淇�-鍔犲噺淇濅紒涓氱缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealHBDSHBiz(path,data,"鎶曚繚鍚堝苟鍗�-鍟嗘埛绛剧讲绛剧讲");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealHBCHANGEQYBiz(path,data,"鍚堝苟鍔犲噺淇�/鎹㈠巶绛剧讲");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+        }
+        return "鏃犲鐞嗘暟鎹�";
+    }
+
+    private String dealHBCHANGEQYBiz(String path, NotifyDataReq data, String title) {
+        UnionChange unionChange = unionChangeJoinMapper.selectOne(
+                new MPJLambdaWrapper<UnionChange>()
+                        .selectAll(UnionChange.class)
+                        .eq(UnionChange::getSignApplyNo,data.getApplyNo())
+                        .last(" limit 1 "));
+        if(unionChange == null){
+            return null;
+        }
+        if( Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
                 //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
-                String link = signService.linkFile(data.getApplyNo());
+                String link = signService.linkFile(unionChange.getSignApplyNo());
                 String fileUrl = uploadSignFile(link);
                 if(StringUtils.isBlank(fileUrl)){
                     //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadSignedFileDo(model,fileUrl,path+fileUrl);
-                return;
-            }
-            //濮旀墭淇� 浼佷笟鏂规纭涔�
-            InsuranceApply modelTBQRS = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
-                    new MPJLambdaWrapper<InsuranceApply>()
-                            .selectAll(InsuranceApply.class)
-                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
-                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
-                            .eq(Solutions::getType,Constants.ONE)
-                            .eq(InsuranceApply::getSignQrsNo,data.getApplyNo())
-                            .last("limit 1" ));
-            if(modelTBQRS != null && Constants.equalsInteger(modelTBQRS.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
-                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
-                String link = signService.linkFile(data.getApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadFAQRSSignedFileDo(modelTBQRS,fileUrl,path+fileUrl);
-                return;
-            }
-
-
-
-            //濮旀墭淇� 浼佷笟绛剧讲浜哄憳鍚嶅崟
-            InsuranceApply modelMemberList = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
-                    new MPJLambdaWrapper<InsuranceApply>()
-                            .selectAll(InsuranceApply.class)
-                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
-                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
-                            .eq(Solutions::getType,Constants.ONE)
-                            .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo())
-                            .last("limit 1" ));
-            if(modelMemberList != null && Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){
-                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
-                String link = signService.linkFile(data.getApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadApplyMemberListSignedFileDo(modelMemberList,fileUrl,path+fileUrl);
-                return;
-            }
-
-
-            //濮旀墭淇� 鎶曚繚鐢宠涔︾缃�
-            InsuranceApply modelTBQSQ = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
-                    new MPJLambdaWrapper<InsuranceApply>()
-                            .selectAll(InsuranceApply.class)
-                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
-                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
-                            .eq(Solutions::getType,Constants.ONE)
-                            .eq(InsuranceApply::getApplyTbdNo,data.getApplyNo())
-                            .last("limit 1" ));
-            if(modelTBQRS != null && Constants.equalsInteger(modelTBQSQ.getUnionApplyTbdStatus(),Constants.ONE)){
-                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
-                String link = signService.linkFile(data.getApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadTBSQSSignedFileDo(modelTBQSQ,fileUrl,path+fileUrl);
-                return;
-            }
-
-            //鐩翠繚 鍔犲噺淇濅紒涓氱缃�
-            ApplyChange applyChange = applyChangeMapper.selectJoinOne(ApplyChange.class,
-                    new MPJLambdaWrapper<ApplyChange>()
-                            .selectAll(ApplyChange.class)
-                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
-                            .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
-                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                            .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
-                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
-                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
-                            .eq(Solutions::getType,Constants.ZERO)
-                            .eq(ApplyChange::getSignApplyNo,data.getApplyNo()).last("limit 1" ));
-            if(applyChange != null &&Constants.equalsInteger(applyChange.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
-                String link = signService.linkFile(data.getApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
-            }
-
-            //濮旀墭淇� 鍔犲噺淇濅紒涓氱缃�
-            ApplyChange applyChangeMemberList = applyChangeMapper.selectJoinOne(ApplyChange.class,
-                    new MPJLambdaWrapper<ApplyChange>()
-                            .selectAll(ApplyChange.class)
-                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
-                            .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
-                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                            .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
-                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
-                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
-                            .eq(Solutions::getType,Constants.ONE)
-                            .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()).last("limit 1" ));
-            if(applyChangeMemberList != null &&Constants.equalsInteger(applyChangeMemberList.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
-                String link = signService.linkFile(data.getApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
-            }
-
-
-            //鎶曚繚鍚堝苟鍗� 鍟嗘埛绛剧讲淇濆崟
-            UnionApply unionApply = unionApplyJoinMapper.selectOne(new QueryWrapper<UnionApply>()
-                    .lambda().eq(UnionApply::getSignApplyNo,data.getApplyNo()).last(" limit 1 "));
-            if(unionApply != null &&Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
-                String link = signService.linkFile(data.getApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
-            }
-
-
-            /**
-             *鍚堝苟鍔犲噺淇濇崲鍘� 绛剧讲涓氬姟
-             */
-            UnionChange unionChange = unionChangeJoinMapper.selectOne(
-                    new MPJLambdaWrapper<UnionChange>()
-                            .selectAll(UnionChange.class)
-                            .eq(UnionChange::getSignApplyNo,data.getApplyNo())
-                            .last(" limit 1 "));
-            if(unionChange != null &&Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
-                String link = signService.linkFile(model.getSignApplyNo());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
                 }
                 uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
+                        .set(UnionChange::getSignApplyNo,null)
+                        .eq(UnionChange::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealHBDSHBiz(String path, NotifyDataReq data, String title) {
+        //鎶曚繚鍚堝苟鍗� 鍟嗘埛绛剧讲淇濆崟
+        UnionApply unionApply = unionApplyJoinMapper.selectOne(new QueryWrapper<UnionApply>()
+                .lambda().eq(UnionApply::getSignApplyNo,data.getApplyNo()).last(" limit 1 "));
+        if(unionApply == null){
+            return null;
+        }
+        if( Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                unionApplyJoinMapper.update(null,new UpdateWrapper<UnionApply>().lambda()
+                        .set(UnionApply::getSignApplyNo,null)
+                        .eq(UnionApply::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+
+    }
+
+    private String dealWTBJJBQYBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 鍔犲噺淇濅紒涓氱缃�
+        ApplyChange applyChangeMemberList = applyChangeMapper.selectJoinOne(ApplyChange.class,
+                new MPJLambdaWrapper<ApplyChange>()
+                        .selectAll(ApplyChange.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
+                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(Solutions::getType,Constants.ONE)
+                        .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()).last("limit 1" ));
+        if(applyChangeMemberList == null){
+            return null;
+        }
+        if( Constants.equalsInteger(applyChangeMemberList.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
+                        .set(ApplyChange::getSignMemberListNo,null)
+                        .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealZBJJBQYBiz(String path, NotifyDataReq data, String title) {
+        //鐩翠繚 鍔犲噺淇濅紒涓氱缃�
+        ApplyChange applyChange = applyChangeMapper.selectJoinOne(ApplyChange.class,
+                new MPJLambdaWrapper<ApplyChange>()
+                        .selectAll(ApplyChange.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
+                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(Solutions::getType,Constants.ZERO)
+                        .eq(ApplyChange::getSignApplyNo,data.getApplyNo()).last("limit 1" ));
+        if(applyChange == null){
+            return null;
+        }
+        if( Constants.equalsInteger(applyChange.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
+                        .set(ApplyChange::getSignApplyNo,null)
+                        .eq(ApplyChange::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealWTBTBSQBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 鎶曚繚鐢宠涔︾缃�
+        InsuranceApply modelTBQSQ = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(Solutions::getType,Constants.ONE)
+                        .eq(InsuranceApply::getApplyTbdNo,data.getApplyNo())
+                        .last("limit 1" ));
+        if(modelTBQSQ == null){
+            return null;
+        }
+        if( Constants.equalsInteger(modelTBQSQ.getUnionApplyTbdStatus(),Constants.ONE)){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadTBSQSSignedFileDo(modelTBQSQ,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getApplyTbdNo,null)
+                        .eq(InsuranceApply::getApplyTbdNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealWTBQYRYMQDBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 浼佷笟绛剧讲浜哄憳鍚嶅崟
+        InsuranceApply modelMemberList = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(Solutions::getType,Constants.ONE)
+                        .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo())
+                        .last("limit 1" ));
+        if(modelMemberList == null){
+            return null;
+        }
+        if( Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadApplyMemberListSignedFileDo(modelMemberList,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getSignMemberListNo,null)
+                        .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealWTBQYQRSBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 浼佷笟鏂规纭涔�
+        InsuranceApply modelTBQRS = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(Solutions::getType,Constants.ONE)
+                        .eq(InsuranceApply::getSignQrsNo,data.getApplyNo())
+                        .last("limit 1" ));
+        if(modelTBQRS == null){
+            return null;
+        }
+        if(  Constants.equalsInteger(modelTBQRS.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadFAQRSSignedFileDo(modelTBQRS,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getSignQrsNo,null)
+                        .eq(InsuranceApply::getSignQrsNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
             }
 
-
-        }else if(Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
-            //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
-            insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
-                    .set(InsuranceApply::getSignApplyNo,null)
-                    .eq(InsuranceApply::getSignApplyNo,data.getApplyNo()));
-            applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
-                    .set(ApplyChange::getSignApplyNo,null)
-                    .eq(ApplyChange::getSignApplyNo,data.getApplyNo()));
-            insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
-                    .set(InsuranceApply::getSignQrsNo,null)
-                    .eq(InsuranceApply::getSignQrsNo,data.getApplyNo()));
-            insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
-                    .set(InsuranceApply::getSignMemberListNo,null)
-                    .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()));
-            unionApplyJoinMapper.update(null,new UpdateWrapper<UnionApply>().lambda()
-                    .set(UnionApply::getSignApplyNo,null)
-                    .eq(UnionApply::getSignApplyNo,data.getApplyNo()));
-            applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
-                    .set(ApplyChange::getSignMemberListNo,null)
-                    .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
-            unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
-                    .set(UnionChange::getSignApplyNo,null)
-                    .eq(UnionChange::getSignApplyNo,data.getApplyNo()));
         }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    /**
+     * 鎶曚繚鐩翠繚鐢宠绛剧讲
+     * @param path
+     * @param data
+     * @return
+     */
+    private String dealXBTBBiz(String path, NotifyDataReq data,String title) {
+        InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(Solutions::getType,Constants.ZERO)
+                        .eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
+                        .last("limit 1" ));
+        if(model == null){
+            return null;
+        }
+        if(  Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
+            //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title + "鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadSignedFileDo(model,fileUrl,path+fileUrl);
+                return title +"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getSignApplyNo,null)
+                        .eq(InsuranceApply::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
     }
 
 
@@ -1776,6 +1911,44 @@
         }
 
         if(CollectionUtils.isNotEmpty(applyDetailList)){
+            List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+                    .eq(Member::getCompanyId,insuranceApply.getCompanyId())
+                    .eq(Member::getIsdeleted,Constants.ZERO));
+
+            List<Member> addMemberList = new ArrayList<>();
+            for (int i = 0; i < applyDetailList.size(); i++) {
+                ApplyDetail applyDetail = applyDetailList.get(i);
+                Member member = null;
+                if(CollectionUtils.isNotEmpty(memberList)){
+                    Optional<Member>  optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
+                    if(optional.isPresent()){
+                        member = optional.get();
+                    }
+                }
+                if(Objects.isNull(member)){
+                    member = new Member();
+                    member.setCreateDate(new Date());
+                    member.setCreator(loginUserInfo.getId());
+                    member.setIsdeleted(Constants.ZERO);
+                    member.setName(applyDetail.getMemberName());
+                    member.setCompanyId(insuranceApply.getCompanyId());
+                    member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
+                    if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
+                        throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+                    }
+                    member.setIdcardNo(applyDetail.getIdcardNo());
+                    member.setApplyId(insuranceApply.getId());
+                    member.setStartTime(applyDetail.getStartTime());
+                    member.setEndTime(applyDetail.getEndTime());
+                    member.setDuId(applyDetail.getDuId());
+                    member.setWorktypeId(applyDetail.getWorktypeId());
+                    addMemberList.add(member);
+                }
+            }
+            if(CollectionUtils.isNotEmpty(addMemberList)){
+                memberJoinMapper.insertBatchSomeColumn(addMemberList);
+            }
+            memberList.addAll(addMemberList);
             for (int i = 0; i < applyDetailList.size(); i++) {
                 ApplyDetail applyDetail = applyDetailList.get(i);
                 if(Objects.isNull(applyDetail)
@@ -1793,35 +1966,16 @@
                 applyDetail.setEndTime(insuranceApply.getApplyEndTime());
                 applyDetail.setSortnum(i);
                 applyDetail.setApplyId(insuranceApply.getId());
-                Member member = new Member();
+                Member member = null;
                 if(Objects.isNull(applyDetail.getMemberId())){
-                    //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
-                    member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
-                            .eq(Member::getCompanyId,insuranceApply.getCompanyId())
-                            .eq(Member::getIsdeleted,Constants.ZERO)
-                            .eq(Member::getIdcardNo,applyDetail.getIdcardNo())
-                            .last(" limit 1")
-                    );
-                    if(Objects.isNull(member)){
-                        member = new Member();
-                        member.setCreateDate(new Date());
-                        member.setCreator(loginUserInfo.getId());
-                        member.setIsdeleted(Constants.ZERO);
-                        member.setName(applyDetail.getMemberName());
-                        member.setCompanyId(insuranceApply.getCompanyId());
-                        member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
-                        if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
-                            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+                    if(CollectionUtils.isNotEmpty(memberList)){
+                        Optional<Member>  optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
+                        if(optional.isPresent()){
+                            member = optional.get();
                         }
-                        member.setIdcardNo(applyDetail.getIdcardNo());
-                        member.setApplyId(insuranceApply.getId());
-                        member.setStartTime(applyDetail.getStartTime());
-                        member.setEndTime(applyDetail.getEndTime());
-                        member.setDuId(applyDetail.getDuId());
-                        member.setWorktypeId(applyDetail.getWorktypeId());
-
-                        memberMapper.insert(member);
-                    }else{
+                    }
+                    //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
+                    if(!Objects.isNull(member)){
                         member.setApplyId(insuranceApply.getId());
                         member.setDuId(applyDetail.getDuId());
                         member.setWorktypeId(applyDetail.getWorktypeId());
@@ -2715,6 +2869,7 @@
                 .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                 .isNull(ApplyDetail::getFromId)
                 .eq(ApplyDetail::getApplyId,model.getId())
+                .orderByAsc(ApplyDetail::getId)
         );
         model.setApplyDetailList(applyDetailList);
         return model;

--
Gitblit v1.9.3