liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!116 组织人事测试、优化 

Merge pull request !116 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-23 07:43:05 +00:00 committed by Gitee
parent 68a7895930 a2c768d0ab
commit 0fcf30e28a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/organization/entity/staff/param/StaffSearchParam.java
View File

@ -75,4 +75,9 @@ public class StaffSearchParam {
* 调整数量
*/
private Integer changeNum;
/**
* 调整说明
*/
private String changeDescription;
}

5
src/com/engine/organization/entity/staff/po/StaffsPO.java
View File

@ -43,6 +43,11 @@ public class StaffsPO {
*/
private Integer requestId;
/**
* 调整说明
*/
private String description;
private Long creator;
private int deleteType;
private Date createTime;

6
src/com/engine/organization/mapper/staff/StaffsMapper.xml
View File

@ -59,6 +59,9 @@
<if test="requestId != null ">
requestid,
</if>
<if test="description != null ">
description,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="creator != null">
@ -89,6 +92,9 @@
<if test="requestId != null ">
#{requestId},
</if>
<if test="description != null ">
#{description},
</if>
</trim>
</insert>

2
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -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);
}

11
src/com/engine/organization/service/impl/StaffServiceImpl.java
View File

@ -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<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> 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<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> 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);