From b572bc4d48c76de6b79cfe87c9bb1c21275ee92b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 10 Oct 2024 16:38:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86Delete=5Ftype=3D1=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cronjob/TableDeleteDataCron.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java diff --git a/src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java b/src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java new file mode 100644 index 00000000..361589f0 --- /dev/null +++ b/src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java @@ -0,0 +1,34 @@ +package weaver.interfaces.organization.cronjob; + +import weaver.conn.RecordSet; +import weaver.interfaces.schedule.BaseCronJob; + +/** + * @Author liang.cheng + * @Date 2024/10/10 1:56 PM + * @Description: 定时清除组织管理Delete_type=1的数据 + * @Version 1.0 + */ +public class TableDeleteDataCron extends BaseCronJob { + + @Override + public void execute() { + RecordSet rs = new RecordSet(); + + rs.execute("delete from jcl_org_scheme where delete_type = 1"); + rs.execute("delete from jcl_org_level where delete_type = 1"); + rs.execute("delete from jcl_org_grade where delete_type = 1"); + rs.execute("delete from jcl_org_sequence where delete_type = 1"); + rs.execute("delete from jcl_org_staffplan where delete_type = 1"); + rs.execute("delete from jcl_org_staff where delete_type = 1"); + rs.execute("delete from jcl_org_job where delete_type = 1"); + rs.execute("delete from jcl_org_jobext where delete_type = 1"); + rs.execute("delete from jcl_org_jobext_dt1 where delete_type = 1"); + rs.execute("delete from jcl_org_detach where delete_type = 1"); + rs.execute("delete from jcl_org_cardaccess where delete_type = 1"); + rs.execute("delete from jcl_org_cardbutton where delete_type = 1"); + rs.execute("delete from jcl_field_extendgroup where delete_type = 1"); + rs.execute("delete from jcl_field_extendtitle where delete_type = 1"); + rs.execute("delete from jcl_field_extendinfo where delete_type = 1"); + } +} From ea5809ac15b3b941a8566be61219b19d40ab5498 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 15 Oct 2024 16:08:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3esb=E7=BC=BA=E5=B0=91UESE=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0sysadmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FunctionOutStaffServiceImpl.java | 3 +-- .../engine/organization/web/StaffOutController.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index 20e172e7..778c25bb 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl { OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage())); } - List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum()); + List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum()); //1.增加冻结数 （num为负数时为减少冻结数） Integer sum = numberF.stream() .mapToInt(Integer::intValue) @@ -233,7 +233,6 @@ public class FunctionOutStaffServiceImpl { bb.writeLog("编制参数"+ JSON.toJSONString(param)); bb.writeLog("查询结果"+ JSON.toJSONString(staffPO)); bb.writeLog("user对象"+JSON.toJSONString(user)); - bb.writeLog("msg"+SystemEnv.getHtmlLabelName(547474,user.getLanguage())); OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage())); return staffPO.get(0); } diff --git a/src/com/engine/organization/web/StaffOutController.java b/src/com/engine/organization/web/StaffOutController.java index fe83f92a..53dde409 100644 --- a/src/com/engine/organization/web/StaffOutController.java +++ b/src/com/engine/organization/web/StaffOutController.java @@ -36,6 +36,11 @@ public class StaffOutController { public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); + //ESB接口user对象是null + if (user == null) { + user = new User(); + user.setUid(1); + } return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); @@ -48,6 +53,11 @@ public class StaffOutController { public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); + //ESB接口user对象是null + if (user == null) { + user = new User(); + user.setUid(1); + } return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); From 4d2e8a8035e6626a81dd254f61d88ea58bb9ef88 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 21 Oct 2024 10:06:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4=E6=80=A7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cronjob/DeleteIsCancelJobCrob.java | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java diff --git a/src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java b/src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java new file mode 100644 index 00000000..c9268854 --- /dev/null +++ b/src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java @@ -0,0 +1,65 @@ +package weaver.interfaces.organization.cronjob; + +import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.collections.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.interfaces.schedule.BaseCronJob; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author liang.cheng + * @Date 2024/10/18 11:25 AM + * @Description: 自动清除已失效的岗位 （执行前请注意编制的引用，会出现名称为空） + * @Version 1.0 + */ +public class DeleteIsCancelJobCrob extends BaseCronJob { + + @Override + public void execute() { + + RecordSet rs = new RecordSet(); + + List jobList = new ArrayList<>(); + rs.executeQuery("select id,ec_jobtitle,ec_department from jcl_org_job where delete_type = 0"); + while (rs.next()) { + jobList.add(JobPO.builder() + .id((long)Util.getIntValue(rs.getString("id"))) + .ecJobTitle(Util.getIntValue(rs.getString("ec_jobtitle"))) + .ecDepartment(Util.getIntValue(rs.getString("ec_department"))) + .build()); + } + + + + List deleteIds = new ArrayList<>(); + + jobList.forEach(job -> { + + //1.岗位是否封存或删除 + rs.executeQuery("select id from hrmjobtitles where id = ? and (canceled is null or canceled != 1)",job.getEcJobTitle()); + if (!rs.next()) { + deleteIds.add(job.getId()); + return; + } + + //2.部门是否封存或删除 + rs.executeQuery("select id from hrmdepartment where id = ? and (canceled is null or canceled != 1)",job.getEcDepartment()); + if (!rs.next()) { + deleteIds.add(job.getId()); + } + + }); + + if (CollectionUtils.isNotEmpty(deleteIds)) { + MapperProxyFactory.getProxy(JobMapper.class).deleteByIds(deleteIds); + } + + + + } +}