薪酬发放修改，差旅汇总优化

src/main/java/fi/em/formPlugin/SalaryFileUploadEditPlugin.java

@@ -59,7 +59,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
         //根据分录类型获取对应分录标识
         if ("A".equals(nckd_entrytype)) {
             billtype="nckd_staffentry";
-            readExcelByRowOrCell(4,45,inputStream,billtype);
+            readExcelByRowOrCell(4,46,inputStream,billtype);
         }else if ("B".equals(nckd_entrytype)) {
             billtype="nckd_earlyretiredentry";
             readExcelByRowOrCell(4,30,inputStream,billtype);
@@ -141,7 +141,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                 ,"nckd_se_warmsbad","nckd_se_nursabd","nckd_se_otherallowance","nckd_se_risksry","nckd_se_salarypayable","nckd_se_per_endins"
                 ,"nckd_se_per_hopins","nckd_se_per_bhopins","nckd_se_per_ljins","nckd_se_per_hosins","nckd_se_per_cmymey"
                 ,"nckd_se_unionmey","nckd_se_tax","nckd_se_otherreduce","nckd_se_desalary","nckd_se_netsalary","nckd_se_cpy_endins"
-                ,"nckd_se_cpy_hopins","nckd_se_cpy_bhopins","nckd_se_cpy_ljins","nckd_se_cpy_dmgins","nckd_se_cpy_hosins"
+                ,"nckd_se_cpy_hopins","nckd_se_cpy_bhopins","nckd_se_cpy_ljins","nckd_se_cpy_birthins","nckd_se_cpy_dmgins","nckd_se_cpy_hosins"
                 ,"nckd_se_cpy_cmymey");
         //薪酬明细（内退）分录字段标识
         List<String> nckd_earlyretired=Arrays.asList("nckd_ee_institution","nckd_ee_empname","nckd_ee_empnumber","nckd_ee_idnumber","nckd_ee_banknumber"

src/main/java/fi/em/formPlugin/SubAndAudFormPlugin.java

@@ -58,7 +58,7 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 ,"nckd_se_warmsbad","nckd_se_nursabd","nckd_se_otherallowance","nckd_se_risksry","nckd_se_salarypayable","nckd_se_per_endins"
                 ,"nckd_se_per_hopins","nckd_se_per_bhopins","nckd_se_per_ljins","nckd_se_per_hosins","nckd_se_per_cmymey"
                 ,"nckd_se_unionmey","nckd_se_tax","nckd_se_otherreduce","nckd_se_desalary","nckd_se_netsalary","nckd_se_cpy_endins"
-                ,"nckd_se_cpy_hopins","nckd_se_cpy_bhopins","nckd_se_cpy_ljins","nckd_se_cpy_dmgins","nckd_se_cpy_hosins"
+                ,"nckd_se_cpy_hopins","nckd_se_cpy_bhopins","nckd_se_cpy_ljins","nckd_se_cpy_birthins","nckd_se_cpy_dmgins","nckd_se_cpy_hosins"
                 ,"nckd_se_cpy_cmymey");
 
         //薪酬明细（一般员工）汇总分录
@@ -67,7 +67,7 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 ,"nckd_ase_awareward","nckd_ase_otherdevreward","nckd_ase_coldsbad","nckd_ase_warmsbad","nckd_ase_nursabd","nckd_ase_oalwance","nckd_ase_risksry"
                 ,"nckd_ase_salarypayable","nckd_ase_per_endins","nckd_ase_per_hopins","nckd_ase_per_bhopins","nckd_ase_per_ljins","nckd_ase_per_hosins"
                 ,"nckd_ase_per_cmymey","nckd_ase_unionmey","nckd_ase_tax","nckd_ase_otherreduce","nckd_ase_desalary","nckd_ase_netsalary"
-                ,"nckd_ase_cpy_endins","nckd_ase_cpy_hopins","nckd_ase_cpy_bhopins","nckd_ase_cpy_ljins","nckd_ase_cpy_dmgins"
+                ,"nckd_ase_cpy_endins","nckd_ase_cpy_hopins","nckd_ase_cpy_bhopins","nckd_ase_cpy_ljins","nckd_ase_cpy_birthins","nckd_ase_cpy_dmgins"
                 ,"nckd_ase_cpy_hosins","nckd_ase_cpy_cmymey");
 
 

src/main/java/fi/em/opplugin/TravelTotalOpPlugin.java

