Переглянути джерело

feat(salary): 更新定调薪相关常量注释及查询条件

- 补充定调薪申请单相关SQL查询注释
- 更新定调薪项目、频度、汇率表等常量字段说明
- 增加同步成功状态过滤条件(perchgstatus=99)
- 完善国家、币种、调薪方案等常量注释信息
- 优化查询逻辑以提高数据同步准确性
turborao 1 тиждень тому
батько
коміт
6047c360e8

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

@@ -162,11 +162,12 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
          */
         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,aorg.belongcompany.id";
         QFilter qFilter12 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
+        QFilter qFilter17 = new QFilter("perchgstatus", QCP.equals, "99");   //同步成功
         QFilter qFilter13 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo);  //实际调动日期
         QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate);  //实际调动日期
         QFilter qFilter16 = new QFilter("aposition.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
 
-        DynamicObjectCollection transferDyns = QueryServiceHelper.query(FormConstant.HDM_TRANSFERAPPLY, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter16});
+        DynamicObjectCollection transferDyns = QueryServiceHelper.query(FormConstant.HDM_TRANSFERAPPLY, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter17,qFilter16});
 
         Map<Long, DynamicObject> transferMap = (Map)transferDyns.stream().collect(Collectors.toMap((obj) -> {
             return obj.getLong("id");

+ 9 - 6
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/plugin/operate/BuildApplyBillOpPlugin.java

@@ -47,6 +47,9 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
 
     /**
      * 定调薪申请单  定调薪明细字段显示方案   员工调薪
+     * select b.fname ,a.fid,a.fbillformid  from t_bas_billtype a
+     * left join t_bas_billtype_l b on a.fid = b.fid
+     * where a.fbillformid  like 'hcdm_applybill'
      */
     private static final Long changeSalaryBillTypeId = 2215975998602655744L;
     /**
@@ -54,27 +57,27 @@ public class BuildApplyBillOpPlugin extends AbstractOperationServicePlugIn imple
      */
     private static final Long setSalaryBillEntryTypeId = 2215982957338868736L;
     /**
-     * 定调薪项目   岗位工资标准
+     * 定调薪项目   岗位工资标准   t_hsbs_standarditem
      */
     private static final Long salaryStdItemId = 2321899710350111744L;
     /**
-     * 频度  月
+     * 频度  月   t_hsbs_calfrequency
      */
     private static final Long frequencyItemId = 1095454108284088320L;
     /**
-     * 汇率表
+     * 汇率表   通用汇率   T_BD_ExRateTable
      */
     private static final Long exchangeTableId = 2321965096026258432L;
     /**
-     * 国家
+     * 国家   中国   T_BD_Country
      */
     private static final Long countryItemId = 1000001L;
     /**
-     * 定调薪方案
+     * 定调薪方案   t_hcdm_adjapprovescm
      */
     private static final Long salaryAdjScmItemId = 2322515162646457344L;
     /**
-     * 默认币种
+     * 默认币种   人民币   select * from T_BD_Currency
      */
     private static final Long currencyItemId = 1L;