From 46068ab0088f78fe2f360e79ea45a0cc0a74295f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 13 Oct 2022 13:59:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=88=B6Action=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8CBUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/extend/ExtendInfoMapper.xml | 1 - .../action/StaffChangeAction.java | 30 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index bdda6483..cbc8cd91 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -351,7 +351,6 @@ field_name_desc=#{fieldNameDesc}, isenable=#{isenable}, isrequired=#{isrequired}, - edit_show=#{editShow}, show_order=#{showOrder}, custom_value=#{customValue}, diff --git a/src/weaver/interfaces/organization/action/StaffChangeAction.java b/src/weaver/interfaces/organization/action/StaffChangeAction.java index 742d98b9..a181ed8f 100644 --- a/src/weaver/interfaces/organization/action/StaffChangeAction.java +++ b/src/weaver/interfaces/organization/action/StaffChangeAction.java @@ -40,7 +40,8 @@ public class StaffChangeAction implements Action { @Override public String execute(RequestInfo requestInfo) { if (StringUtils.isBlank(changeType)) { - return "编制调整失败，未配置对应调整方式"; + requestInfo.getRequestManager().setMessagecontent("编制调整失败，未配置对应调整方式!"); + return FAILURE_AND_CONTINUE; } Integer requestId = Integer.parseInt(requestInfo.getRequestid()); @@ -53,9 +54,9 @@ public class StaffChangeAction implements Action { MainTableInfo mainTableInfo = requestInfo.getMainTableInfo(); Property[] property = mainTableInfo.getProperty(); // 取表单数据赋值 - for (int i = 0; i < property.length; i++) { - String name = property[i].getName(); - String value = Util.null2String(property[i].getValue()); + for (Property item : property) { + String name = item.getName(); + String value = Util.null2String(item.getValue()); if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(value)) { switch (name) { case "fb": // 分部 @@ -77,10 +78,12 @@ public class StaffChangeAction implements Action { } if (null == changeNum) { - return "编制变动数必填"; + requestInfo.getRequestManager().setMessagecontent("编制变动数必填!"); + return FAILURE_AND_CONTINUE; } if (changeNum < 0) { - return "编制变动数需大于0"; + requestInfo.getRequestManager().setMessagecontent("编制变动数需大于0!"); + return FAILURE_AND_CONTINUE; } // 根据分部、部门、岗位 定位具体编制信息，按照更新时间倒序，取最新的一条数据 @@ -93,32 +96,37 @@ public class StaffChangeAction implements Action { switch (changeType) { case "3":// 冻结，比如招聘中，面试中，入职办理中等 if (staffPO.getFreezeNum() + changeNum > staffNum) { - return "冻结数不能大于编制数"; + requestInfo.getRequestManager().setMessagecontent("冻结数不能大于编制数!"); + return FAILURE_AND_CONTINUE; } // 设置冻结数 staffPO.setFreezeNum(staffPO.getFreezeNum() + changeNum); break; case "4":// 冻结释放，比如面试不通过，offer不接受等 if (changeNum > staffPO.getFreezeNum()) { - return "调整不能大于冻结数"; + requestInfo.getRequestManager().setMessagecontent("冻结释放数不能大于冻结数!"); + return FAILURE_AND_CONTINUE; } staffPO.setFreezeNum(staffPO.getFreezeNum() - changeNum); break; case "5":// 扣减，比如正式入职，调入等 staffPO.setPermanentNum(staffPO.getPermanentNum() + changeNum); if (staffPO.getPermanentNum() > staffPO.getStaffNum()) { - return "在编数不能大于编制数"; + requestInfo.getRequestManager().setMessagecontent("在编数不能大于编制数!"); + return FAILURE_AND_CONTINUE; } break; case "6":// 减员释放，比如离职、调出等 staffPO.setPermanentNum(staffPO.getPermanentNum() - changeNum); if (staffPO.getPermanentNum() < 0) { - return "调整数量不可大于在编数"; + requestInfo.getRequestManager().setMessagecontent("调整数量不可大于在编数!"); + return FAILURE_AND_CONTINUE; } break; case "1":// 编制 case "2":// 变更 default: + requestInfo.getRequestManager().setMessagecontent("流程操作事件changeType配置错误,请联系管理员!"); return FAILURE_AND_CONTINUE; } @@ -142,7 +150,7 @@ public class StaffChangeAction implements Action { // new Thread(new StaffTriggerRunnable(staffPO)).start(); return SUCCESS; } - + requestInfo.getRequestManager().setMessagecontent("未找到对应维度的编制信息!"); return FAILURE_AND_CONTINUE; }