From effe884851169d385b8178f2f6fa196176f3671c Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Mon, 31 Mar 2025 13:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcl/common/service/impl/CommonServiceImpl.java | 6 +++--- .../controller/EmployeeInformationController.java | 5 ++--- .../seconddev/jcl/organization/entity/PendingEmployee.java | 2 ++ .../service/impl/EmployeeInformationServiceImpl.java | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java index af6f39a..6d13e62 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java @@ -33,7 +33,7 @@ public class CommonServiceImpl implements CommonService { for (Map.Entry e : condition.entrySet()){ updateSql = updateSql + " and "+ e.getKey()+"='"+e.getValue()+"'"; } - log.info("makeUpdateSql : [{}]",updateSql); + log.error("makeUpdateSql : [{}]",updateSql); return databaseUtils.execute(updateSql); } @@ -57,8 +57,8 @@ public class CommonServiceImpl implements CommonService { key = key.substring(0,key.length()-1) + ")"; value = value.substring(0,value.length()-1)+")"; insertSql = insertSql + key +" values "+value; - log.debug("makeInsertSql : [{}]",insertSql); - log.debug("needInsertDate: [{}]",dataList); + log.error("makeInsertSql : [{}]",insertSql); + log.error("needInsertDate: [{}]",dataList); return databaseUtils.execute(insertSql,dataList); } } 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 e4678e3..aead1dd 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 @@ -67,12 +67,11 @@ public class EmployeeInformationController { */ @WeaPermission(publicPermission = true) @Produces(MediaType.APPLICATION_JSON) - @PostMapping("/getPendingEmployment") + @PostMapping("/updatePendingEmploy") public Map updatePendingEmploy(@RequestBody PendingEmployee employee){ log.error("getInformation Employee：[{}]",employee); Map actionMap = new HashMap<>(); - //List> resultList = employeeInformationService.getPendingEmployment(employee); - // actionMap.put("resultList",resultList); + employeeInformationService.updatePendingEmploy(employee); return actionMap; } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/entity/PendingEmployee.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/entity/PendingEmployee.java index 4c5cd2f..ccbd97b 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/entity/PendingEmployee.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/entity/PendingEmployee.java @@ -18,4 +18,6 @@ public class PendingEmployee { private String id; private String glyg; + + private String rzzt; } 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 ebae137..c92fc19 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 @@ -56,7 +56,7 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic String ygzt = CommonUtils.null2String(userMap.get("personnel_status")); if (ygzt.equals("5")){ //离职 - sql = "select zhgzr,lzqbm from uf_jcl_lzxxjl where glyg=? and (delete_type is null or delete_type=false) "; + sql = "select zhgzr,lzqbm from uf_jcl_lzxxjl where glyg=? and (delete_type is null or delete_type<>'1') "; List> resignList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(userMap.get("id").toString())); if (resignList.size() > 0){ userMap.put("zhgzr",resignList.get(0).get("zhgzr")); @@ -64,7 +64,7 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic ssbm = CommonUtils.null2String(resignList.get(0).get("lzqbm")); }else if (ygzt.equals("6")){ //退休 - sql = "select zhgzr,txqbm from uf_jcl_txxxjl where glyg=? and (delete_type is null or delete_type=false) "; + sql = "select zhgzr,txqbm from uf_jcl_txxxjl where glyg=? and (delete_type is null or delete_type<>'1') "; List> retireList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(userMap.get("id").toString())); if (retireList.size() > 0){ userMap.put("zhgzr",retireList.get(0).get("zhgzr")); @@ -85,7 +85,7 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic @Override public List> getPendingEmployment(Employee employee) { - String sql = "select * from uf_jcl_rzgl where (delete_type is null or delete_type=false) and ("; + String sql = "select * from uf_jcl_rzgl where (delete_type is null or delete_type<>'1') and ("; List paramList = Lists.newArrayList(); if (employee.getMobile() != null && !"".equals(employee.getMobile())){