Merge remote-tracking branch 'origin/master'

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/performance/PerfRankMgmtFormPlugin.java

@@ -708,6 +708,7 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
         if(stepEvent.getValue() == 0){
             generatePersonList();
             setStepStatus(0, Steps.PROCESS);
+            this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
         }else{
             //校验有没有保存
             DynamicObject dataEntity = this.getModel().getDataEntity();
@@ -717,9 +718,10 @@ public class PerfRankMgmtFormPlugin extends AbstractFormPlugin implements Wizard
             }else {
                 importResultStep();
                 setStepStatus(1, Steps.PROCESS);
+                this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
             }
         }
         this.getView().updateView(PerfRankMgmtConstant.NCKD_STEP);
-        this.getView().updateView(PerfRankMgmtConstant.NCKD_PERFRANKMGMTENTRY);
+
     }
 }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/business/SynPendingSalaryAdjDataServiceImpl.java

@@ -110,7 +110,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         /**
          * 查询入职单
          */
-        String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.masterid,ba_po_adminorg,ba_po_job.id,ajoblevel.id,ba_po_job.jobseq.id";
+        String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.boid,ba_po_adminorg";
         QFilter qFilter1 = new QFilter("enrollstatus", QCP.equals, "3"); // 入职状态 = 已入职
         QFilter qFilter2 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
         QFilter qFilter3 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo);
@@ -159,8 +159,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
             dyn.set("nckd_dodatetime", onhasonbrdDyn.getDate("createtime"));
             dyn.set("nckd_salaryadjus", salaryTypeDyns.get(0).getLong("id"));  //定调薪类型
             dyn.set("nckd_newhradminorg", onhasonbrdDyn.getLong("ba_po_adminorg"));  //部门
-            dyn.set("nckd_newposition", onhasonbrdDyn.getLong("ba_po_position.masterid"));  //岗位
-            //dyn.set("nckd_newjobseqhr", onhasonbrdDyn.getLong("ba_po_job.jobseq.id"));  //职位序列
+            dyn.set("nckd_newposition", onhasonbrdDyn.getLong("ba_po_position.boid"));  //岗位
             dyn.set("nckd_newsalaryrank", salaryRankDyn.getLong("id"));
             onhasonbrdCount++;
             billDynList.add(dyn);
@@ -170,7 +169,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         /**
          * 查询调动单
          */
-        String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.masterid,aposition.masterid,bb_po_adminorg.id,aorg.id,bb_po_job.jobseq.id,ajob.jobseq.id";
+        String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.boid,aposition.boid,bb_po_adminorg.boid,aorg.boid";
         QFilter qFilter12 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
         QFilter qFilter13 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo);  //实际调动日期
         QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate);  //实际调动日期
@@ -221,8 +220,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
              * 调动前
              */
             dyn.set("nckd_oldhradminorg", transferDyn.getLong("bb_po_adminorg.id"));  //部门
