diff --git a/.gradle/7.5/checksums/checksums.lock b/.gradle/7.5/checksums/checksums.lock index 621e449..4ef95fa 100644 Binary files a/.gradle/7.5/checksums/checksums.lock and b/.gradle/7.5/checksums/checksums.lock differ diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin index ee43674..f5a0294 100644 Binary files a/.gradle/7.5/executionHistory/executionHistory.bin and b/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock index b4b7d77..18b7a49 100644 Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and b/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin index 9c99ec3..57fd00a 100644 Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and b/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock index 8efb7b7..fb9a8de 100644 Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and b/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin index e265c0a..fa61f26 100644 Binary files a/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f6fa2a7..75af784 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index cd026ed..74fef44 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index e69de29..f0ad671 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -0,0 +1,9 @@ + + +Yshkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/DailyLoanBillFormPlugin.java,d\2\d2e9ae880051a1e90b9577794368f8674dfe1369 +n +>shkd-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();