Просмотр исходного кода

feat(constants): 重构常量类结构并新增日期工具方法

- 将 MasConstant 和 StmConstant 从 common 包移动到 constants 包
- 在 DateUtil 中添加 minusYears 方法用于日期减年操作
- 更新所有相关引用的包路径
- 为 StmConstant 类更新类注释为"工资总额"
- 在 MasConstant 中添加新的常量 NCKD_TOTALBONUSAMT 和 ENTLDRTERMBONUSAPPR_ENTITYID
- 在 StmConstant 中添加大量工资结算相关的常量定义
- 新增 GrpSalStlApprFormPlugin 类实现集团工资结算核定功能
wyc 1 неделя назад
Родитель
Сommit
45e2aaea10
36 измененных файлов с 517 добавлено и 50 удалено
  1. 11 0
      code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/utils/DateUtil.java
  2. 9 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/constants/MasConstant.java
  3. 81 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/constants/StmConstant.java
  4. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/assessmentmgm/EntldrMgrPerfAssmtFormPlugin.java
  5. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/assessmentmgm/EntldrMgrTermAssmtFormPlugin.java
  6. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/LoadPartyPostPopupFormPlugin.java
  7. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/LoadppDatePopupFormPlugin.java
  8. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/SubCoHeadServiceListPlugin.java
  9. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/TenurePersonListListPlugin.java
  10. 1 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/incentivemgmt/AbstractIncentiveApprFormPlugin.java
  11. 1 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/incentivemgmt/EntldrTermBonusApprFormPlugin.java
  12. 1 4
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/AbstractStructApprFormPlugin.java
  13. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/EntLdrItemWageApprFormPlugin.java
  14. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/EntleaderAnlSalStdFormPlugin.java
  15. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/SubcorpChiefSalStdFormPlugin.java
  16. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/change/AbstractSalaryStdChgFormPlugin.java
  17. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/base/DeferPayRatioConfValidator.java
  18. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/structappr/change/EntldrAnlSalStdChgOpPlugin.java
  19. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/structappr/change/SubcpChfSalstdChgBackOpPlugin.java
  20. 376 0
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/appr/GrpSalStlApprFormPlugin.java
  21. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpHqTtlWgBgtAdjFormPlugin.java
  22. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpHqTtlWgBgtSubFormPlugin.java
  23. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpHqTtlWgbGtExecFormPlugin.java
  24. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpTtlQgBgtAdjFormPlugin.java
  25. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpTtlWgBgtExecFormPlugin.java
  26. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpTtlWgBgtSubFormPlugin.java
  27. 2 4
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/ttlwg/TtlWgAdjdeCompFormPlugin.java
  28. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/ttlwg/TtlWgExecDeCompFormPlugin.java
  29. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/unitst/UnitStBudgetAdjustFormPlugin.java
  30. 2 2
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/unitst/UnitStBudgetApplyFormPlugin.java
  31. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/grpttlwg/BackGrpHqTtlWgGgtSubOpPlugin.java
  32. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/grpttlwg/BackGrpTtlWgGgtSubOpPlugin.java
  33. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/grpttlwg/GrpTtlWgGgtSubSaveOpPlugin.java
  34. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/unitst/BackUnitStBudgetOpPlugin.java
  35. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/unitst/UnitStBudgetAdjustSaveOpPlugin.java
  36. 1 1
      code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/unitst/UnitStBudgetAdjustSubmitEffectOpPlugin.java

+ 11 - 0
code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/utils/DateUtil.java

@@ -147,6 +147,17 @@ public class DateUtil {
         return dateTime.plusYears(years);
     }
 
+    /**
+     * 减年
+     *
+     * @param date 原始日期时间
+     * @param years    要减的年数
+     * @return 计算后的日期时间
+     */
+    public static Date minusYears(Date date, int years) {
+        return toDate(minusYears(toLocalDateTime(date), years));
+    }
+
     /**
      * 减年
      *

+ 9 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/common/MasConstant.java → code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/constants/MasConstant.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.swc.mas.common;
+package nckd.jxccl.swc.constants;
 
 import nckd.jxccl.base.common.constant.FormConstant;
 
@@ -187,6 +187,8 @@ public class MasConstant extends FormConstant {
     public static final String NCKD_DEFERPAYMONEY = "nckd_deferpaymoney";
     /** 支付总年数 */
     public static final String NCKD_PAYOUTTIMES = "nckd_payouttimes";
+    /** 支付总年数 */
+    public static final String NCKD_TOTALBONUSAMT = "nckd_totalbonusamt";
     /*-------------------------------------- 延期支付比例 end --------------------------------------*/
 
     /*-------------------------------------- 子企业负责人正职年度薪酬核定标准_变更单 begin --------------------------------------*/
