Merge remote-tracking branch 'origin/liujun-2024-02-04-相关方新流程上线后新提需求' into 2024年2月22日v1.0.55

src/main/java/com/zcloud/controller/xgf/XgfCorpController.java

@@ -42,13 +42,17 @@ public class XgfCorpController extends BaseController {
     public Object getCorpInfoList(Page page) throws Exception {
         PageData pd = new PageData();
         pd = this.getPageData();
-        pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-        if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号
-            pd.put("SUPERVISE_DEPARTMENT_ID", "");
+        if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getCORPINFO_ID())) {
+            pd.put("CORP_INFO_ID", Jurisdiction.getCORPINFO_ID());
         } else {
-            pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
+            pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+            if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号
+                pd.put("SUPERVISE_DEPARTMENT_ID", "");
+            } else {
+                pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
+            }
         }
-        Map result = HttpClientService.doPost(url + "/api/corpinfo/list", pd);
+        Map result = HttpClientService.doPost(url + "/api/corpinfo/JiTuanTeShulist", pd);
         return result;
     }
 

src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java

@@ -106,6 +106,7 @@ public class XgfUserServiceImpl implements XgfUserService {
                 } else {
                     x.put("XGF_USER_ID", x.get("USER_ID"));
                     x.put("XGF_USER_DETAILS_ID", x.get("USER_ID"));
+                    x.put("XGF_USER_NAME", x.get("NAME"));
                     x.put("IS_DELETE", "0");
                     x.put("CREATE_TIME", DateUtil.getTime());
                     x.put("OPERATOR_TIME", DateUtil.getTime());
@@ -203,6 +204,7 @@ public class XgfUserServiceImpl implements XgfUserService {
                     flowDetail.put("APPROVER_TIME", DateUtil.getTime());
                     flowDetail.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP"));
                     flowDetail.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME"));
+                    flowDetail.put("APPOINT_ANNEX", x.getString("ANNEX"));
                     flowDetail.put("PASS_FLAG", "1");
                     flowDetail.put("END_FLAG", "0");
                     flowDetail.put("ISDELETE", "0");
@@ -226,6 +228,7 @@ public class XgfUserServiceImpl implements XgfUserService {
                     nextNode.put("APPROVER_OPINION", "");
                     nextNode.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP"));
                     nextNode.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME"));
+                    nextNode.put("APPOINT_ANNEX", x.getString("ANNEX"));
                     flowDetailMapper.save(nextNode);
                     currentNode.put("STEP_FLAG", "0");
                     flowDetailMapper.edit(currentNode);

src/main/resources/application-dev.properties

@@ -61,11 +61,11 @@ spring.main.banner-mode=off
 preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
 qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
 #?????
-smb.host=39.103.224.166
+smb.host=39.101.130.96
 smb.port=22
 smb.user=root
 smb.password=Zcloud@zcloud88888
-smb.basePath=/mnt/qgfile/file/
+smb.basePath=/mnt/wwag/file/
 
 #Mq\u914D\u7F6E
 rocketmq.consumer.group2=edu-admin-edit

src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml

@@ -29,7 +29,8 @@
         f.ISDELETE,
         f.PARENT_ID,
         f.FOREIGN_KEY,
-        f.SORT
+        f.SORT,
+        f.APPOINT_ANNEX
     </sql>
 
     <!-- 字段用于新增 -->
@@ -49,7 +50,8 @@
         ISDELETE,
         PARENT_ID,
         FOREIGN_KEY,
-        SORT
+        SORT,
+        APPOINT_ANNEX
     </sql>
 
     <!-- 字段值 -->
@@ -69,7 +71,8 @@
         #{ISDELETE},
         #{PARENT_ID},
         #{FOREIGN_KEY},
-        #{SORT}
+        #{SORT},
+        #{APPOINT_ANNEX}
     </sql>
 
     <!-- 新增-->
@@ -109,7 +112,8 @@
             PARENT_ID              = #{PARENT_ID},
             FOREIGN_KEY             = #{FOREIGN_KEY},
             STEP_NAME              = #{STEP_NAME},
-            SORT                   = #{SORT}
+            SORT                   = #{SORT},
+            APPOINT_ANNEX          = #{APPOINT_ANNEX}
             where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID}
     </update>
 

src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml

@@ -63,7 +63,9 @@
         f.IS_BF,
         f.IS_SOCIAL,
         f.SOCIAL_NUMBER,
-        f.zzName
+        f.zzName,
+        f.ANNEX,
+        f.ATTORNEY
     </sql>
 
     <!-- 字段用于新增 -->
@@ -122,7 +124,9 @@
         IS_BF,
         IS_SOCIAL,
         SOCIAL_NUMBER,
-        zzName
+        zzName,
+        ANNEX,
+        ATTORNEY
     </sql>
 
     <!-- 字段值 -->
@@ -181,7 +185,9 @@
         #{IS_BF},
         #{IS_SOCIAL},
         #{SOCIAL_NUMBER},
-        #{zzName}
+        #{zzName},
+        #{ANNEX},
+        #{ATTORNEY}
     </sql>
 
     <!-- 新增-->
@@ -264,7 +270,9 @@
         IS_BF = #{IS_BF},
         IS_SOCIAL = #{IS_SOCIAL},
         SOCIAL_NUMBER = #{SOCIAL_NUMBER},
-        zzName = #{zzName}
+        zzName = #{zzName},
+        ANNEX = #{ANNEX},
+        ATTORNEY = #{ATTORNEY}
         where
         XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID}
     </update>

src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml

@@ -296,7 +296,9 @@
 			   b.IS_BF,
 			   b.SOCIAL_NUMBER,
 			   b.zzName,
-			   b.POLITICAL_TIME
+			   b.POLITICAL_TIME,
+			   b.ANNEX,
+			   b.ATTORNEY
 		from xgf_user a
 				 left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID
 		where a.IS_DELETE = '0'