提交人：csx

提交时间：2025年01月19日
提交内容：推送共享优化

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java

@@ -14,6 +14,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import shkd.sys.sys.mservice.ApiService;
+import shkd.sys.sys.utils.EmptyUtil;
 
 import java.text.ParseException;
 
@@ -67,8 +68,9 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
                 dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
                 dzhdqFilter = dzhdqFilter.and(new QFilter("paymentidentify.number", QCP.equals, "FKBS01"));
                 dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("A")));
+                dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_businessname", QCP.equals, ""));
             } else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理
-                dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1");//浪潮推送状态推送成功
+                dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1").or(new QFilter("shkd_lctszt", QCP.equals, "3"));//浪潮推送状态推送成功
                 dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
                 dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D")));
             }else {
@@ -78,7 +80,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
 
             //自定义过滤条件
             String shkd_zdygltj = shkd_apimapping.getString("shkd_zdygltj");
-            if (!shkd.sys.sys.utils.EmptyUtil.isEmpty(shkd_zdygltj)) {
+            if (!EmptyUtil.isEmpty(shkd_zdygltj)) {
                 QFilter zdyqFilter = null;
                 try {
                     zdyqFilter = getqFilter(shkd_zdygltj);

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/ShareOPPlugin.java

@@ -46,7 +46,6 @@ public class ShareOPPlugin extends AbstractOperationServicePlugIn {
         e.addValidator(new AbstractValidator() {
             @Override
             public void validate() {
-                String operateKey = this.getOperateKey();
                 ExtendedDataEntity[] dataEntities = this.getDataEntities();
                 QFilter qFilter = new QFilter("shkd_djlxbm", QCP.equals, "查询付款单在共享系统是否存在");
                 DynamicObject shkd_apimappingid = BusinessDataServiceHelper.loadSingle("shkd_apimapping", "id", qFilter.toArray());
@@ -73,20 +72,20 @@ public class ShareOPPlugin extends AbstractOperationServicePlugIn {
                         try {
                             otherIsJsonRS = JSONObject.parseObject(res);
                         } catch (Exception e) {
-                            this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "返回res转换json出错：" + res, ErrorLevel.Error);
+                            this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "接口返回res转换json出错：" + res, ErrorLevel.Error);
                             continue;
                         }
                         String flag = otherIsJsonRS.getString("flag");
                         if (resError(flag)) {//失败
                             String msg = otherIsJsonRS.getString("msg");
-                            this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "返回接收失败原因：" + msg, ErrorLevel.Error);
+                            this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "接口返回接收失败原因：" + msg, ErrorLevel.Error);
                         } else {
                             String status = otherIsJsonRS.getString("status");
                             /*
                             * 0=共享不存在该单据,1=共享存在该单据,2=共享已删除
                             * */
                             if (!Arrays.asList("0","2").contains(status)){
-                                this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "共享存在对应单据不允许删除", ErrorLevel.Error);
+                                this.addMessage(dataEntity,"单据" + dynamicObject.getString("billno") + "共享存在对应单据不允许操作", ErrorLevel.Error);
                             }
                         }
                     }

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java

@@ -67,8 +67,9 @@ public class SharePushTaskPlugin extends AbstractTask {
             dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
             dzhdqFilter = dzhdqFilter.and(new QFilter("paymentidentify.number", QCP.equals, "FKBS01"));
             dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("A")));
+            dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_businessname", QCP.equals, ""));
         } else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理
-            dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1");//浪潮推送状态推送成功
+            dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1").or(new QFilter("shkd_lctszt", QCP.equals, "3"));//浪潮推送状态推送成功
             dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
             dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D")));
         } else {