-            dyn.set("nckd_oldposition", transferDyn.getLong("bb_po_position.masterid"));  //岗位
-            //dyn.set("nckd_oldjobseqhr", transferDyn.getLong("bb_po_job.jobseq.id"));  //职位序列
+            dyn.set("nckd_oldposition", transferDyn.getLong("bb_po_position.boid"));  //岗位
             DynamicObject adjRecordDyn  = adjRecordMap.get(employeeID);
             if(adjRecordDyn != null) {
                 dyn.set("nckd_oldsalaryrank", adjRecordDyn.getLong("salaryrank.id"));  //薪档
@@ -231,8 +229,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
              * 调动后
              */
             dyn.set("nckd_newhradminorg", transferDyn.getLong("aorg.id"));  //部门
-            dyn.set("nckd_newposition", transferDyn.getLong("aposition.masterid"));  //岗位
-            //dyn.set("nckd_newjobseqhr", transferDyn.getLong("ajob.jobseq.id"));  //职位序列
+            dyn.set("nckd_newposition", transferDyn.getLong("aposition.boid"));  //岗位
             dyn.set("nckd_newsalaryrank", salaryRankDyn.getLong("id"));   //薪档
             transferCount++;
             billDynList.add(dyn);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/form/PendingSalaryAdjListPlugin.java

@@ -30,6 +30,8 @@ import java.util.stream.Collectors;
 
 /**
  * 员工待定调薪清单
+ * 人事那边做完调动后，判断调动后岗位的【薪酬标准方案】为“江铜集团岗位绩效工资制”的，更新定调薪人员名单列表
+ * 单据包含入职单，调动单，自动更新员工待定调薪清单
  * @author turborao
  * @date 2025/11/19 11:35
  */
@@ -39,61 +41,11 @@ public class PendingSalaryAdjListPlugin extends AbstractListPlugin implements Pl
      * 员工待定调薪清单
      */
     private static final String entityName = "nckd_pendingsalaryadj";
-    /**
-     * 入职单
-     */
-    private static final String onhasonbrdEntityName = "hom_personhasonbrd";
-    /**
-     * 调动单
-     */
-    private static final String transferEntityName = "hdm_transferapply";
-    /**
-     * 定调薪信息
-     */
-    private static final String adjrecordEntityName = "hcdm_decadjrecord";
-
-    private static int days = 5;
-
-    private static Log logger = LogFactory.getLog(PendingSalaryAdjListPlugin.class);
 
-    private DynamicObjectCollection salaryTypeDyns = null;
-    private DynamicObject salaryRankDyn = null;
-    private DynamicObject standardItemDyn = null;
 
     @Override
     public void initialize() {
         super.initialize();
-
-        /**
-         * 获取 公共自定义参数  PENDSALARYADJ_DAYS
-         */
-        CustomParam customParam = new CustomParam();
-        customParam.getSearchKeySet().add("PENDSALARYADJ_DAYS");
-        Map<String, String> cusTomMap = SystemParamServiceHelper.loadCustomParameterFromCache(customParam);
-        String pendsalaryadjDays  = cusTomMap.get("PENDSALARYADJ_DAYS");
-        days = Integer.parseInt(pendsalaryadjDays);
-
-        /**
-         * 获取 定调薪类型
-         */
-        ArrayList<String> salaryTypeList = new ArrayList<>();
-        salaryTypeList.add("tiaozhengtiaoxin");  //岗位调整调薪
-        salaryTypeList.add("100009");  //入职定薪新
-        QFilter qFilter11 = new QFilter("number", QCP.in, salaryTypeList);
-        salaryTypeDyns = QueryServiceHelper.query("hsbs_salaryadjustrsn","id,number,name",new QFilter[]{qFilter11},"number");
-
-        /**
-         * 获取入职时的薪档
-         */
-        QFilter qFilter12 = new QFilter("number", QCP.equals, "01");
-        salaryRankDyn = QueryServiceHelper.queryOne("hsbs_salaryrank","id,number,name",new QFilter[]{qFilter12});
-
-
-        /**
-         * 获取 定调薪项目 岗位工资标准
-         */
-        QFilter qFilter13 = new QFilter("name", QCP.equals, "岗位工资标准");
-        standardItemDyn = QueryServiceHelper.queryOne("hsbs_standarditem","id,number,name",new QFilter[]{qFilter13});
     }
 
     @Override
@@ -111,7 +63,7 @@ public class PendingSalaryAdjListPlugin extends AbstractListPlugin implements Pl
 
     @Override
     public void beforeDoOperation(BeforeDoOperationEventArgs args) {
-        super.beforeDoOperation(args);
+        //super.beforeDoOperation(args);
 
         FormOperate formOperate = (FormOperate)args.getSource();
         String key = formOperate.getOperateKey();
@@ -176,8 +128,8 @@ public class PendingSalaryAdjListPlugin extends AbstractListPlugin implements Pl
             Object[] update = SaveServiceHelper.save(billDyns);
             this.getView().showSuccessNotification(update.length + "条，操作成功", 3000);
         }
-        BillList billList = this.getControl("gridview");
-        billList.refreshData();
+
+        this.getView().invokeOperation("refresh");
 
     }