代码优化

jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeRelationController.java

@@ -3,6 +3,7 @@ package com.weaver.seconddev.jcl.organization.controller;
 import com.weaver.common.authority.annotation.WeaPermission;
 import com.weaver.common.base.entity.result.WeaResult;
 import com.weaver.ebuilder.form.client.entity.field.ModuleField;
+import com.weaver.framework.rpc.annotation.RpcReference;
 import com.weaver.seconddev.jcl.common.service.CommonService;
 import com.weaver.seconddev.jcl.organization.service.EmployeeRelationService;
 import com.weaver.seconddev.jcl.organization.util.RecruitModuleUtils;
@@ -34,6 +35,8 @@ public class EmployeeRelationController {
     private EmployeeRelationService employeeRelationService;
     @Autowired
     private CommonService commonService;
+    @RpcReference
+    HrRemoteApiService  hrRemoteApiService;
 
     /**
      * 员工管理-根据姓名+手机号/姓名+邮箱/身份证号判断是否黑名单
@@ -398,36 +401,48 @@ public class EmployeeRelationController {
         return personYdzqMonthList;
     }
 
+    /**
+     * 根据数据源名称获得该数据源下所有数据
+     * @return
+     */
+    @GetMapping("/getUserDatasBySourceName")
+    @WeaPermission(publicPermission = true)
+    public List<Map<String, Object>>  getUserDatasBySourceName(){
+        List<Map<String, Object>> personYdzqMonthList = commonService.getListDatasBySourceName("人员编制统计数据","LOGIC","weaver-hr-service");
+        log.error("getListDatasBySourceName.personYdzqMonthList:{}",personYdzqMonthList);
+        return personYdzqMonthList;
+    }
+
     /**
      * 部门编制数查询
      */
-//    @GetMapping("/getPreparationsByBm")
-//    @WeaPermission(publicPermission = true)
-//    public List<Map<String, Object>>  getPreparationsByBm(@RequestParam("deptId") String deptId){
-//        log.error("getPreparationsByBm.deptId:{}", deptId);
-//        log.error("getPreparationsByBm.hrRemoteApiService:{}", hrRemoteApiService);
-//        log.error("getPreparationsByBm.tenant_key:{}", tenant_key);
-//        List<Map<String, Object>> list = new ArrayList<>();
-//        HrComEstCfgInfoParam hrComEstCfgInfoParam = new HrComEstCfgInfoParam();
-//        hrComEstCfgInfoParam.setFindLatestParent(false);
-//        hrComEstCfgInfoParam.setOrgId(Long.parseLong(deptId));
-//        log.error("getPreparationsByBm.hrComEstCfgInfoParam:{}", hrComEstCfgInfoParam);
-//        long employeeId  = Long.parseLong("1167276462243069953");
-//        WeaResult<HrComEstCfgInfoDto> estCfgInfo = hrRemoteApiService.getEstCfgInfo(tenant_key, employeeId, hrComEstCfgInfoParam);
-//        log.error("getPreparationsByBm.estCfgInfo:{}", estCfgInfo);
-//        HrComEstCfgInfoDto data =  new HrComEstCfgInfoDto();
-//        if (estCfgInfo != null && estCfgInfo.isStatus()) {
-//            data = estCfgInfo.getData();
-//        }
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("data",data);
-//        map.put("deptId",deptId);
-//        map.put("hrRemoteApiService",hrRemoteApiService);
-//        map.put("tenant_key",tenant_key);
-//        map.put("hrComEstCfgInfoParam",hrComEstCfgInfoParam);
-//        map.put("estCfgInfo",estCfgInfo);
-//        list.add(map);
-//        log.error("getPreparationsByBm.HrComEstCfgInfoDto:{}",data);
-//        return list;
-//    }
+    @GetMapping("/getPreparationsByBm")
+    @WeaPermission(publicPermission = true)
+    public List<Map<String, Object>>  getPreparationsByBm(@RequestParam("deptId") String deptId){
+        log.error("getPreparationsByBm.deptId:{}", deptId);
+        log.error("getPreparationsByBm.hrRemoteApiService:{}", hrRemoteApiService);
+        log.error("getPreparationsByBm.tenant_key:{}", tenant_key);
+        List<Map<String, Object>> list = new ArrayList<>();
+        HrComEstCfgInfoParam hrComEstCfgInfoParam = new HrComEstCfgInfoParam();
+        hrComEstCfgInfoParam.setFindLatestParent(false);
+        hrComEstCfgInfoParam.setOrgId(Long.parseLong(deptId));
+        log.error("getPreparationsByBm.hrComEstCfgInfoParam:{}", hrComEstCfgInfoParam);
+        long employeeId  = Long.parseLong("1167276462243069953");
+        WeaResult<HrComEstCfgInfoDto> estCfgInfo = hrRemoteApiService.getEstCfgInfo(tenant_key, employeeId, hrComEstCfgInfoParam);
+        log.error("getPreparationsByBm.estCfgInfo:{}", estCfgInfo);
+        HrComEstCfgInfoDto data =  new HrComEstCfgInfoDto();
+        if (estCfgInfo != null && estCfgInfo.isStatus()) {
+            data = estCfgInfo.getData();
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("data",data);
+        map.put("deptId",deptId);
+        map.put("hrRemoteApiService",hrRemoteApiService);
+        map.put("tenant_key",tenant_key);
+        map.put("hrComEstCfgInfoParam",hrComEstCfgInfoParam);
+        map.put("estCfgInfo",estCfgInfo);
+        list.add(map);
+        log.error("getPreparationsByBm.HrComEstCfgInfoDto:{}",data);
+        return list;
+    }
 }

jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncOrganizationPersonInfo.java

@@ -178,7 +178,7 @@ public class SyncOrganizationPersonInfo implements EsbServerlessRpcRemoteInterfa
             String databaseId = DatabaseUtil.getDatabaseId();
             if(databaseId.equalsIgnoreCase("sqlserver")){
                 listOfEmployees = getTableColumnsOfTableNameBySqlServer();
-                log.error("SyncOrganizationPersonInfo.listOfEmployees:{}", listOfEmployees);
+                log.error("SyncOrganizationPersonInfo.sqlserver.listOfEmployees:{}", listOfEmployees);
             }else {
                 listOfEmployee = getTableColumnsOfTableName("employee");
                 log.error("SyncOrganizationPersonInfo.listOfEmployee:{}", listOfEmployee);
@@ -336,7 +336,13 @@ public class SyncOrganizationPersonInfo implements EsbServerlessRpcRemoteInterfa
                 }
             }
             //增加必填字段