@@ -205,4 +207,10 @@ public class MasConstant extends FormConstant {
     /*-------------------------------------- 企业负责人个人年度薪酬标准核定表 end --------------------------------------*/
 
 
+    /*-------------------------------------- 企业负责人个人年度薪酬标准核定表 begin --------------------------------------*/
+    /** 企业负责人个人年度薪酬标准核定表-实体标识 */
+    public static final String ENTLDRTERMBONUSAPPR_ENTITYID = "nckd_entldrtermbonusappr";
+    /*-------------------------------------- 企业负责人个人年度薪酬标准核定表 end --------------------------------------*/
+
+
 }

+ 81 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/common/StmConstant.java → code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/constants/StmConstant.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.swc.stm.common;
+package nckd.jxccl.swc.constants;
 
 import com.google.common.collect.Lists;
 import nckd.jxccl.base.common.constant.FormConstant;
@@ -6,7 +6,7 @@ import nckd.jxccl.base.common.constant.FormConstant;
 import java.util.List;
 
 /**
- * 动态表单插件
+ * 工资总额
  */
 public class StmConstant extends FormConstant {
 
@@ -235,4 +235,83 @@ public class StmConstant extends FormConstant {
 
     public static final List<String> IGNORE_FIELDS = Lists.newArrayList(NCKD_YEAR,NCKD_PAYUNIT,NCKD_DEP,UNITSTBUDGETAPPLY_ENTITYID,GRPTTLWGBGTSUB_ENTITYID,StmConstant.NCKD_PAYUNIT,String.join( ".", StmConstant.NCKD_PAYUNIT, FormConstant.NAME_KEY));
     public static final List<String> IGNORE_SUMMARY_FIELDS = Lists.newArrayList(NCKD_DMTEAMTOTAL ,NCKD_DMOTHERTTOTAL ,NCKD_PROFMGRTOTAL,NCKD_TOTALWAGE );
+
+
+
+    /** 集团工资结算核定-实体标识 */
+    public static final String GRPSALSTLAPPR_ENTITYID = "nckd_grpsalstlappr";
+    /** 单据名称 */
+    public static final String NCKD_NAME = "nckd_name";
+    /** 单据体 */
+    public static final String NCKD_ENTRYENTITY = "nckd_entryentity";
+    /** 缺省id字段 */
+    public static final String ID = "id";
+    /** 分录行号 */
+    public static final String SEQ = "seq";
+    /** 单位 */
+    public static final String NCKD_UNIT = "nckd_unit";
+    /** 上年实际计提工资总额与应提工资总额差额 */
+    public static final String NCKD_LYRACTVSEXPDIFF = "nckd_lyractvsexpdiff";
+    /** 负责人累计平均人数 */
+    public static final String NCKD_RESPAVGNUM = "nckd_respavgnum";
+    /** 负责人薪酬合计 */
+    public static final String NCKD_RESPWGTTL = "nckd_respwgttl";
+    /** 专务、巡察专员累计平均人数 */
+    public static final String NCKD_SPECINSPAVGNUM = "nckd_specinspavgnum";
+    /** 专务、巡察专员薪酬合计 */
+    public static final String NCKD_SPECINSPWGTTL = "nckd_specinspwgttl";
+    /** 任期激励 */
+    public static final String NCKD_TERMBONUS = "nckd_termbonus";
+    /** 组织绩效考核累计平均人数 */
+    public static final String NCKD_ORGPERFAVGNUM = "nckd_orgperfavgnum";
+    /** 组织绩效考核薪酬合计 */
+    public static final String NCKD_ORGPERFWGTTL = "nckd_orgperfwgttl";
+    /** 组织绩效考核人均 */
+    public static final String NCKD_ORGPERFAVG = "nckd_orgperfavg";
+    /** 一次性单项工资 */
+    public static final String NCKD_ONETIMEITEMWG = "nckd_onetimeitemwg";
+    /** 全部员工累计平均人数 */
+    public static final String NCKD_ALLEMPAVGNUM = "nckd_allempavgnum";
+    /** 本年应提工资总额 */
+    public static final String NCKD_CYEXPECTEDTOTAL = "nckd_cyexpectedtotal";
+    /** 全部员工工资总额 */
+    public static final String NCKD_ALLEMPWGTTL = "nckd_allempwgttl";
+    /** 全部员工人均 */
+    public static final String NCKD_ALLEMPAVG = "nckd_allempavg";
+    /** 本年实际计提工资总额(单体审计报告数) */
+    public static final String NCKD_CYACTAUDITTOTAL = "nckd_cyactaudittotal";
+    /** 本年实际计提工资总额与应提工资总额差额 */
+    public static final String NCKD_CYACTVSEXPDIFF = "nckd_cyactvsexpdiff";
+    /** 备注 */
+    public static final String NCKD_REMARK = "nckd_remark";
+    /** 上年补提或冲回以前年度差额 */
+    public static final String NCKD_LYRPRIORADJDIFF = "nckd_lyrprioradjdiff";
+    /** 上年年薪人员差额 */
+    public static final String NCKD_LYRANNSALDIFF = "nckd_lyrannsaldiff";
+    /** 上年任期激励差额 */
+    public static final String NCKD_LYRTERMBONUSDIFF = "nckd_lyrtermbonusdiff";
+    /** 上年组织绩效差额 */
+    public static final String NCKD_LYRORGPERFDIFF = "nckd_lyrorgperfdiff";
+    /** 上年单项工资差额 */
+    public static final String NCKD_LYRITEMWGDIFF = "nckd_lyritemwgdiff";
+    /** 补提或冲回以前年度差额 */
+    public static final String NCKD_CYPRIORADJDIFF = "nckd_cyprioradjdiff";
+    /** 年薪人员计提数 */
+    public static final String NCKD_ANNSALACCRUED = "nckd_annsalaccrued";
+    /** 任期激励计提数 */
+    public static final String NCKD_TERMBONUSACCRUED = "nckd_termbonusaccrued";
+    /** 组织绩效计提数 */
+    public static final String NCKD_ORGPERFACCRUED = "nckd_orgperfaccrued";
+    /** 单项工资计提数 */
+    public static final String NCKD_ITEMWGACCRUED = "nckd_itemwgaccrued";
+    /** 本年补提或冲回以前年度差额 */
+    public static final String NCKD_CYPRIORADJDIFF2 = "nckd_cyprioradjdiff2";
+    /** 本年年薪人员差额 */
+    public static final String NCKD_CYANNSALDIFF = "nckd_cyannsaldiff";
+    /** 本年任期激励差额 */
+    public static final String NCKD_CYTERMBONUSDIFF = "nckd_cytermbonusdiff";
+    /** 本年组织绩效差额 */
+    public static final String NCKD_CYORGPERFDIFF = "nckd_cyorgperfdiff";
+    /** 本年单项工资差额 */
+    public static final String NCKD_CYITEMWGDIFF = "nckd_cyitemwgdiff";
 }

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/assessmentmgm/EntldrMgrPerfAssmtFormPlugin.java

@@ -16,7 +16,7 @@ import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/assessmentmgm/EntldrMgrTermAssmtFormPlugin.java

@@ -15,7 +15,7 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.util.Arrays;
 import java.util.Comparator;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/LoadPartyPostPopupFormPlugin.java

@@ -4,7 +4,7 @@ import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 /**
 * 载入党政职务履历弹窗

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/LoadppDatePopupFormPlugin.java

@@ -4,7 +4,7 @@ import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/SubCoHeadServiceListPlugin.java

@@ -30,7 +30,7 @@ import nckd.jxccl.base.common.utils.ShowOperExecuteResult;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.hrpi.helper.EmpPosOrgRelHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/TenurePersonListListPlugin.java

@@ -30,7 +30,7 @@ import nckd.jxccl.base.common.utils.ShowOperExecuteResult;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.hrpi.helper.EmpPosOrgRelHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;

+ 1 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/incentivemgmt/AbstractIncentiveApprFormPlugin.java

@@ -9,12 +9,11 @@ import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
-import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.util.Objects;
 import java.util.stream.Stream;

+ 1 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/incentivemgmt/EntldrTermBonusApprFormPlugin.java

@@ -6,11 +6,10 @@ import kd.bos.entity.datamodel.RowDataEntity;
 import kd.bos.entity.datamodel.events.AfterAddRowEventArgs;
 import kd.bos.entity.datamodel.events.ChangeData;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
-import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.util.EventObject;
 import java.util.Objects;

+ 1 - 4
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/AbstractStructApprFormPlugin.java

@@ -13,15 +13,12 @@ import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.entity.validate.BillStatus;
 import kd.bos.form.ConfirmCallBackListener;
 import kd.bos.form.ConfirmTypes;
-import kd.bos.form.IFormView;
-import kd.bos.form.IPageCache;
 import kd.bos.form.MessageBoxOptions;
 import kd.bos.form.MessageBoxResult;
 import kd.bos.form.ShowType;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.MessageBoxClosedEvent;
 import kd.bos.form.plugin.AbstractFormPlugin;
-import kd.bos.mvc.SessionManager;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
@@ -39,7 +36,7 @@ import nckd.jxccl.base.common.utils.ShowOperExecuteResult;
 import nckd.jxccl.base.common.utils.StrFormatter;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/EntLdrItemWageApprFormPlugin.java

@@ -22,7 +22,7 @@ import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/EntleaderAnlSalStdFormPlugin.java

@@ -16,7 +16,7 @@ import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/SubcorpChiefSalStdFormPlugin.java

@@ -16,7 +16,7 @@ import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/structappr/change/AbstractSalaryStdChgFormPlugin.java

@@ -18,7 +18,7 @@ import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/base/DeferPayRatioConfValidator.java

@@ -4,7 +4,7 @@ import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.ExtendedDataEntity;
 import kd.bos.entity.validate.AbstractValidator;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 /**
 * 延期支付比例

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/structappr/change/EntldrAnlSalStdChgOpPlugin.java

@@ -5,7 +5,7 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.BeginOperationTransactionArgs;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.util.Date;
 

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/operate/structappr/change/SubcpChfSalstdChgBackOpPlugin.java

@@ -5,7 +5,7 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.BeginOperationTransactionArgs;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 
 import java.util.Date;
 

+ 376 - 0
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/appr/GrpSalStlApprFormPlugin.java

@@ -0,0 +1,376 @@
+package nckd.jxccl.swc.stm.plugin.form.appr;
+
+import kd.bos.algo.Algo;
+import kd.bos.algo.AlgoContext;
+import kd.bos.algo.DataSet;
+import kd.bos.algo.Row;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.DynamicObjectCollection;
+import kd.bos.form.control.events.ItemClickEvent;
+import kd.bos.form.control.events.ItemClickListener;
+import kd.bos.form.plugin.AbstractFormPlugin;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.QueryServiceHelper;
+import kd.sdk.plugin.Plugin;
+import nckd.jxccl.base.common.constant.FormConstant;
+import nckd.jxccl.base.common.utils.ConvertUtil;
+import nckd.jxccl.base.common.utils.DateUtil;
+import nckd.jxccl.base.common.utils.QueryFieldBuilder;
+import nckd.jxccl.base.swc.helper.SWCHelper;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* 集团工资结算核定
+* 实体标识:nckd_grpsalstlappr
+* @author W.Y.C
+* @date 2025/12/30 19:09
+* @version 1.0
+*/
+public class GrpSalStlApprFormPlugin extends AbstractFormPlugin implements Plugin, ItemClickListener {
+
+    @Override
+    public void registerListener(EventObject e) {
+        //监听工具栏
+        this.addItemClickListeners("nckd_advcontoolbarap");
+    }
+
+    @Override
+    public void itemClick(ItemClickEvent evt) {
+        String itemKey = evt.getItemKey();
+        if(itemKey.equalsIgnoreCase("nckd_calculate")){
+            Date year = ConvertUtil.toDate(this.getModel().getValue(StmConstant.NCKD_YEAR));
+            if(year == null){
+                this.getView().showTipNotification("请选择年度");
+            }else{
+                calculate();
+            }
+        }
+    }
+
+    private void calculate(){
+        Date year = ConvertUtil.toDate(this.getModel().getValue(StmConstant.NCKD_YEAR));
+        DynamicObjectCollection entryEntity = this.getModel().getDataEntity(true).getDynamicObjectCollection(StmConstant.NCKD_ENTRYENTITY);
+        if(!entryEntity.isEmpty()){
+            List<Long> unitIds = new ArrayList<>();
+            for (DynamicObject entry : entryEntity) {
+                DynamicObject unit = entry.getDynamicObject(StmConstant.NCKD_UNIT);
+                if(unit != null){
+                    long unitId = unit.getLong(StmConstant.ID_KEY);
+                    if(unitId > 0) {
+                        unitIds.add(unitId);
+                    }
+                }
+            }
+            if(unitIds.isEmpty()){
+                this.getView().showTipNotification("请先选择二级单位!");
+            }else{
+
+                //获取上年度数据
+                Map<Long, List<DynamicObject>> lastYearDataMap = getLastYearData(year, unitIds);
+                //计算中高层不同类别人员的平均人数和薪酬总额
+                Map<Long, Result> longResultMap = avgPeopleNum(year, unitIds);
+                //按单位汇总任期激励金额
+                Map<Long, BigDecimal> longBigDecimalMap = sumTermBonusByUnit(year, unitIds);
+                //集团核定单项”+“优秀生津贴”项目薪酬数据
+
+                for (DynamicObject entry : entryEntity) {
+                    long unitId = entry.getLong(String.join(".", StmConstant.NCKD_UNIT, StmConstant.ID_KEY));
+                    if(unitId > 0){
+                        List<DynamicObject> lastYearDataList = lastYearDataMap.get(unitId);
+                        if(lastYearDataList != null && !lastYearDataList.isEmpty()){
+                            DynamicObject lastYearData = lastYearDataList.get(0);
+                            //上年实际计提工资总额与应提工资总额差额
+                            entry.set(StmConstant.NCKD_LYRACTVSEXPDIFF, lastYearData.getBigDecimal(String.join(".",StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_LYRACTVSEXPDIFF)));
+                            //上年补提或冲回以前年度差额
+                            entry.set(StmConstant.NCKD_LYRPRIORADJDIFF, lastYearData.getBigDecimal(String.join(".",StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_LYRPRIORADJDIFF)));
+                            //上年年薪人员差额
+                            entry.set(StmConstant.NCKD_LYRANNSALDIFF, lastYearData.getBigDecimal(String.join(".",StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_LYRANNSALDIFF)));
+                            //上年任期激励差额
+                            entry.set(StmConstant.NCKD_LYRTERMBONUSDIFF, lastYearData.getBigDecimal(String.join(".",StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_LYRTERMBONUSDIFF)));
+                            //上年组织绩效差额
+                            entry.set(StmConstant.NCKD_LYRORGPERFDIFF, lastYearData.getBigDecimal(String.join(".",StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_LYRORGPERFDIFF)));
+                            //上年单项工资差额
+                            entry.set(StmConstant.NCKD_LYRITEMWGDIFF, lastYearData.getBigDecimal(String.join(".",StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_LYRITEMWGDIFF)));
+                        }
+                        Result result = longResultMap.get(unitId);
+                        if(result != null) {
+                            //负责人累计平均人数
+                            entry.set(StmConstant.NCKD_RESPAVGNUM, result.respAvgNum);
+                            //负责人薪酬合计
+                            entry.set(StmConstant.NCKD_RESPWGTTL, result.resPwgTtl);
+                            //专务、巡察专员累计平均人数
+                            entry.set(StmConstant.NCKD_SPECINSPAVGNUM, result.specInspAvgNum);
+                            //专务、巡察专员薪酬合计
+                            entry.set(StmConstant.NCKD_SPECINSPWGTTL, result.specInspWgTtl);
+                        }
+                        BigDecimal sumTermBonus = longBigDecimalMap.get(unitId);
+                        if(sumTermBonus != null){
+                            entry.set(StmConstant.NCKD_TERMBONUS, sumTermBonus);
+                        }
+                    }
+                }
+                this.getView().updateView(StmConstant.NCKD_ENTRYENTITY);
+            }
+        }else{
+            this.getView().showTipNotification("请先添加数据!");
+        }
+    }
+
+    /**
+     * 获取上年度数据
+     * @param year 年份
+     * @param unitIds 单位ID列表
+     * @return 每个单位的上年度数据映射
+     */
+    private Map<Long,List<DynamicObject>> getLastYearData(Date year, List<Long> unitIds){
+        Date lastYear = DateUtil.minusYears(year, 1);
+        Date beginDate = DateUtil.beginOfYear(lastYear);
+        Date endDate = DateUtil.endOfDay(lastYear);
+        QFilter qFilter = new QFilter(StmConstant.NCKD_YEAR, QCP.large_equals,beginDate)
+                .and(StmConstant.NCKD_YEAR, QCP.less_equals, endDate)
+                .and(String.join(".",StmConstant.NCKD_ENTRYENTITY, StmConstant.NCKD_UNIT), QCP.in, unitIds);
+        QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()
+                .addIdNumberName(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_UNIT)
+                .add(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_CYACTVSEXPDIFF)
+                .add(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_CYPRIORADJDIFF2)
+                .add(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_CYANNSALDIFF)
+                .add(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_CYTERMBONUSDIFF)
+                .add(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_CYORGPERFDIFF)
+                .add(StmConstant.NCKD_ENTRYENTITY,StmConstant.NCKD_CYITEMWGDIFF);
+        DynamicObjectCollection query = QueryServiceHelper.query(StmConstant.GRPSALSTLAPPR_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{qFilter});
+        return query.stream()
+                .collect(Collectors.groupingBy(
+                        obj -> obj.getLong(String.join(".",StmConstant.NCKD_ENTRYENTITY, StmConstant.NCKD_UNIT,FormConstant.ID_KEY))
+                ));
+    }
+
+
+
+    /**
+     * 计算不同职位类别的平均人数和薪酬总额
+     * 
+     * @param year 年份
+     * @param unitIds 单位ID列表
+     * @return 每个单位的计算结果映射
+     */
+    private Map<Long,Result> avgPeopleNum(Date year, List<Long> unitIds){
+        Map<Long,Result> result = new HashMap<>();
+        
+        // 定义常量
+        final String SALARY_ITEM_NUMBER = "JT_477"; // 实发工资
+        final BigDecimal MONTHS_IN_YEAR = new BigDecimal(12); // 一年的月份数
+        final int DECIMAL_SCALE = 2; // 保留小数位数
+        
+        try(AlgoContext context = Algo.newContext()) {
+            Date beginDate = DateUtil.beginOfYear(year);
+            Date endDate = DateUtil.endOfDay(year);
+            QFilter qFilter = new QFilter(StmConstant.NCKD_YEAR, QCP.large_equals, beginDate)
+                    .and(StmConstant.NCKD_YEAR, QCP.less_equals, endDate)
+                    .and(StmConstant.NCKD_PAYUNIT, QCP.in, unitIds);
+            QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()
+                    .addIdNumberName(StmConstant.NCKD_PAYUNIT)
+                    .addIdNumberNameWithExtras(new String[]{StmConstant.NCKD_EMPLOYEE}, FormConstant.EMP_NUMBER_KEY)
+                    .add(MasConstant.NCKD_ISDIRCADRE)
+                    .add(MasConstant.NCKD_POSNAME)
+                    .add(MasConstant.NCKD_SERVICEMONTHS);
+            DataSet dataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), MasConstant.SUBCOHEADSERVICE_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{qFilter}, null,1000000);
+
+            // 计算负责人类别(不包含专务和巡察专员的直管干部)
+            calculateCategoryResult(dataSet.copy(), result,
+                MasConstant.NCKD_POSNAME + " not like '%专务%' and " + MasConstant.NCKD_POSNAME + " not like '%巡察专员%' and " + MasConstant.NCKD_ISDIRCADRE + "=true",
+                Result::setRespAvgNum, Result::setResPwgTtl, beginDate, endDate);
+
+            // 计算专务和巡察专员类别
+            calculateCategoryResult(dataSet.copy(), result,
+                "("+MasConstant.NCKD_POSNAME + " like '%专务%' or " + MasConstant.NCKD_POSNAME + " like '%巡察专员%')",
+                Result::setSpecInspAvgNum, Result::setSpecInspWgTtl, beginDate, endDate);
+        }
+        return result;
+    }
+
+
+    /**
+     * 计算特定类别的结果
+     * 
+     * @param dataSet 原始数据集
+     * @param result 结果映射
+     * @param filter 过滤条件
+     * @param avgNumSetter 平均人数设置器
+     * @param wgTtlSetter 薪酬总额设置器
+     * @param beginDate 查询开始日期
+     * @param endDate 查询结束日期
+     */
+    private void calculateCategoryResult(DataSet dataSet, Map<Long, Result> result, String filter,
+                                         java.util.function.BiConsumer<Result, BigDecimal> avgNumSetter,
+                                         java.util.function.BiConsumer<Result, BigDecimal> wgTtlSetter,
+                                         Date beginDate, Date endDate) {
+        // 定义常量
+        final String SALARY_ITEM_NUMBER = "JT_477"; // 实发工资
+        final BigDecimal MONTHS_IN_YEAR = new BigDecimal(12); // 一年的月份数
+        final int DECIMAL_SCALE = 2; // 保留小数位数
+        
+        DataSet filteredDataSet = dataSet.filter(filter);
+        DataSet calcSumDataSet = filteredDataSet.copy()
+                .groupBy(new String[]{String.join(".", StmConstant.NCKD_PAYUNIT, StmConstant.ID_KEY)})
+                .sum(MasConstant.NCKD_SERVICEMONTHS, "sum")
+                .finish();
+        
+        // 计算平均人数
+        while (calcSumDataSet.hasNext()) {
+            Row next = calcSumDataSet.next();
+            Long payUnitId = next.getLong(String.join(".", StmConstant.NCKD_PAYUNIT, StmConstant.ID_KEY));
+            BigDecimal sum = next.getBigDecimal("sum");
+            BigDecimal avg = calculateAverage(sum, MONTHS_IN_YEAR, DECIMAL_SCALE);
+            result.computeIfAbsent(payUnitId, k -> new Result());
+            avgNumSetter.accept(result.get(payUnitId), avg);
+        }
+        
+        // 计算薪酬总额
+        Map<Long, List<Long>> unitPersonMap = new HashMap<>(); // 按单位分组的人员ID映射
+        Map<Long, Long> personToUnitMap = new HashMap<>(); // 人员ID到单位ID的映射
+        
+        // 重新遍历过滤后的数据集,建立人员与单位的映射关系
+        DataSet personDataSet = filteredDataSet.copy();
+        while (personDataSet.hasNext()) {
+            Row next = personDataSet.next();
+            Long personId = next.getLong(String.join(".", StmConstant.NCKD_EMPLOYEE, StmConstant.ID_KEY));
+            Long payUnit = next.getLong(String.join(".", StmConstant.NCKD_PAYUNIT, StmConstant.ID_KEY));
+            
+            // 按单位分组人员ID
+            unitPersonMap.computeIfAbsent(payUnit, k -> new ArrayList<>()).add(personId);
+            // 建立人员ID到单位ID的映射
+            personToUnitMap.put(personId, payUnit);
+        }
+        
+        if (!unitPersonMap.isEmpty()) {
+            List<Long> allPersonIds = unitPersonMap.values().stream()
+                    .flatMap(List::stream)
+                    .collect(Collectors.toList());
+            
+            // 获取人员薪酬数据(按薪资所属年月)
+            DynamicObjectCollection items = SWCHelper.querySalaryList(allPersonIds, beginDate, endDate, "-1");
+            
+            // 过滤实发工资项目
+            List<DynamicObject> filteredItems = items.stream()
+                    .filter(item -> SALARY_ITEM_NUMBER.equals(item.getString("hsas_caltableentry.salaryitem.number")))
+                    .collect(Collectors.toList());
+            
+            // 按单位分组计算薪酬总额
+            Map<Long, BigDecimal> unitSalaryMap = new HashMap<>();
+            for (DynamicObject item : filteredItems) {
+                Long personId = item.getLong("calpersonid");
+                // 通过映射直接获取单位ID
+                Long unitId = personToUnitMap.get(personId);
+                if (unitId != null) {
+                    BigDecimal amount = item.getBigDecimal("hsas_caltableentry.calamountvalue");
+                    unitSalaryMap.merge(unitId, amount, BigDecimal::add);
+                }
+            }
+            
+            // 更新结果中的薪酬总额
+            for (Map.Entry<Long, BigDecimal> entry : unitSalaryMap.entrySet()) {
+                Long payUnitId = entry.getKey();
+                result.computeIfAbsent(payUnitId, k -> new Result());
+                wgTtlSetter.accept(result.get(payUnitId), entry.getValue());
+            }
+        }
+    }
+    
+    /**
+     * 计算平均值
+     * 
+     * @param sum 总和
+     * @param divisor 除数
+     * @param scale 小数位数
+     * @return 计算后的平均值
+     */
+    private BigDecimal calculateAverage(BigDecimal sum, BigDecimal divisor, int scale) {
+        if (sum != null && sum.compareTo(BigDecimal.ZERO) > 0) {
+            return sum.divide(divisor, scale, RoundingMode.HALF_UP);
+        }
+        return BigDecimal.ZERO;
+    }
+
+    /**
+     * 按单位汇总任期激励金额
+     * @param year 年份
+     * @param unitIds 单位ID列表
+     * @return 每个单位的任期激励总额映射
+     */
+    private Map<Long, BigDecimal> sumTermBonusByUnit(Date year, List<Long> unitIds){
+        int y = DateUtil.getYear(year);
+        // 查询任期激励核定表中对应年份的数据
+        // 结束年份的任期激励总金额;
+        QFilter qFilter = new QFilter(String.join(".", MasConstant.NCKD_TERM, StmConstant.NAME_KEY), QCP.like, "%-"+y)
+                .and(MasConstant.NCKD_PAYUNIT, QCP.in, unitIds);
+
+        QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()
+                .addIdNumberName(MasConstant.NCKD_PAYUNIT)
+                .add(String.join(".", FormConstant.NCKD_ENTRYENTITY, MasConstant.NCKD_TOTALBONUSAMT));
+
+        // 使用正确的实体标识
+        DynamicObjectCollection query = QueryServiceHelper.query(MasConstant.ENTLDRTERMBONUSAPPR_ENTITYID, queryFieldBuilder.buildSelect(), new QFilter[]{qFilter});
+        if(!query.isEmpty()){
+            // 按单位分组并汇总任期激励金额
+            return query.stream()
+                    .collect(Collectors.groupingBy(
+                            obj -> obj.getLong(String.join(".", FormConstant.NCKD_ENTRYENTITY, MasConstant.NCKD_PAYUNIT, FormConstant.ID_KEY)),
+                            Collectors.reducing(
+                                    BigDecimal.ZERO,
+                                    obj -> obj.getBigDecimal(String.join(".", FormConstant.NCKD_ENTRYENTITY, MasConstant.NCKD_TOTALBONUSAMT)),
+                                    BigDecimal::add
+                            )
+                    ));
+        }else{
+            return new HashMap<>();
+        }
+    }
+    /**
+     * 按单位汇总任期激励金额
+     * @param year 年份
+     * @param unitIds 单位ID列表
+     * @return 每个单位的任期激励总额映射
+     */
+    /*private Map<Long, BigDecimal> sumTermBonusByUnit1(Date year, List<Long> unitIds){
+        SWCHelper.querySalaryList(unitPersonMap.keySet(), beginDate, endDate, "-1")
+    }*/
+
+    class Result {
+        /** 负责人累计平均人数 */
+        public  BigDecimal respAvgNum;
+        /** 负责人薪酬合计 */
+        public  BigDecimal resPwgTtl;
+        /** 专务、巡察专员累计平均人数 */
+        public  BigDecimal specInspAvgNum;
+        /** 专务、巡察专员薪酬合计 */
+        public  BigDecimal specInspWgTtl;
+        
+        public void setRespAvgNum(BigDecimal respAvgNum) {
+            this.respAvgNum = respAvgNum;
+        }
+        
+        public void setResPwgTtl(BigDecimal resPwgTtl) {
+            this.resPwgTtl = resPwgTtl;
+        }
+        
+        public void setSpecInspAvgNum(BigDecimal specInspAvgNum) {
+            this.specInspAvgNum = specInspAvgNum;
+        }
+        
+        public void setSpecInspWgTtl(BigDecimal specInspWgTtl) {
+            this.specInspWgTtl = specInspWgTtl;
+        }
+    }
+}

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpHqTtlWgBgtAdjFormPlugin.java

