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/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);
}
diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java
index 81e5f445..3443f930 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);
@@ -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");
@@ -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));
@@ -265,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);