refactor(stm): 优化组织机构查询和工资预算计算逻辑

- 添加 EnableEnum 导入并修改组织机构启用状态过滤条件
- 注释掉总工资计算中的重复字段累加避免重复计算
- 修改单位预算申请表单的数据源配置和查询逻辑
- 新增工资类型同步到调整后工资类型的赋值逻辑
- 优化代码格式添加必要的空格分隔符

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/ijp/plugin/operate/IntJobPostAuditedOpPlugin.java

@@ -173,7 +173,7 @@ public class IntJobPostAuditedOpPlugin extends AbstractOperationServicePlugIn im
                     newRecord.set(IntJobPostConstant.NCKD_BEGINDATE,dataEntity.get(IntJobPostConstant.NCKD_BIZDAY));
                     newRecord.set(IntJobPostConstant.NCKD_YEAR,dataEntity.get(IntJobPostConstant.NCKD_YEAR));
                     //分录
-                    newRecord.set(IntJobPostConstant.NCKD_INTJOBPOSTENTRY,entry);
+                    newRecord.set(IntJobPostConstant.NCKD_INTJOBPOSTENTRY, entry);
                     newRecord.set(IntJobPostConstant.NCKD_APPRAISALRESULT,entry.get(IntJobPostConstant.NCKD_APPRAISALRESULT));
                     newRecord.set(IntJobPostConstant.NCKD_BEFORELAST,entry.get(IntJobPostConstant.NCKD_BEFORELAST));
                     newRecord.set(FormConstant.CREATOR_KEY,currUserId);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/stm/business/StmService.java

@@ -1,5 +1,6 @@
 package nckd.jxccl.swc.stm.business;
 
+import kd.bos.common.enums.EnableEnum;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.orm.query.QCP;
@@ -43,6 +44,7 @@ public class StmService {
                 .and(QFilterCommonHelper.getCurrentVersionFilter())
                 .and(QFilterCommonHelper.getEnableFilter())
                 .and(QFilterCommonHelper.getStatusFilter())
+                .and(String.join(".", "corporateorg", FormConstant.ENABLE),QCP.equals, EnableEnum.YES.getCode())
                 //包含自己
                 .or(FormConstant.ID_KEY,QCP.equals,org.getLong(FormConstant.ID_KEY));
         QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()

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

@@ -117,8 +117,8 @@ public class GrpTtlWgBgtSubFormPlugin extends AbstractFormPlugin implements Plug
                         直管干部（其他）：nckd_dmotherttotal
                         职业经理人：nckd_profmgrtotal
                         非直管干部在岗职工工资：nckd_nondirwgbgt*/
-                        onpStWg = onpStWg.add(obj.getBigDecimal(StmConstant.NCKD_TOTALWAGE) != null ? obj.getBigDecimal(StmConstant.NCKD_TOTALWAGE) : java.math.BigDecimal.ZERO)
-                                .add(obj.getBigDecimal(StmConstant.NCKD_DMOTHERTTOTAL) != null ? obj.getBigDecimal(StmConstant.NCKD_DMOTHERTTOTAL) : java.math.BigDecimal.ZERO)
+                        onpStWg = //onpStWg.add(obj.getBigDecimal(StmConstant.NCKD_TOTALWAGE) != null ? obj.getBigDecimal(StmConstant.NCKD_TOTALWAGE) : java.math.BigDecimal.ZERO)
+                                onpStWg.add(obj.getBigDecimal(StmConstant.NCKD_DMOTHERTTOTAL) != null ? obj.getBigDecimal(StmConstant.NCKD_DMOTHERTTOTAL) : java.math.BigDecimal.ZERO)
                                 .add(obj.getBigDecimal(StmConstant.NCKD_PROFMGRTOTAL) != null ? obj.getBigDecimal(StmConstant.NCKD_PROFMGRTOTAL) : java.math.BigDecimal.ZERO)
                                 .add(obj.getBigDecimal(StmConstant.NCKD_NONDIRWGBGT) != null ? obj.getBigDecimal(StmConstant.NCKD_NONDIRWGBGT) : java.math.BigDecimal.ZERO);
 

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

@@ -119,6 +119,9 @@ public class TtlWgAdjdeCompFormPlugin extends AbstractFormPlugin implements Plug
             String name = property.getName();
             if (name.indexOf("nckd_") > -1 && this.getModel().getDataEntityType().getProperties().containsKey(name) &&  !name.endsWith("ex") && StmConstant.IGNORE_FIELDS.stream().noneMatch(ignoreField -> ignoreField.equalsIgnoreCase(name))) {
                 this.getModel().setValue(name, source.get(name));
+                if("nckd_wagetype".equalsIgnoreCase( name)){
+                    this.getModel().setValue("nckd_wagetypead", source.get(name));
+                }
             }
         }
     }

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

@@ -73,9 +73,9 @@ public class UnitStBudgetApplyFormPlugin extends AbstractFormPlugin implements P
                 }else{
                     DynamicObjectCollection corp = StmService.corp(org);
                     ListShowParameter listParameter = new ListShowParameter();
-                    listParameter.setFormId("bos_list");
+                    listParameter.setFormId("bos_listf7");
 //                    listParameter.setFormId("haos_orgtreelistf7");
-                    listParameter.setBillFormId("haos_adminorghrf7");
+                    listParameter.setBillFormId("hbss_lawentity");
                     listParameter.setCaption(StrFormatter.format("【{}】下的法人企业",org.getString(FormConstant.NAME_KEY)));
                     listParameter.getOpenStyle().setShowType(ShowType.Modal);
                     StyleCss inlineStyleCss = new StyleCss();
@@ -83,12 +83,12 @@ public class UnitStBudgetApplyFormPlugin extends AbstractFormPlugin implements P
                     inlineStyleCss.setWidth("800");
                     listParameter.getOpenStyle().setInlineStyleCss(inlineStyleCss);
 
-                    QFilter qFilter = QFilterCommonHelper.getCurrentVersionFilter();
+                    QFilter qFilter = QFilter.of("1=1");
                     List<Long> ids = new ArrayList<Long>();
                     for (DynamicObject dynamicObject : corp) {
                         long corpoRateOrgId = dynamicObject.getLong(String.join(".", "corporateorg", FormConstant.ID_KEY));
                         if(corpoRateOrgId > 0) {
-                            ids.add(dynamicObject.getLong(FormConstant.ID_KEY));
+                            ids.add(corpoRateOrgId);
                         }
                     }
                     qFilter.and(FormConstant.ID_KEY,QCP.in,ids);