From 17fc7fba83507cf7de86a64073a7bcfa4a95aa0c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 5 Nov 2024 21:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=99=E6=96=87=20=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=B0=83=E5=8A=A8=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/CustomizeRunTimeException.java | 2 +- .../{mzg => zhewen}/util/ExceptionUtil.java | 2 +- .../{mzg => zhewen}/util/ResponseResult.java | 10 ++--- .../zhewen/cronjob/EmployeeTransferJob.java | 38 ++++++++++--------- 4 files changed, 27 insertions(+), 25 deletions(-) rename src/com/engine/{mzg => zhewen}/exception/CustomizeRunTimeException.java (92%) rename src/com/engine/{mzg => zhewen}/util/ExceptionUtil.java (92%) rename src/com/engine/{mzg => zhewen}/util/ResponseResult.java (94%) diff --git a/src/com/engine/mzg/exception/CustomizeRunTimeException.java b/src/com/engine/zhewen/exception/CustomizeRunTimeException.java similarity index 92% rename from src/com/engine/mzg/exception/CustomizeRunTimeException.java rename to src/com/engine/zhewen/exception/CustomizeRunTimeException.java index d90b798..2a019ad 100644 --- a/src/com/engine/mzg/exception/CustomizeRunTimeException.java +++ b/src/com/engine/zhewen/exception/CustomizeRunTimeException.java @@ -1,4 +1,4 @@ -package com.engine.mzg.exception; +package com.engine.zhewen.exception; /** * @Author weaver_cl diff --git a/src/com/engine/mzg/util/ExceptionUtil.java b/src/com/engine/zhewen/util/ExceptionUtil.java similarity index 92% rename from src/com/engine/mzg/util/ExceptionUtil.java rename to src/com/engine/zhewen/util/ExceptionUtil.java index 6b42f1d..a12a828 100644 --- a/src/com/engine/mzg/util/ExceptionUtil.java +++ b/src/com/engine/zhewen/util/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.engine.mzg.util; +package com.engine.zhewen.util; /** * @Author weaver_cl diff --git a/src/com/engine/mzg/util/ResponseResult.java b/src/com/engine/zhewen/util/ResponseResult.java similarity index 94% rename from src/com/engine/mzg/util/ResponseResult.java rename to src/com/engine/zhewen/util/ResponseResult.java index 305f7db..90a2d7f 100644 --- a/src/com/engine/mzg/util/ResponseResult.java +++ b/src/com/engine/zhewen/util/ResponseResult.java @@ -1,11 +1,11 @@ -package com.engine.mzg.util; +package com.engine.zhewen.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.engine.core.exception.ECException; -import com.engine.mzg.exception.CustomizeRunTimeException; +import com.engine.zhewen.exception.CustomizeRunTimeException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; @@ -50,7 +50,7 @@ public class ResponseResult { log.info("run api , param {}", t); } return getJsonString(f.apply(t)); - } catch (CustomizeRunTimeException e) { + } catch (com.engine.zhewen.exception.CustomizeRunTimeException e) { log.error("api run fail", e); return Error(e.getMessage()); } catch (ECException e) { @@ -72,7 +72,7 @@ public class ResponseResult { log.info("run api , param {}", t); } return Ok(f.apply(t)); - } catch (CustomizeRunTimeException e) { + } catch (com.engine.zhewen.exception.CustomizeRunTimeException e) { log.error("api run fail", e); return Error(e.getMessage()); } catch (ECException e) { @@ -95,7 +95,7 @@ public class ResponseResult { } f.accept(t); return Ok(); - } catch (CustomizeRunTimeException e) { + } catch (com.engine.zhewen.exception.CustomizeRunTimeException e) { log.error("api run fail", e); return Error(e.getMessage()); } catch (ECException e) { diff --git a/src/weaver/interfaces/zhewen/cronjob/EmployeeTransferJob.java b/src/weaver/interfaces/zhewen/cronjob/EmployeeTransferJob.java index 5c12e6f..b5d4576 100644 --- a/src/weaver/interfaces/zhewen/cronjob/EmployeeTransferJob.java +++ b/src/weaver/interfaces/zhewen/cronjob/EmployeeTransferJob.java @@ -202,25 +202,27 @@ public class EmployeeTransferJob extends BaseCronJob { rst.writeLog("xkqz222==" + xkqz); - KQGroupMemberComInfo kqGroupMemberComInfo = new KQGroupMemberComInfo(); - String kqGroupId = kqGroupMemberComInfo.getKQGroupId(ddr); - rst.writeLog("kqGroupId===" + kqGroupId); - if (!kqGroupId.equals(xkqz)) { - // 更新“调动人”的【考勤组】为：新考勤组； - // 更新“调动人”的新考勤组中的“生效日期”=调动生效日期； - // 更新“调动人”的原考勤组中的“失效日期”=调动生效日期 - 1天； - String sql = "insert into kq_groupmember(groupid,typevalue,type,seclevel,seclevelto,validatefrom,validateto) values(?,?,1,0,100,?,'2999-12-31')"; - rst.executeUpdate(sql, xkqz, ddr, ddsxrq); - // 如果生效日期小于失效日期，将生效日期也改为失效日期 - rst.executeQuery("select * from kq_groupmember where type = 1 and ISNULL(isDelete,0) != 1 and typevalue = ? and groupid = ?", ddr, kqGroupId); - if(rst.next()){ - String validatefrom = rst.getString("validatefrom"); - } + if (StringUtils.isNotBlank(xkqz)) { + KQGroupMemberComInfo kqGroupMemberComInfo = new KQGroupMemberComInfo(); + String kqGroupId = kqGroupMemberComInfo.getKQGroupId(ddr); + rst.writeLog("kqGroupId===" + kqGroupId); + if (!kqGroupId.equals(xkqz)) { + // 更新“调动人”的【考勤组】为：新考勤组； + // 更新“调动人”的新考勤组中的“生效日期”=调动生效日期； + // 更新“调动人”的原考勤组中的“失效日期”=调动生效日期 - 1天； + String sql = "insert into kq_groupmember(groupid,typevalue,type,seclevel,seclevelto,validatefrom,validateto) values(?,?,1,0,100,?,'2999-12-31')"; + rst.executeUpdate(sql, xkqz, ddr, ddsxrq); + // 如果生效日期小于失效日期，将生效日期也改为失效日期 + rst.executeQuery("select * from kq_groupmember where type = 1 and ISNULL(isDelete,0) != 1 and typevalue = ? and groupid = ?", ddr, kqGroupId); + //if (rst.next()) { + // String validatefrom = rst.getString("validatefrom"); + //} - sql = "update kq_groupmember set validateto = ? where type = 1 and ISNULL(isDelete,0) != 1 and typevalue = ? and groupid = ?"; - String yesterday = DateUtil.addDate(ddsxrq, -1); - rst.writeLog("yesterday===" + yesterday); - rst.executeUpdate(sql, yesterday, ddr, kqGroupId); + sql = "update kq_groupmember set validateto = ? where type = 1 and ISNULL(isDelete,0) != 1 and typevalue = ? and groupid = ?"; + String yesterday = DateUtil.addDate(ddsxrq, -1); + rst.writeLog("yesterday===" + yesterday); + rst.executeUpdate(sql, yesterday, ddr, kqGroupId); + } } rst.writeLog("updateEmployeeGroup---finish");