From c056a35ab3954bc1f34f22c3206a355f9a6b13d5 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 11:03:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A7=94=E6=89=98=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 2 ++ .../mybatis/datasource/xgf/FlowDetailMapper.xml | 12 ++++++++---- .../datasource/xgf/XgfUserDetailsMapper.xml | 16 ++++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index de1d9450..d9eab63a 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -203,6 +203,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 +227,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); diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 68702d01..5801dc27 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/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 @@ -49,7 +50,8 @@ ISDELETE, PARENT_ID, FOREIGN_KEY, - SORT + SORT, + APPOINT_ANNEX @@ -69,7 +71,8 @@ #{ISDELETE}, #{PARENT_ID}, #{FOREIGN_KEY}, - #{SORT} + #{SORT}, + #{APPOINT_ANNEX} @@ -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} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 0c1343c9..7fb9f491 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/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 @@ -122,7 +124,9 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName + zzName, + ANNEX, + ATTORNEY @@ -181,7 +185,9 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName} + #{zzName}, + #{ANNEX}, + #{ATTORNEY} @@ -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} From 3db66181be483969435ae1f543266b3ce35cc0c3 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 11:19:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A7=94=E6=89=98=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index d9eab63a..2b5935c4 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/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()); From 404b7e5c86948d713ab6eb9f6b296f80d1136c8f Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 13:41:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A7=94=E6=89=98=E4=B9=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index fd91dc5a..44a11118 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/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' From ee047f2beea419e7837fd5d91c436f35e7bfb7fe Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 21 Feb 2024 10:20:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=9A=84smb=E7=A0=96=E6=8D=A296=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 53082d08..669be795 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -64,11 +64,11 @@ spring.main.banner-mode=off preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/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 From c45a96a34ec346258eb9d88f7478f74e245b8e8f Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 21 Feb 2024 11:25:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1=E3=80=81=E6=89=BF=E8=AF=BA=E4=B9=A6?= =?UTF-8?q?=E3=80=81=E5=A7=94=E6=89=98=E4=B9=A6=E8=BD=AC=E5=8F=98=E5=BF=85?= =?UTF-8?q?=E4=BC=A0=202=E3=80=81bug=E4=BF=AE=E6=94=B9=EF=BC=88=E9=9B=86?= =?UTF-8?q?=E5=9B=A2=E5=8D=95=E4=BD=8D=E6=9F=A5=E7=9C=8B=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E8=87=AA=E5=B7=B1=E7=9A=84=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=96=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/xgf/XgfCorpController.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index d3e7835d..df71617d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/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.getDEPARTMENT_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; } From 87b251bc69074d3141e7d19d06275d3a5efd54ad Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 21 Feb 2024 17:16:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E3=80=81=E6=89=BF=E8=AF=BA=E4=B9=A6?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/controller/xgf/XgfCorpController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index df71617d..caa660ab 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -42,7 +42,7 @@ public class XgfCorpController extends BaseController { public Object getCorpInfoList(Page page) throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getDEPARTMENT_ID())) { + if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getCORPINFO_ID())) { pd.put("CORP_INFO_ID", Jurisdiction.getCORPINFO_ID()); } else { pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());