From de1d4a894408ef1f1f2dbd5834613f276278f1a4 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 23 Jun 2022 14:29:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/staff/param/StaffSearchParam.java | 5 +++++ src/com/engine/organization/entity/staff/po/StaffsPO.java | 5 +++++ src/com/engine/organization/mapper/staff/StaffsMapper.xml | 6 ++++++ .../engine/organization/service/impl/StaffServiceImpl.java | 5 ++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java index 95773df5..49fb0f68 100644 --- a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java @@ -75,4 +75,9 @@ public class StaffSearchParam { * 调整数量 */ private Integer changeNum; + + /** + * 调整说明 + */ + private String changeDescription; } diff --git a/src/com/engine/organization/entity/staff/po/StaffsPO.java b/src/com/engine/organization/entity/staff/po/StaffsPO.java index a68211ad..d424a5c4 100644 --- a/src/com/engine/organization/entity/staff/po/StaffsPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffsPO.java @@ -43,6 +43,11 @@ public class StaffsPO { */ private Integer requestId; + /** + * 调整说明 + */ + private String description; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/mapper/staff/StaffsMapper.xml b/src/com/engine/organization/mapper/staff/StaffsMapper.xml index 11695407..7460adb2 100644 --- a/src/com/engine/organization/mapper/staff/StaffsMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffsMapper.xml @@ -59,6 +59,9 @@ requestid, + + description, + @@ -89,6 +92,9 @@ #{requestId}, + + #{description}, + diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 81e5f445..735b8cd4 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -102,7 +102,7 @@ public class StaffServiceImpl extends Service implements StaffService { } else { // 插入明细表数据 - StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(1).build(); + StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(1).description(param.getChangeDescription()).build(); MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO); // 更新编制表 staffPO.setStaffNum(staffPO.getStaffNum() + changeNum); @@ -252,6 +252,9 @@ public class StaffServiceImpl extends Service implements StaffService { SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum"); staffNumItem.setRules("required"); selectItems.add(changeNumItem); + SearchConditionItem changeDescriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "变更说明", "changeDescription"); + selectItems.add(changeDescriptionItem); + } addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); From e4dc4704ceecb24411b5dc511ee8c547242263c4 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 23 Jun 2022 15:42:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/StaffServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 735b8cd4..3443f930 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -178,7 +178,7 @@ public class StaffServiceImpl extends Service implements StaffService { List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "方案", "161", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 4, false, "方案", "161", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); // 分部 SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "分部", "161", "compId", "compBrowser"); @@ -268,8 +268,10 @@ public class StaffServiceImpl extends Service implements StaffService { List addGroups = new ArrayList<>(); List selectItems = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "编制方案", "161", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 3, false, "编制方案", "161", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); + planIdItem.setHelpfulTip("请选择编制方案后查看数据"); + planIdItem.setLabelcol(2); selectItems.add(planIdItem); addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); datas.put("condition", addGroups); From a2c768d0ab2407b2ccc24aa661e9294dfd179c87 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 23 Jun 2022 15:42:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/CompServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index a52b7331..5157e65f 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -141,7 +141,7 @@ public class CompServiceImpl extends Service implements CompService { // 判断是否开启自动编号 compNo = repeatDetermine(compNo); params.put("comp_no", compNo); - if (StringUtils.isBlank((String) params.get("show_order"))) { + if (StringUtils.isBlank(params.get("show_order").toString())) { int maxShowOrder = getCompMapper().getMaxShowOrder(); params.put("show_order", maxShowOrder + 1); }