-            userInfo_new.put("USER", getIgnoreCase(employee_info, "id"));
+            if(databaseId.equalsIgnoreCase("sqlserver")){
+                log.error("SyncOrganizationPersonInfo.sqlserver.USER:{}","111");
+                userInfo_new.put("[USER]", getIgnoreCase(employee_info, "id"));
+            }else{
+                log.error("SyncOrganizationPersonInfo.Other.USER:{}","111");
+                userInfo_new.put("USER", getIgnoreCase(employee_info, "id"));
+            }
             // 生成随机 ID
             long formuserdataid = IdGenerator.generate();
             userInfo_new.put("FORM_DATA",formuserdataid);

jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/cbd/SyncDepartmentChanges.java

@@ -499,6 +499,14 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
             String bmsqcj = null!=map.get("bmsqcj")? map.get("bmsqcj") :"";
             String bz = null!=map.get("bz")? map.get("bz") :"";
             String zzmc = null!=map.get("zzmc")? map.get("zzmc") :"";
+            //2025/09/23 新增字段
+            String zzsx = null!=map.get("zzsx")? map.get("zzsx") :"";
+            String hrbp = null!=map.get("hrbp")? map.get("hrbp") :"";
+            String frgs = null!=map.get("frgs")? map.get("frgs") :"";
+            //根据人员id查询人员工号
+            String job_num1 = queryJobNumById(bmfzr);
+            String job_num2 = queryJobNumById(fgld);
+            String job_num3 = queryJobNumById(hrbp);
             //新增临时上级部门编号
             String sjzzidls = "1147262691928662018";
             //根据id查询部门code
