1.协作操作-生成定调薪信息字段优化

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hsas/formplugin/web/helper/AdjSalFileHelper.java

@@ -86,7 +86,7 @@ public class AdjSalFileHelper {
             DynamicObject salaryAdjFile = getSalaryAdjFile(personId);
             //薪酬结构ID
             Long salaystructureId = salaryAdjFile.getLong("salaystructure.id");
-            Map map = dealCommonFields(onBrdBillDyn, personId, commonParams, salaystructureId);
+            Map map = dealCommonFields(onBrdBillDyn, personId, commonParams, salaryAdjFile);
             map.put("salaryadjfile", salaryAdjFile.getLong("boid"));
             //薪酬体系ID
             Long stdscmId = salaryAdjFile.getLong("stdscm.id");
@@ -123,7 +123,7 @@ public class AdjSalFileHelper {
         //薪酬结构ID
         Long salaystructureId = salaryAdjFile.getLong("salaystructure.id");
 
-        Map map = dealCommonFields(onBrdBillDyn, personId, commonParams, salaystructureId);
+        Map map = dealCommonFields(onBrdBillDyn, personId, commonParams, salaryAdjFile);
         map.put("salaryadjfile", salaryAdjFile.getLong("boid"));
         //薪酬体系ID
         Long stdscmId = salaryAdjFile.getLong("stdscm.id");
@@ -168,7 +168,7 @@ public class AdjSalFileHelper {
      * @param personId
      * @return
      */
-    public static Map dealCommonFields (DynamicObject onBrdBillDyn, Long personId, Map<String, Object> commonParams, Long salaystructureId) {
+    public static Map dealCommonFields (DynamicObject onBrdBillDyn, Long personId, Map<String, Object> commonParams, DynamicObject salaryAdjFile) {
         Map info = new HashMap();
         //数据模式 1-变更 2-禁用
         info.put("datamode", "1");
@@ -192,7 +192,7 @@ public class AdjSalFileHelper {
         //业务数据来源ID-入职单ID
         info.put("businessid", onBrdBillDyn.getPkValue().toString());
         //处理人员相关信息
-        dealRelPersonFields(onBrdBillDyn, personId, info, commonParams, salaystructureId);
+        dealRelPersonFields(onBrdBillDyn, personId, info, commonParams, salaryAdjFile);
         return info;
     }
 
@@ -202,7 +202,7 @@ public class AdjSalFileHelper {
      * @param personId
      * @param map
      */
-    private static void dealRelPersonFields(DynamicObject onBrdBillDyn, Long personId, Map map, Map<String, Object> commonParams, Long salaystructureId) {
+    private static void dealRelPersonFields(DynamicObject onBrdBillDyn, Long personId, Map map, Map<String, Object> commonParams, DynamicObject salaryAdjFile) {
         Map relperson_data = new HashMap();
         relperson_data.put("personname", onBrdBillDyn.getString("name"));
         relperson_data.put("empnumber", onBrdBillDyn.getString("employeeno"));
@@ -216,7 +216,12 @@ public class AdjSalFileHelper {
         DynamicObject jobLevel = getjobLevel(personId);
         relperson_data.put("joblevel",jobLevel.getLong("joblevel.id"));
         //薪酬结构
-        relperson_data.put("salaystructure", salaystructureId);
+        relperson_data.put("salaystructure", salaryAdjFile.getLong("salaystructure.id"));
+        //薪酬体系
+        relperson_data.put("stdscm", salaryAdjFile.getLong("stdscm.id"));
+        //行政组织
+        relperson_data.put("adminorg", salaryAdjFile.getLong("adminorg.id"));
+        relperson_data.put("assoadminorg", salaryAdjFile.getLong("adminorg.id"));
         map.put("relperson_data", relperson_data);
     }
 
@@ -252,7 +257,7 @@ public class AdjSalFileHelper {
     public static DynamicObject getSalaryAdjFile (Long personId) {
         QFilter filter = QFilterUtil.getCurrentQf();
         filter.and("person.id", QCP.equals, personId);
-        DynamicObject[] cols = BusinessDataServiceHelper.load(adjFileInfo_entity, "id,boid,stdscm.id,salaystructure.id,nckd_ncoefficient", new QFilter[]{filter});
+        DynamicObject[] cols = BusinessDataServiceHelper.load(adjFileInfo_entity, "id,boid,adminorg.id,stdscm.id,salaystructure.id,nckd_ncoefficient", new QFilter[]{filter});
         if(cols.length == 0) {
             log.info("根据personId查询定调薪档案失败： {}", personId);
             throw new KDBizException("未找到对应的定调薪档案，终止执行");