@@ -0,0 +1,37 @@
+package fi.em.opplugin;
+
+import kd.bos.dataentity.OperateOption;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
+import kd.bos.entity.plugin.args.BeforeOperationArgs;
+import kd.bos.servicehelper.operation.OperationServiceHelper;
+
+/**
+ * @author cjz
+ * @date 2024/11/26 15:21
+ * @description:核定提交前触发
+ */
+public class TravelTotalOpPlugin extends AbstractOperationServicePlugIn{
+
+    //核定提交按钮
+    private static String approvesubmit="approvesubmit";
+    //付款给前置按钮标识
+    private static String save="save";
+
+
+    @Override
+    public void beforeExecuteOperationTransaction(BeforeOperationArgs e) {
+        DynamicObject[] dynamicObjects = e.getDataEntities();
+        //当前操作单据
+        DynamicObject curentDy=dynamicObjects[0];
+        Long id= curentDy.getLong("id");
+        String operationKey = e.getOperationKey();
+        //核定提交前调用保存操作
+        if (approvesubmit.equals(operationKey)) {
+            //调用保存操作
+            OperationServiceHelper
+                    .executeOperate("save","er_tripreimbursebill",new Object[]{id},OperateOption.create());
+        }
+    }
+
+}

src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -380,14 +380,14 @@ public class TestPlugin  extends AbstractListPlugin {
                         isUpdated = true;
                     }
                     //员工状态不为在职，试用期，退二线则设置人员状态为禁用
-                    String nckd_status=personData.getString("nckd_status");
-                    if ((!("01".equals(nckd_status)))  && !("02".equals(nckd_status)) && !("04".equals(nckd_status)))
-                    {
-                        //设置使用状态为禁用
-                        existingUser.set("enable","0");
-                        isUpdated=true;
-
-                    }
+//                    String nckd_status=personData.getString("nckd_status");
+//                    if ((!("01".equals(nckd_status)))  && !("02".equals(nckd_status)) && !("04".equals(nckd_status)))
+//                    {
+//                        //设置使用状态为禁用
+//                        existingUser.set("enable","0");
+//                        isUpdated=true;
+//
+//                    }
                     // 如果有更新则保存
                     if (isUpdated) {
                         SaveServiceHelper.save(new DynamicObject[]{existingUser});
@@ -867,10 +867,24 @@ public class TestPlugin  extends AbstractListPlugin {
         }
 
         if("testaaa".equals(e.getOperateKey())) {
-            DynamicObject[] userinfo=BusinessDataServiceHelper
-                    .load("bos_user","id,gender,fullpinyin,picturefield",null);
-            UserUtils.createAvatar(userinfo);
-            SaveServiceHelper.save(userinfo);
+            DynamicObject[] basicuser=BusinessDataServiceHelper
+                    .load("nckd_basicdata","id,nckd_status,nckd_employeeid",null);
+            for (DynamicObject item:basicuser)
+            {
+                // 获取工号
+                String gonghao = item.getString("nckd_employeeid");
+                //获取人员状态
+                String nckd_status=item.getString("nckd_status");
+                DynamicObject existingUser = BusinessDataServiceHelper.loadSingle(
+                        "bos_user", new QFilter[]{new QFilter("number", "=", gonghao)});
+                existingUser.set("nckd_status",nckd_status);
+                SaveServiceHelper.save(new DynamicObject[]{existingUser});
+            }
+
+//            DynamicObject[] userinfo=BusinessDataServiceHelper
+//                    .load("bos_user","id,gender,fullpinyin,picturefield",null);
+//            UserUtils.createAvatar(userinfo);
+//            SaveServiceHelper.save(userinfo);
         }
 
     }

src/main/java/sys/sc/task/UpdateDataDailyTask.java

@@ -419,14 +419,12 @@ public class UpdateDataDailyTask extends AbstractTask {
                     existingDeptEntry.set("position", "无");
                     isUpdated = true;
                 }
-                //员工状态不为在职，试用期，退二线则设置人员状态为禁用
+                //人员状态更新
                 String nckd_status=personData.getString("nckd_status");
-                if ((!("01".equals(nckd_status)))  && !("02".equals(nckd_status)) && !("04".equals(nckd_status)))
+                if (!nckd_status.equals(existingDeptEntry.getString("nckd_status")))
                 {
-                    //设置使用状态为禁用
-                    existingUser.set("enable","0");
-                    isUpdated=true;
-
+                    existingDeptEntry.set("nckd_status",nckd_status);
+                    isUpdated = true;
                 }
                 // 如果有更新则保存
                 if (isUpdated) {
@@ -448,12 +446,9 @@ public class UpdateDataDailyTask extends AbstractTask {
                 }else {
                     userinfo.set("gender", personData.get("nckd_gender"));
                 }
-                //员工状态不为在职，试用期，退二线则设置人员状态为禁用
+                //人员状态
                 String nckd_status=personData.getString("nckd_status");
-                if ((!("01".equals(nckd_status)))  && !("02".equals(nckd_status)) && !("04".equals(nckd_status))) {
-                    //设置使用状态为禁用
-                    userinfo.set("enable","0");
-                }
+                userinfo.set("nckd_status",nckd_status);
                 //人员手机号
                 userinfo.set("phone", personData.get("nckd_sjh"));
                 // 设置其他固定字段