From 1ae5f3e079857b09b61eea79c2da3537eee664ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwyx12345678=E2=80=9D?= <2816059288@qq.com> Date: Fri, 31 May 2024 17:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=BB=98=E8=AE=A4=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=8F=B7=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=94=B2=E6=96=B9?= =?UTF-8?q?=E5=92=8C=E6=A0=B8=E7=AE=97=E7=BB=84=E7=BB=87=E7=9A=84=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gradle/7.5/checksums/checksums.lock | Bin 17 -> 17 bytes .../7.5/executionHistory/executionHistory.bin | Bin 4338258 -> 14984426 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.5/fileHashes/fileHashes.bin | Bin 303169 -> 321378 bytes .gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.5/fileHashes/resourceHashesCache.bin | Bin 462349 -> 480472 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .idea/sonarlint/issuestore/index.pb | 9 ++++++++ cosmic.properties | 2 +- .../validator/CommonAmountCheckCondition.java | 21 +++++++++--------- .../cxkg/integration/MessageListen.java | 2 +- .../shkd/cosmic/debug/DebugApplication.java | 7 +++++- 13 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.gradle/7.5/checksums/checksums.lock b/.gradle/7.5/checksums/checksums.lock index 621e44950f697ed0af06d7d8e74ff4e8a94c324a..4ef95fa675d2e4cd684f7f31e492dbeb68d918ff 100644 GIT binary patch literal 17 TcmZSX`jP4D%qnEh00FuHCx!z8 literal 17 TcmZSX`jP4D%qnEh00FW9Cw2nz diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin index ee436741273a579b6ea6a60a1dc8bbf6748dff37..f5a02943be04258d05645a5c32bc950bb8fb0e25 100644 GIT binary patch delta 154085 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­xej70JCHwNO`b7ooFXQgYvfolugy3H8@4k~_KW+EHogC{MArnp8S+ zO0Nd7xy!HCGGhPqp*btzEjw*aC#en;)*tdFE;HRz7G+E^8gEisu)(cX@-u3IDEN!y zX5T=~kpw3s?Jk?-;|^8{&c090RF}T9qcx7aVVPv&x`a9TywERVFWh2!5-V51OGFa9 zcx38?u_yGHBMbY^wd4`jS6?nTyQAD}5{=lY1Sdkl%8&0Q5~8g#@-@EvB0i0@Q3}qE zM_sB=@R!QXPG3d9`+_LAH{oo~Hmdv2inF^S15$Dv!KN9rWe>zr+Gk?3;wJYRS7c+* zUT}5?3my3-sODzpqf1bb;KYFH%4`=awkyLL45-cBwPfDCs_Ghel*M{N1ucXPfdOM?RoxZgveCuww~M&?3Wpf@!P6d=&RF(f5497x{q= zL7fL@x8`Oyp`p4c!6%0fDytqeVAi4i5euTg&9`d-OUb!4oxr1mANDdkksMg968hY{%FJNJJqaq7W)K+ioP5 z;8=oV363Q=mf%=|V+oEWIF{g8f@2AeB{-JgSb}2-jwLvj;H0G>9~11S=v!0eJnn8BoHqQY6H!=#(|>)fCAblm;8=pU@3$EoO)SC1paeuHpTYUs zPCAm8os_VM=QzrPO}tG{M{rFsd)W^dc3&x927;f#UbI}hFA z(5ek2c;4XwzC0N}IDj`v=)(^Y$?OGzeq!(#W(q~91Er*E24~>H-A>EnvZjxjd)55U zqN1U41g|(c?9D=*-f(U<{ZN}{hwdKE%`Uv|RrT)u8y9bFA+2&*2k6BuUs`Q%Ks|+l z&D7ITj#nW3o*XWN-*fqkVl9hnlpe@&mF0#xx%pm=qVI1Op2EOp;n`7ZGI55S3rjj2 z%}o-dpmeC0bJ^iy()q4!Vfpu(DH^L59+y902+i9avuz(_H<@>BkI!<>#W#)Le=h8B zV6o+CY~Ga|7WKGJqz~2i@;S~c8>&6+aBxH#Jy)HL0W*bufnFifU?Kd@aa6tot*aRA z=WJSN7hF+u3fSY>kX#^JAuHiWWC{9s(oeK}ZLxV*Hd@pT!|CNXyE(U3 zSLv88+EE@NVZL2Ot72X5A@W|5aOvcmMcxZ`z!|?jTn=Zz!pjcD30O5P*Cf)C-J zCGU-B4n0EN*Y1RurzUxiK_{z2-Z!H&yM?@Gp{}|@-hV(X)Ftm_=lYa>D=QeOJX+cu@y zZyj{AvUuI#+{}vw{mY9`+k1h)+eSWi`(cyj|MEk2*W4-WxA74;^t~WHW<#(+kzK#3 z_Lud?U8SuSN}H#sM2Xv|d_rZPsC@X}HaO?6E>EnMJe_{EA*jS{#cnwD!Y-)%Xw;%p zl}|L2^%F;a@1O2C%Y9A5f%j7LD)Y9X_FWHXk4Np40@~ZZL`vlott>x@nlTJ$A2G#C zXZVvr`k!wSd^2Y+y?4*3{8TU?(Y*ofY3Lfdpz;Z@K~Nd`=QLF%YAm{Alz!g)zy8I; zrXE9GB9)&WS7pNXHcGwmRrP7301Fdvrvfu>>fc$$n`-kOQ~dc`PP@9Q@(CJ8mF4H6 z0Toz&XDWZ7*7#Yhw0X4)^)|dWBF2H%{LQDUq4EjSw=J%s0Xt^--KX-4(MXCae=&E? zFTaNMF7Lk=+)V#1Pj1=lwAt|ZOomobn8rkKXzDuK+|E_Lr|)kIJRS9(q$lZ`yY6Eo zgN9c|TTZdk<2{c3LicwEt+$p^D&J)1?x$DRXU38rgcz@r9^0`gHyys%Ki;HN{+^2e E1C~o|=Kufz delta 1975 zcmb8vdrVVT90%~Ww@@!oxaEMYmACQ`L?}fbn+`0p`N$OC)hg1;!y*MLwLUhXbJM~c z0d1BeiVKTlqN0mdJy9nZM}};m^%2A71m=Tf;sh2)jIg-hz14r#EV`R~{yFF5^!NLo zbNZ-bujs~uNTwYDl&-!g=VFD~9<-lQ`bwd`i_`Pq$g&Uu8bODHoJtt;C+ zy-;h=8I<|Ch9uK^v%zT2b1vh}Ad)uPM`+iq*hew%T@RQOqMq$LBs?R}`#9ZVlj)VX z?=~&LCFO{5nZ}MmI@oqVAI`23< z_*C(nwhe3iUSB)~#c!wVU#-bgMGYh2V~bvW^Ze1(A&$z6#^x(@it8wwJidE{PLt*|{qft(2*P`|?q96g+ls#f~IYkDu(S5hqAEO5uHX}xe$5o>YoV5W3;-OCDMN0LkLBM2M z?3+&84(x6B#5v<1{Mabkj%B9j?>)gNx_t<37u{@@;<@WElE?wN}S^ufz&WjJL zPd#N1xmv^?@;I#I!RdlUEHes0M{eT<2beTpp7>FLrTbl6QRSlZH6$urzYdU;hf$=LwJJ z)6e39<%_x63G+Epd&&R%uZdWOXsM9YHKIs&=1X;8(3rJL9nju9&^f3tXLH@?I?APK zDL5_0&3j}~aO(1!ypsCV`m0KzuaueDbEbnUuG@<}b%1SZ zKx|X%{amNHhL|ZTg~E9=cAxKa?AWCke>|gcL8z# zx1oFgqiiPgx)}FfMcxG7;1>esdEwz%air#c$Ah`8*-f{!&f2+EW7m+M>pT=+Cq0oP zhz@JD{M^y9qcS5PBK7ML_IgxW9S#KifIk=yq(BBH06CZl0ze=L0>K~zgn}?I2}}mz zAOb{!C@=*?gBUOs#DZxc4#WcmNB~NZ2&RK1kPK2lDtHUL4Q7Cu;2n?#(uu<{Ylrq9 D{Cp>B diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock index b4b7d77ad123ed0fb955a4ed93c41f8283c2de37..18b7a496c154333ce89ece4c7cb3c589a8beb96d 100644 GIT binary patch literal 17 VcmZSH{ng0rYp^FP0~oNq2LLmu1h)VH literal 17 UcmZSH{ng0rYp^FP0|dMV05g~btpET3 diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin index 9c99ec3a1b3336030b0a39585108abeb33c13271..57fd00af7f60eb54c8eeefec63a9406824531ee0 100644 GIT binary patch delta 9512 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 U7rA-_nT2LL$P1rz`P diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin index e265c0acdffa8938923062762695242b3093333e..fa61f2631a55bb7c2e676bd0b32854fd2b1977bf 100644 GIT binary patch delta 8753 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 GcJn{`m{e8( delta 1735 zcmXX`dr*|u72k92xw{LY5bPu@)CX%s9#L6iI-%*SqON zJLmN~=ZwF(sPWjsu17u4ZGF=d1=g0t<7mY$EJW+&#p&_Qy_wgoKluj0dgGB1w{`g2 zpXugMP8X)<^P;d`%hh4+CXC0<#tLN%nKYS?NKG+u{ zxoe>tB{3U1Vq{_iOrcC{f@er_Hp6a|!7aADx&$r(r#}Y;5XDE9&|1E>ggl&-ObMKu zOo_ZdnF4$>nSA`X*C>8r!<-EbOU>Q>hl~`x%)sL|1eck|AKOw!3T5)46k`CFn`530 z`)%m7;pTGNUaFCTHk?Z}#|3G$noH8?d)ys>LgnpDe~Il%N-9L0)_aUF5lP zTAu%~w`%D&lCM9EZjd!AupZ_8Rmj8#)?lfeO?8#thnZgf=(hS1 zm)=o+?!TiveB+Kvu#-;WMh zk{>LlARjHJ_57b=!&6#`kq(xSpRbmXM>bbsBo6*4&RYBy$ksYLqrIk z$NKx&)nY>6792sTWt?$I=yf|XX~P=c)^2py+wI4pU*l?x8HYGF+|yy5(=4J-d* z+%?*uhfKq57&3AEZOAB6hRHAUoml=gctgs&jZF#l;2{*>X*3jv&l>0Adk^DLibn0s zI>yknMcoBMSJwp`011y{SV`7LIITGQ5)L|3+Z-zTzufvi%IBncswqZpYBF_P;G(){>5Qj3m#j;q>rOGF zW=J~VrQ>K%QlBhHp+SYKCL-P}xMxSo(y1W|2IY%KXeUV3qcr7~sjITj_5BVxp9mNVxe1}e2c8~g1@j{Lz+((qj9=Fr>d;op8ht!9ZvynRkF^|_>BKvrL-oi2HI$|S%) zyGC!y_dlntC};jf$u60@O=c$Fnx!QmAJ5UWQ?7v?K^`MLE|Xf<0e5_g0U2}Y3gDT4 zm<|X=X;Zw6(TF$utB{|L*FCG?SK`dp`xNsNhVZy2bu#e!r_2&K@s!@=lGu$pN1rG! z&`N55pu0%c7i&Xw+_O5t$(I|UiQoI7uHl};;FD094k&h&>kgg^LjwQ3Trb7tgAuPk z>dP7>@78r_dbh1wM@WKuwJGV`er*<5@Fks%C(hIwH-^%juR%wU0Ss9D05Kp00ssI2 literal 17 UcmZS1>-^%juR%wU0RoN!05OjQbpQYW diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index cd026ed95649bbe74dde0bdeb86517e8b7fd2bc4..74fef448e9e4ad5b3c4eedf1e315be37fb6ecbf0 100644 GIT binary patch literal 8 PcmZQzVC+9Wd1?&+2~-07 literal 8 PcmZQzVC?rshkd-cosmic-debug/src/main/java/shkd/plugin/SSOLoginPugin.java,8\7\87c0137d669220d572dfa58a8bd96ae32207854f + +pshkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/opplugin/DailyLoanBillSubmitOrgAmountAvailableCheckPlugin.java,8\a\8ad0ccb2472fa5e2a84df1c5b90fdcb71836e0d4 + +Sshkd-cosmic-debug/src/main/java/shkd/fi/fa/plugin/SaveFaAssetCardApiSavePlugin.java,9\6\96f34f4073b5179be3fdd14511bb570d2b5b909b \ No newline at end of file diff --git a/cosmic.properties b/cosmic.properties index f0e1849..6b656e3 100644 --- a/cosmic.properties +++ b/cosmic.properties @@ -1,4 +1,4 @@ #\u8BE5\u8D44\u6E90\u5730\u5740\u63D0\u4F9B\u4E86\u82CD\u7A79\u73AF\u5883\u6240\u9700\u7684\u5F00\u53D1\u8D44\u6E90\u5305\uFF0C\u7528\u4E8E\u4E0B\u8F7D\u6216\u66F4\u65B0\u82CD\u7A79\u5F00\u53D1\u8D44\u6E90\u5305\u5230\u82CD\u7A79\u8D44\u6E90\u76EE\u5F55\u4E2D\u3002\u8BE5\u5730\u5740\u4E00\u822C\u7531\u82CD\u7A79MC\u670D\u52A1\u6216\u82CD\u7A79\u5F00\u53D1\u8005\u5DE5\u5177\u5BF9\u5916\u5F00\u653E\uFF0C\u5177\u4F53\u8D44\u6E90\u5305\u4E3A\uFF1Acosmic.zip\u3001webapp.zip\uFF0C\u5171\u7EA62G\u3002\u5730\u5740\u683C\u5F0F\u4E3A\uFF1Ahttp://\u82CD\u7A79MC\u670D\u52A1IP:\u7AEF\u53E3/appstore/dev_env\u6216http://\u82CD\u7A79\u5F00\u53D1\u8005\u5DE5\u5177\u670D\u52A1IP:268/studio/environment/download/{\u73AF\u5883\u5E8F\u53F7}\u3002 -#Mon May 06 10:17:01 CST 2024 +#Thu May 16 15:42:59 CST 2024 COSMIC_HOME=D\:/comic/cxkg MCServerURL=http\://10.157.226.17\:8090/appstore/dev_env/ diff --git a/shkd-cosmic-debug/src/main/java/kd/fi/er/business/datacheck/validator/CommonAmountCheckCondition.java b/shkd-cosmic-debug/src/main/java/kd/fi/er/business/datacheck/validator/CommonAmountCheckCondition.java index 2f4026e..7039d54 100644 --- a/shkd-cosmic-debug/src/main/java/kd/fi/er/business/datacheck/validator/CommonAmountCheckCondition.java +++ b/shkd-cosmic-debug/src/main/java/kd/fi/er/business/datacheck/validator/CommonAmountCheckCondition.java @@ -24,13 +24,12 @@ import org.apache.commons.lang3.StringUtils; public class CommonAmountCheckCondition { private static Log logger = LogFactory.getLog(CommonAmountCheckCondition.class); -// public static final Function encashedAmtValidator = encashedAmtValidator(); -// public static final Function reCalcEncashedAmtValidator = reCalcEncashedAmtValidator(); -// public static final Function accountEntryAmtValidator = accountEntryAmtValidator(); -// public static final Function sumOfEntryAndHeadAmtValidator = sumOfEntryAndHeadAmtValidator(); -// public static final Function payOrNotAmtValidator = payOrNotAmtValidator(); -// public static final Function reCalcEntryCurApproveAmtValidator = reCalcEntryCurApproveAmtValidator(); - + public static final Function encashedAmtValidator = encashedAmtValidator(); + public static final Function reCalcEncashedAmtValidator = reCalcEncashedAmtValidator(); + public static final Function accountEntryAmtValidator = accountEntryAmtValidator(); + public static final Function sumOfEntryAndHeadAmtValidator = sumOfEntryAndHeadAmtValidator(); + public static final Function payOrNotAmtValidator = payOrNotAmtValidator(); + public static final Function reCalcEntryCurApproveAmtValidator = reCalcEntryCurApproveAmtValidator(); public CommonAmountCheckCondition() { @@ -118,7 +117,7 @@ public class CommonAmountCheckCondition { } public static Function payOrNotAmtValidator() { - return !IscHelper.isIntegratedWithEAS() && !IscHelper.isIntegratedWithXK() ? (dataEntity) -> { + return (dataEntity) -> { String entityName = dataEntity.getDataEntityType().getName(); BillHeadFields billHeadInstance = FieldNameHelper.getBillHeadInstance(entityName); if (ErEntityTypeUtils.isApplyPayBill(entityName)) { @@ -152,11 +151,11 @@ public class CommonAmountCheckCondition { return null; } - } : null; + }; } public static Function sumOfEntryAndHeadAmtValidator() { - return !IscHelper.isIntegratedWithEAS() && !IscHelper.isIntegratedWithXK() ? (dataEntity) -> { + return (dataEntity) -> { IBillAmountService service = BillAmountServiceFacade.getService(dataEntity.getDataEntityType().getName()); if (service != null) { DataEntityPropertyCollection properties = dataEntity.getDataEntityType().getProperties(); @@ -178,7 +177,7 @@ public class CommonAmountCheckCondition { } return null; - } : null; + }; } public static Function reCalcEntryCurApproveAmtValidator() { diff --git a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java index b93f848..150a318 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java +++ b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java @@ -326,7 +326,7 @@ public class MessageListen extends AbstractMessageServiceHandler { requestBody.put("requestname", "主题:"+title); requestBody.put("workflowname", entityName + "审批流程"); requestBody.put("nodename", taskName); - requestBody.put("pcurl", url); + requestBody.put("pcurl", url+"&closeType=closeWin"); requestBody.put("appurl", url != null ? getAppurl(url) : null); requestBody.put("isremark", String.valueOf(tasktype)); requestBody.put("viewtype", "1"); diff --git a/shkd-cosmic-debug/src/main/java/shkd/cosmic/debug/DebugApplication.java b/shkd-cosmic-debug/src/main/java/shkd/cosmic/debug/DebugApplication.java index b7244d4..ce589e2 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/cosmic/debug/DebugApplication.java +++ b/shkd-cosmic-debug/src/main/java/shkd/cosmic/debug/DebugApplication.java @@ -13,7 +13,7 @@ import kd.bos.config.client.util.ConfigUtils; /** * 启动本地应用程序(微服务节点) */ -public class DebugApplication { +public class DebugApplication { @@ -48,6 +48,11 @@ public class DebugApplication { // System.setProperty("ISC_TEST_PASSWORD", "Cosmic@2023"); // System.setProperty("login.type", "STANDALONE"); +// cosmic.set("attachmentServer.url", "https://fin-uat.elmleaf.com.cn/fileserver/"); +// cosmic.set("imageServer.url", "https://fin-uat.elmleaf.com.cn/fileserver/"); +// cosmic.set("fileserver", "https://fin-uat.elmleaf.com.cn/ierp/image/downloadImage.do?path=/"); +// cosmic.set("tempfile.cachetype", "disk"); +// cosmic.set("diskcache.path", "D:/tempfiles"); System.setProperty("appstarter.config","aqap=kd.ebg.aqap.mservice.boot.appstarter.EBGAppStarter,receipt=kd.ebg.receipt.mservice.boot.appstarter.EBGReceiptAppStarter,note=kd.ebg.note.mservice.boot.appstarter.EBGAppStarter"); cosmic.start();