From a127fe46ce06622bedeb51664c77f5fceff00594 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 8 Jul 2025 10:11:40 +0800
Subject: [PATCH] 111

---
 .../app/expert/service/ExpertFxqService.java  | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java
index 1b86cde..1c7565b 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java
@@ -213,7 +213,7 @@ public class ExpertFxqService {
             companyQueryWrapper.eq(FxqCompanyEntity::getUid, "bjyykxjsfzxh");
             FxqCompanyEntity companyFxqCompany = fxqCompanyDao.selectOne(companyQueryWrapper);
             if (companyFxqCompany == null) {
-                throw new BusinessException("操作失败");
+                throw new BusinessException("操作失败4");
             }
 
             // 获取数据库模版数据
@@ -224,29 +224,29 @@ public class ExpertFxqService {
                 // 获取企业模版数据
                 GetTemplateListResponse templateList = fxqTask.getTemplateList(companyFxqCompany.getUnionId());
                 if (templateList.getData() == null || templateList.getData().isEmpty()) {
-                    throw new BusinessException("操作失败");
+                    throw new BusinessException("操作失败3");
                 }
 
                 for (GetTemplateListResponse.GetTemplateListData data : templateList.getData()) {
                     if (data.getSigners() == null || data.getSigners().isEmpty()) {
-                        throw new BusinessException("操作失败");
+                        throw new BusinessException("操作失败2");
                     }
 
                     String companySignerNo = "";
                     String personalSignerNo = "";
                     // 获取参与方别名标识
                     for (GetTemplateListResponse.signersData signersData : data.getSigners()) {
-                        if (Objects.equals(signersData.getLabel(), "北京医药科学技术发展协会")){
+                        if (signersData.getType() == 2){
                             companySignerNo = signersData.getSignerNo();
                         }
 
-                        if (Objects.equals(signersData.getLabel(), "个人")){
+                        if (signersData.getType() == 1){
                             personalSignerNo = signersData.getSignerNo();
                         }
                     }
 
                     if (Objects.equals(companySignerNo, "") || Objects.equals(personalSignerNo, "")){
-                        throw new BusinessException("操作失败");
+                        throw new BusinessException("操作失败1");
                     }
 
                     // 检测是否存在
@@ -347,28 +347,28 @@ public class ExpertFxqService {
 
             r.setSigners(signersList);
 
-//            // 初始化 components 列表
-//            List<AddTemplateTaskRequest.componentsData> componentsList = new ArrayList<>();
-//
-//            // 乙方姓名
-//            AddTemplateTaskRequest.componentsData name = new AddTemplateTaskRequest.componentsData();
-//            name.setFileKey("name");
-//            name.setFileValue(fxqUser.getName());
-//            componentsList.add(name);
-//
-//            // 乙方工作单位
-//            AddTemplateTaskRequest.componentsData work = new AddTemplateTaskRequest.componentsData();
-//            work.setFileKey("work");
-//            work.setFileValue(expert.getHospitalName());
-//            componentsList.add(work);
-//
-//            // 乙方联系电话
-//            AddTemplateTaskRequest.componentsData mobile = new AddTemplateTaskRequest.componentsData();
-//            mobile.setFileKey("mobile");
-//            mobile.setFileValue(expert.getMobile());
-//            componentsList.add(mobile);
-//
-//            r.setComponents(componentsList);
+            // 初始化 components 列表
+            List<AddTemplateTaskRequest.componentsData> componentsList = new ArrayList<>();
+
+            // 乙方姓名
+            AddTemplateTaskRequest.componentsData name = new AddTemplateTaskRequest.componentsData();
+            name.setFileKey("name");
+            name.setFileValue(fxqUser.getName());
+            componentsList.add(name);
+
+            // 乙方工作单位
+            AddTemplateTaskRequest.componentsData work = new AddTemplateTaskRequest.componentsData();
+            work.setFileKey("work");
+            work.setFileValue(expert.getHospitalName());
+            componentsList.add(work);
+
+            // 乙方联系电话
+            AddTemplateTaskRequest.componentsData mobile = new AddTemplateTaskRequest.componentsData();
+            mobile.setFileKey("mobile");
+            mobile.setFileValue(expert.getMobile());
+            componentsList.add(mobile);
+
+            r.setComponents(componentsList);
 
             AddTemplateTaskResponse templateTask = fxqTask.addTemplateTask(r);
             if (templateTask.getData() == null) {