@@ -559,10 +567,10 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
                     if(b){
                         //修改部门信息
                         String formData = getDeptFormData(bh);
-                        updatatDeptCustomField(tableName, formData, bmfzr, fgld, sscb, bmsqcj);
+                        updatatDeptCustomField(tableName, formData, bmfzr, fgld, sscb, bmsqcj,zzsx,hrbp,frgs,job_num1,job_num2,job_num3);
                     }else{
                         //给部门自定义表插入入参信息
-                        insertDeptCustomField(tableName,bh,bmfzr,fgld,sscb,bmsqcj,form_id,layout_id);
+                        insertDeptCustomField(tableName,bh,bmfzr,fgld,sscb,bmsqcj,zzsx,hrbp,frgs,job_num1,job_num2,job_num3,form_id,layout_id);
                     }
                 }else{
                     result.put("status2","fail");
@@ -625,6 +633,14 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
             String bmsqcj = null!=map.get("bmsqcj")? map.get("bmsqcj") :"";
             String bz = null!=map.get("bz")? map.get("bz") :"";
             String zzmc = null!=map.get("zzmc")? map.get("zzmc") :"";
+            //2025/09/23 新增字段
+            String zzsx = null!=map.get("zzsx")? map.get("zzsx") :"";
+            String hrbp = null!=map.get("hrbp")? map.get("hrbp") :"";
+            String frgs = null!=map.get("frgs")? map.get("frgs") :"";
+            //根据人员id查询人员工号
+            String job_num1 = queryJobNumById(bmfzr);
+            String job_num2 = queryJobNumById(fgld);
+            String job_num3 = queryJobNumById(hrbp);
 
             /**
              * 3.组装数据
@@ -681,10 +697,10 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
                     if(b){
                         //修改部门信息
                         String formData = getDeptFormData(bh);
-                        updatatDeptCustomField(tableName, formData, bmfzr, fgld, sscb, bmsqcj);
+                        updatatDeptCustomField(tableName, formData, bmfzr, fgld, sscb, bmsqcj,zzsx,hrbp,frgs,job_num1,job_num2,job_num3);
                     }else{
                         //给部门自定义表插入入参信息
-                        insertDeptCustomField(tableName,bh,bmfzr,fgld,sscb,bmsqcj,form_id,layout_id);
+                        insertDeptCustomField(tableName,bh,bmfzr,fgld,sscb,bmsqcj,zzsx,hrbp,frgs,job_num1,job_num2,job_num3,form_id,layout_id);
                     }
                 } else {
                     result.put("status2", "fail");
@@ -806,7 +822,7 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
      * 写入部门自定义表
      * @return
      */
-    public void insertDeptCustomField(String tableName,String code,String bmfzr,String fgld,String cbzx,String sqcj,String form_id,String layout_id){
+    public void insertDeptCustomField(String tableName,String code,String bmfzr,String fgld,String cbzx,String sqcj,String zzsx,String hrbp,String frgs,String job_num1,String job_num2,String job_num3,String form_id,String layout_id){
         // 生成随机 ID
         long id = IdGenerator.generate();
         log.error("insertDeptCustomField.id:{}", id);
@@ -830,9 +846,9 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
         log.error("insertDeptCustomField.userId:{}", userId);
         String tableNameNew = "eteams."+tableName;
         String sql="insert into "+tableNameNew+"(ID, FORM_DATA_ID, DATA_INDEX, CREATE_TIME, UPDATE_TIME, TENANT_KEY, " +
-                " IS_DELETE, CREATOR, UPDATER, DELETE_TYPE, FT_STATUS, bmfzr,fgld,cbzx,sqcj)" +
+                " IS_DELETE, CREATOR, UPDATER, DELETE_TYPE, FT_STATUS, bmfzr,fgld,cbzx,sqcj,zzsx,hrbp,frgs,bmfzrgh,bmfgldgh,hrbgh)" +
                 " values('" + id + "','" + id + "','0','"+nowData+"','" + nowData + "','" + tenant_key + "','0'," +
-                " '"+userId+"','"+userId+"','0','0','" + bmfzr + "','" + fgld + "','" + cbzx + "','" + sqcj + "')";
+                " '"+userId+"','"+userId+"','0','0','" + bmfzr + "','" + fgld + "','" + cbzx + "','" + sqcj + "','" + zzsx + "','" + hrbp + "','" + frgs + "','" + job_num1 + "','" + job_num2 + "','" + job_num3 + "')";
         log.error("insertDeptCustomField.sql:{}", sql);
         Map<String, Object> rs = databaseUtils.execute("LOGIC", "weaver-ebuilder-form-service", sql);
         List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(rs);
@@ -863,9 +879,9 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
      * 修改部门自定义表
      * @return
      */
-    public void updatatDeptCustomField(String tableName,String deptFormData,String bmfzr,String fgld,String cbzx,String sqcj){
+    public void updatatDeptCustomField(String tableName,String deptFormData,String bmfzr,String fgld,String cbzx,String sqcj,String zzsx,String hrbp,String frgs,String job_num1,String job_num2,String job_num3){
         String tableNameNew = "eteams."+tableName;
-        String sql="update "+tableNameNew+" set bmfzr = '"+bmfzr+"',fgld = '"+fgld+"',cbzx='"+cbzx+"',sqcj='"+sqcj+"'" +
+        String sql="update "+tableNameNew+" set bmfzr = '"+bmfzr+"',fgld = '"+fgld+"',cbzx='"+cbzx+"',sqcj='"+sqcj+"',zzsx='"+zzsx+"',hrbp='"+hrbp+"',frgs='"+frgs+"',bmfzrgh='"+job_num1+"',bmfgldgh='"+job_num2+"',hrbgh='"+job_num3+"'" +
                 " where FORM_DATA_ID = '"+deptFormData+"'  ";
         log.error("updatatDeptCustomField.sql:{}", sql);
         Map<String, Object> rs = databaseUtils.execute("LOGIC", "weaver-ebuilder-form-service", sql);
@@ -873,6 +889,24 @@ public class SyncDepartmentChanges implements EsbServerlessRpcRemoteInterface {
         log.error("updatatDeptCustomField.recordList:{}", recordList);
     }
 
+    /**
+     * 根据人员id查询人员工号：job_num
+     * @return
+     */
+    public String queryJobNumById(String id){
+        String job_num = "";
+        log.error("queryJobNumById.code:{}", id);
+        String sql = "select job_num from eteams.employee where id = '"+ id +"' and tenant_key = '"+RecruitModuleUtils.getCurrentTenantKey()+"'  ";
+        log.error("queryJobNumById.sql:{}", sql);
+        Map<String, Object> rs = databaseUtils.execute("LOGIC", "weaver-ebuilder-form-service", sql);
+        List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(rs);
+        log.error("queryJobNumById.recordList:{}", recordList);
+        if(CollectionUtils.isNotEmpty(recordList)){
+            job_num = String.valueOf(recordList.get(0).get("job_num"));
+        }
+        return job_num;
+    }
+
     /**
      * 根据部门code查询是否存在此部门
      * @return