ibizdev提交

app_WFWeb/src/locale/lanres/wfim/wfim_en_US.ts

@@ -118,14 +118,14 @@ export default {
 			caption: "回退",
 			tip: "deuiaction1_sendback",
 		},
-		tbitem24_c66: {
-			caption: "送会签",
-			tip: "tbitem24_c66",
-		},
 		tbitem24_c47: {
 			caption: "送首席风险官审核",
 			tip: "tbitem24_c47",
 		},
+		tbitem24_c66: {
+			caption: "送会签",
+			tip: "tbitem24_c66",
+		},
 		tbitem24_c37: {
 			caption: "送跨公司会签",
 			tip: "tbitem24_c37",

app_WFWeb/src/locale/lanres/wfim/wfim_zh_CN.ts

@@ -117,14 +117,14 @@ export default {
 			caption: '回退',
 			tip: '回退',
 		},
-		tbitem24_c66: {
-			caption: '送会签',
-			tip: '送会签',
-		},
 		tbitem24_c47: {
 			caption: '送首席风险官审核',
 			tip: '送首席风险官审核',
 		},
+		tbitem24_c66: {
+			caption: '送会签',
+			tip: '送会签',
+		},
 		tbitem24_c37: {
 			caption: '送跨公司会签',
 			tip: '送跨公司会签',

app_WFWeb/src/pages/htwf/wfimwfim-w30-wfedit-view3/wfimwfim-w30-wfedit-view3-base.vue

@@ -19,18 +19,18 @@
                 <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.deuiaction1_sendback.tip')}}</div>
             </tooltip>
             <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem24_c66.visabled" :disabled="toolBarModels.tbitem24_c66.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c66' }, $event)">
+                    <i-button v-show="toolBarModels.tbitem24_c47.visabled" :disabled="toolBarModels.tbitem24_c47.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c47' }, $event)">
                         <i class=''></i>
-                        <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.caption')}}</span>
+                        <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.caption')}}</span>
                     </i-button>
-                <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.tip')}}</div>
+                <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.tip')}}</div>
             </tooltip>
             <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem24_c47.visabled" :disabled="toolBarModels.tbitem24_c47.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c47' }, $event)">
+                    <i-button v-show="toolBarModels.tbitem24_c66.visabled" :disabled="toolBarModels.tbitem24_c66.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c66' }, $event)">
                         <i class=''></i>
-                        <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.caption')}}</span>
+                        <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.caption')}}</span>
                     </i-button>
-                <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.tip')}}</div>
+                <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.tip')}}</div>
             </tooltip>
             <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem24_c37.visabled" :disabled="toolBarModels.tbitem24_c37.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c37' }, $event)">
@@ -275,10 +275,10 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
     public toolBarModels: any = {
         deuiaction1_sendback: { name: 'deuiaction1_sendback', caption: '回退', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Sendback', target: 'SINGLEKEY' } },
 
-        tbitem24_c66: { name: 'tbitem24_c66', caption: '送会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C66', target: 'MULTIKEY' } },
-
         tbitem24_c47: { name: 'tbitem24_c47', caption: '送首席风险官审核', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C47', target: 'MULTIKEY' } },
 
+        tbitem24_c66: { name: 'tbitem24_c66', caption: '送会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C66', target: 'MULTIKEY' } },
+
         tbitem24_c37: { name: 'tbitem24_c37', caption: '送跨公司会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C37', target: 'MULTIKEY' } },
 
         tbitem24_c44: { name: 'tbitem24_c44', caption: '送合规总监审批', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C44', target: 'MULTIKEY' } },
@@ -451,12 +451,12 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
         if (Object.is($event.tag, 'deuiaction1_sendback')) {
             this.toolbar_deuiaction1_sendback_click($event, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem24_c66')) {
-            this.toolbar_tbitem24_c66_click($event, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem24_c47')) {
             this.toolbar_tbitem24_c47_click($event, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem24_c66')) {
+            this.toolbar_tbitem24_c66_click($event, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24_c37')) {
             this.toolbar_tbitem24_c37_click($event, '', $event2);
         }
@@ -573,7 +573,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    protected toolbar_tbitem24_c66_click(params: any = {}, tag?: any, $event?: any) {
+    protected toolbar_tbitem24_c47_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -582,14 +582,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
         const _this: any = this;
         let paramJO:any = {};
         
-        let contextJO:any = {"srfwfiatag":"C66","srfwfstep":"30"};
+        let contextJO:any = {"srfwfiatag":"C47","srfwfstep":"30"};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
         // 界面行为
         const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService();
-        curUIService.IMWFv1_C66(datas,contextJO, paramJO,  $event, xData,this,"WFIM");
+        curUIService.IMWFv1_C47(datas,contextJO, paramJO,  $event, xData,this,"WFIM");
     }
 
     /**
@@ -600,7 +600,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    protected toolbar_tbitem24_c47_click(params: any = {}, tag?: any, $event?: any) {
+    protected toolbar_tbitem24_c66_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -609,14 +609,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
         const _this: any = this;
         let paramJO:any = {};
         
-        let contextJO:any = {"srfwfiatag":"C47","srfwfstep":"30"};
+        let contextJO:any = {"srfwfiatag":"C66","srfwfstep":"30"};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
             datas = [...xData.getDatas()];
         }
         // 界面行为
         const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService();
-        curUIService.IMWFv1_C47(datas,contextJO, paramJO,  $event, xData,this,"WFIM");
+        curUIService.IMWFv1_C66(datas,contextJO, paramJO,  $event, xData,this,"WFIM");
     }
 
     /**

config.xml

@@ -40,14 +40,14 @@
       mvn install
       cd ..
       mvn install
-      cd im-app/im-app-web
+      cd im-app/im-app-wfweb
       mvn clean package -Pprod
       echo 'echo "$para1"' > apppasswd.sh
       chmod -R 777 *
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im-app-web.jar root@172.16.102.61:/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
-      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D/im-app-web.jar >>/ibiz/nodes/node1/2C5840FD-07EF-4719-9D83-6E960583E30D/im_appim 业务应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "mkdir -p /ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ./target/im-app-wfweb.jar root@172.16.102.61:/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "ps -ef | grep '/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh root@172.16.102.61 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im-app-wfweb.jar >>/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im_appim 流程应用-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFASService.java

@@ -180,6 +180,9 @@ public class WFASService {
             wfas = new WFAS();
             wfas.setProxydataid(data.getString("proxydataid"));
             wfas.setProxymoduleid(data.getString("proxymoduleid"));
+            if (data.getString("proxymodulename") != null) {
+                wfas.setWFASName(data.getString("proxymodulename"));
+            }
 
             String pinstid = data.getString("pinstid");
             if(pinstid != null && !pinstid.isEmpty()) {

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBCService.java

@@ -180,6 +180,9 @@ public class WFBCService {
             wfbc = new WFBC();
             wfbc.setProxydataid(data.getString("proxydataid"));
             wfbc.setProxymoduleid(data.getString("proxymoduleid"));
+            if (data.getString("proxymodulename") != null) {
+                wfbc.setWFBCName(data.getString("proxymodulename"));
+            }
 
             String pinstid = data.getString("pinstid");
             if(pinstid != null && !pinstid.isEmpty()) {

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFBMService.java

@@ -180,6 +180,9 @@ public class WFBMService {
             wfbm = new WFBM();
             wfbm.setProxydataid(data.getString("proxydataid"));
             wfbm.setProxymoduleid(data.getString("proxymoduleid"));
+            if (data.getString("proxymodulename") != null) {
+                wfbm.setWFBMName(data.getString("proxymodulename"));
+            }
 
             String pinstid = data.getString("pinstid");
             if(pinstid != null && !pinstid.isEmpty()) {

im-app/im-app-wfweb/src/main/java/com/ibiz/wfweb/htwf/service/WFIMService.java

@@ -180,6 +180,9 @@ public class WFIMService {
             wfim = new WFIM();
             wfim.setProxydataid(data.getString("proxydataid"));
             wfim.setProxymoduleid(data.getString("proxymoduleid"));
+            if (data.getString("proxymodulename") != null) {
+                wfim.setWFIMName(data.getString("proxymodulename"));
+            }
 
             String pinstid = data.getString("pinstid");
             if(pinstid != null && !pinstid.isEmpty()) {

im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml

 server:
   devmode: false
-  port: 8202
+  port: 8203
   servlet:
     session:
       cookie: