Merge branch 'master' of http://111.75.220.136:10030/turborao/jyyy

code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/task/impl/SynSapServiceImpl.java

@@ -400,6 +400,7 @@ public class SynSapServiceImpl implements SynSapService {
             }
             dyn.set("name", item.getString("POST1"));
             dyn.set("fullname", item.getString("POST1"));
+            dyn.set("nckd_zby3", item.getString("zby3"));
             if (EmptyUtils.isNotEmpty(proleaderDyn)) {
                 dyn.set("proleader", proleaderDyn.getPkValue());
             }

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/PayBillSSOListPlugin.java

@@ -12,6 +12,11 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import java.util.EventObject;
 
+/**
+ * 列表插件，处理srm单点星瀚单据，由于直接单点的编辑界面会提示参数异常问题，通过单点到列表页面再打开编辑界面
+ * @author wanghaiwu_kd
+ * @date 2025/06/26
+ */
 public class PayBillSSOListPlugin extends AbstractListPlugin {
     @Override
     public void beforeBindData(EventObject e) {

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/SRMSynPayApiPlugin.java

@@ -682,8 +682,10 @@ public class SRMSynPayApiPlugin implements Serializable {
 
                     DynamicObject salerInfo = CommonHelperUtils.queryBaseDynamicObject("bd_supplier", "societycreditcode", salerTaxNo);
                     if(salerInfo == null){
-                        returnMessage = "供应商(" + salerTaxNo + ")在星瀚系统中未匹配到数据！";
-                        return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
+                        salerInfo = supplier;
+
+//                        returnMessage = "供应商(" + salerTaxNo + ")在星瀚系统中未匹配到数据！";
+//                        return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
                     }
 
                     DynamicObject buyer = BusinessDataServiceHelper.loadSingle("bdm_enterprise_baseinfo", (new QFilter("number", QCP.equals, buyerTaxNo)).toArray());

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/task/DealOrgLongNameTask.java

@@ -0,0 +1,49 @@
+package nckd.jimin.jyyy.hr.haos.task;
+
+import kd.bos.context.RequestContext;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.exception.KDException;
+import kd.bos.logging.Log;
+import kd.bos.logging.LogFactory;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
+import kd.bos.schedule.executor.AbstractTask;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
+import kd.sdk.plugin.Plugin;
+import nckd.jimin.jyyy.hr.haos.util.OrgUtils;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author Tyx
+ * @date  2025/6/26
+ * 一次性后台任务，批量更新所有组织的长名称和长编码，nckd_longname和nckd_longnumber
+ */
+public class DealOrgLongNameTask extends AbstractTask implements Plugin {
+
+    private static final Log log = LogFactory.getLog(DealOrgLongNameTask.class);
+    private static String adminOrgDetail_entity = "haos_adminorgdetail";
+    @Override
+    public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
+        log.info(" ------- 开始执行批量修改组织长名称/长编码方法 ------- ");
+        String selectProperties = "id,boid,number,name,structlongnumber,structnumber,nckd_longname,nckd_longnumber,bsed";
+        //QFilter filter = new QFilter("number", QCP.equals, "010102181");
+        DynamicObject[] orgDyns = new HRBaseServiceHelper(adminOrgDetail_entity).query(selectProperties, null);
+        log.info(" ------- 批量更新条数 : {} ------", orgDyns.length);
+        for (DynamicObject org : orgDyns) {
+            String structLongNumber = org.getString("structlongnumber");
+            Date bsed = org.getDate("bsed");
+            Set structLongNumberSet = Arrays.stream(structLongNumber.split("!")).
+                    collect(Collectors.toSet());
+            Map<String, Map<String, String>> structMap = OrgUtils.getStructNumberMap(structLongNumberSet, bsed);
+            OrgUtils.dealLongNameAndNumber(org, structMap);
+        }
+        SaveServiceHelper.update(orgDyns);
+    }
+}

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/tsc/tso/formplugin/web/offer/moka/MokaOfferTagListPluginEx.java

@@ -0,0 +1,21 @@
+package nckd.jimin.jyyy.hr.tsc.tso.formplugin.web.offer.moka;
+
+import kd.bos.form.container.Tab;
+import kd.hr.hbp.formplugin.web.HRDataBaseList;
+
+import java.util.EventObject;
+
+/**
+ * @author Tyx
+ * @date  2025/6/25
+ * Offer管理插件 自动切换到已申请
+ */
+public class MokaOfferTagListPluginEx extends HRDataBaseList {
+
+    @Override
+    public void afterBindData(EventObject e) {
+        super.afterBindData(e);
+        Tab tab = this.getControl("tabap");
+        tab.activeTab("hasapply");
+    }
+}

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/tsrsc/plugin/form/CasRecrApplyFormPlugin.java

@@ -447,10 +447,12 @@ public class CasRecrApplyFormPlugin extends AbstractBillPlugIn implements Before
         if(newValue instanceof Integer){
             // 最大值
             Integer nckdPayrange = (Integer)this.getModel().getValue("nckd_payrange",row);
-            int comparisonResult = nckdPayrange.compareTo( (Integer) newValue);
-            if(comparisonResult < 0){
-                this.getView().showErrorNotification("最高薪资不能低于最低薪资！");
-                this.getModel().setValue("nckd_payrangemin",oldValue,row);
+            if(nckdPayrange > 0) {
+                int comparisonResult = nckdPayrange.compareTo((Integer) newValue);
+                if (comparisonResult < 0) {
+                    this.getView().showErrorNotification("最高薪资不能低于最低薪资！");
+                    this.getModel().setValue("nckd_payrangemin", oldValue, row);
+                }
             }
         }
     }

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/wtc/wtis/util/DingTalkSyncUtil.java

@@ -134,7 +134,8 @@ public class DingTalkSyncUtil {
      */
     public static DynamicObjectCollection getMappingInfo() {
         QFilter filter = new QFilter("imtype.id", QCP.equals, 2L);
-        filter.and("user.isforbidden",QCP.equals,false);
+        //filter.and("user.isforbidden",QCP.equals,false);
+        filter.and("user.enable",QCP.equals, "1");
         String selectFields = "user.number,openid";
         return QueryServiceHelper.query(mapping_entity, selectFields, new QFilter[]{filter});
     }