@@ -21,8 +21,8 @@ import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpHqTtlWgBgtSubFormPlugin.java

@@ -19,8 +19,8 @@ import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpHqTtlWgbGtExecFormPlugin.java

@@ -20,8 +20,8 @@ import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpTtlQgBgtAdjFormPlugin.java

@@ -4,7 +4,7 @@ import kd.bos.bill.BillShowParameter;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.sdk.plugin.Plugin;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 /**
 * nckd_grpttlwgbgtadj

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpTtlWgBgtExecFormPlugin.java

@@ -20,8 +20,8 @@ import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/grpttlwg/GrpTtlWgBgtSubFormPlugin.java

@@ -21,8 +21,8 @@ import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.common.utils.StrFormatter;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 2 - 4
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/ttlwg/TtlWgAdjdeCompFormPlugin.java

@@ -16,14 +16,12 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.base.common.utils.ConvertUtil;
 import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.business.StmService;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/ttlwg/TtlWgExecDeCompFormPlugin.java

@@ -20,8 +20,8 @@ import nckd.jxccl.base.common.utils.DateUtil;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.MasConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.time.LocalDateTime;
 import java.util.Date;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/unitst/UnitStBudgetAdjustFormPlugin.java

@@ -4,7 +4,7 @@ import kd.bos.bill.BillShowParameter;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.sdk.plugin.Plugin;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 /**
 * 单位工资总额预算申报调整

+ 2 - 2
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/form/unitst/UnitStBudgetApplyFormPlugin.java

@@ -28,9 +28,9 @@ import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.common.utils.StrFormatter;
 import nckd.jxccl.base.entity.helper.EntityHelper;
 import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
-import nckd.jxccl.swc.mas.common.MasConstant;
+import nckd.jxccl.swc.constants.MasConstant;
 import nckd.jxccl.swc.stm.business.StmService;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/grpttlwg/BackGrpHqTtlWgGgtSubOpPlugin.java

@@ -18,7 +18,7 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.exception.ValidationException;
 import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.util.ArrayList;
 import java.util.Arrays;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/grpttlwg/BackGrpTtlWgGgtSubOpPlugin.java

@@ -18,7 +18,7 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.exception.ValidationException;
 import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.util.ArrayList;
 import java.util.Arrays;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/grpttlwg/GrpTtlWgGgtSubSaveOpPlugin.java

@@ -15,7 +15,7 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 /**
 * 集团工资总额预算申报调整-保存

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/unitst/BackUnitStBudgetOpPlugin.java

@@ -18,7 +18,7 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.exception.ValidationException;
 import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.util.ArrayList;
 import java.util.Arrays;

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/unitst/UnitStBudgetAdjustSaveOpPlugin.java

@@ -15,7 +15,7 @@ import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.constant.FormConstant;
 import nckd.jxccl.base.common.utils.QueryFieldBuilder;
 import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 /**
 * 单位工资总额预算申报调整-保存操作插件

+ 1 - 1
code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/plugin/operate/unitst/UnitStBudgetAdjustSubmitEffectOpPlugin.java

@@ -12,7 +12,7 @@ import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.base.common.exception.ValidationException;
 import nckd.jxccl.base.common.utils.StrFormatter;
-import nckd.jxccl.swc.stm.common.StmConstant;
+import nckd.jxccl.swc.constants.StmConstant;
 
 import java.util.StringJoiner;