From f7ab9128cb0e3d565d3311c32050f5ec49b8a166 Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Wed, 19 Mar 2025 10:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmployeeInformationController.java | 2 +- .../impl/EmployeeInformationServiceImpl.java | 25 ++++++++++++++++- .../impl/EmployeeRelationServiceImpl.java | 3 ++ .../jcl/organization/util/CommonUtils.java | 8 ++++++ .../jcl/organization/util/Constants.java | 6 ++++ .../jcl/organization/util/DatabaseUtils.java | 28 +++++++++++++++++++ 6 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/Constants.java diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java index 380e7f1..46865b8 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeInformationController.java @@ -37,7 +37,7 @@ public class EmployeeInformationController { @Produces(MediaType.APPLICATION_JSON) @PostMapping("/getInformation") public Map getInformation(@RequestBody Employee employee){ - log.info("getInformation Employee：[{}]",employee); + log.error("getInformation Employee：[{}]",employee); Map actionMap = new HashMap<>(); List> resultList = employeeInformationService.getInformation(employee); actionMap.put("resultList",resultList); diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java index 1e81e05..5f10824 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java @@ -3,6 +3,7 @@ package com.weaver.seconddev.jcl.organization.service.impl; import com.google.common.collect.Lists; import com.weaver.seconddev.jcl.organization.entity.Employee; import com.weaver.seconddev.jcl.organization.service.EmployeeInformationService; +import com.weaver.seconddev.jcl.organization.util.CommonUtils; import com.weaver.seconddev.jcl.organization.util.DatabaseUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,8 +34,30 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic paramList.add(employee.getSfz_1mhf()); } - List> recordList = databaseUtils.getSqlList("LOGIC", "weaver-ebuilder-form-service",sql,paramList); + List> recordList = databaseUtils.getSqlList(sql,paramList); + if (recordList.size() > 0){ + Map userMap = recordList.get(0); + String ssbm= recordList.get(0).get("ssbm").toString(); + + String ygzt = CommonUtils.null2String(userMap.get("ygzt")); + if (ygzt.equals("5")){ + //离职 + sql = "select zhgzr,lzqbm from uf_jcl_lzxxjl where glyg=? "; + List> resignList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(userMap.get("id").toString())); + + + }else if (ygzt.equals("6")){ + //退休 + sql = "select zhgzr,txqbm from uf_jcl_txxxjl where glyg=? "; + List> retireList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(userMap.get("id").toString())); + + + } + sql = "select id,name from department where id=?"; + List> departmentList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(ssbm)); + userMap.put("departname",departmentList.get(0).get("name")); + } return recordList; } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java index 475ad2b..a1408f3 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java @@ -8,9 +8,12 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.List; import java.util.Map; +@Service public class EmployeeRelationServiceImpl implements EmployeeRelationService { private static final Logger log = LoggerFactory.getLogger(EmployeeRelationController.class); diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/CommonUtils.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/CommonUtils.java index 100a04f..8bfd43e 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/CommonUtils.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/CommonUtils.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.jcl.organization.util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; @@ -417,6 +418,13 @@ public class CommonUtils { return returnMap; } + public static List getParamList(String... strs){ + List list = Lists.newArrayList(); + for (String str:strs){ + list.add(str); + } + return list; + } } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/Constants.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/Constants.java new file mode 100644 index 0000000..572894f --- /dev/null +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/Constants.java @@ -0,0 +1,6 @@ +package com.weaver.seconddev.jcl.organization.util; + +public class Constants { + public static final String SOURCE_TYPE="LOGIC"; + public static final String GROUP_ID="weaver-ebuilder-form-service"; +} diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/DatabaseUtils.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/DatabaseUtils.java index 071c032..7151340 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/DatabaseUtils.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/util/DatabaseUtils.java @@ -305,6 +305,18 @@ public class DatabaseUtils { List> recordList = getDataSourceList(result); return recordList; } + /*** + * + * @param dataSql + * @param paramList + * @return + */ + public List> getSqlList(String dataSql,List paramList){ + List sqlParamList = querySqlParamEntity(paramList); + Map result = executeForQuery(Constants.SOURCE_TYPE, Constants.GROUP_ID, dataSql, sqlParamList); + List> recordList = getDataSourceList(result); + return recordList; + } /*** * @@ -324,5 +336,21 @@ public class DatabaseUtils { } return recordMap; } + /*** + * + * @param dataSql + * @param paramList + * @return + */ + public Map getSqlMap(String dataSql,List paramList){ + Map recordMap = new HashMap<>(); + List sqlParamList = querySqlParamEntity(paramList); + Map result = executeForQuery(Constants.SOURCE_TYPE, Constants.GROUP_ID, dataSql, sqlParamList); + List> recordList = getDataSourceList(result); + if(recordList.size() > 0){ + recordMap = recordList.get(0); + } + return recordMap; + } }