diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 9205e0da..4e21ea91 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -173,7 +173,7 @@ public class StaffServiceImpl extends Service implements StaffService { jobIdItem.setRules("required|string"); // 编制数 SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "编制数", "staffNum"); - staffNumItem.setRules("required|int"); + staffNumItem.setRules("required"); // 控制策略 List selectOptions = new ArrayList<>(); SearchConditionOption option1 = new SearchConditionOption("1", "弱控"); diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index 3c50bc77..042c53fc 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -1,5 +1,13 @@ package com.engine.organization.transmethod; +import com.engine.organization.entity.DeleteParam; +import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.util.db.MapperProxyFactory; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * @description: TODO * @author:dxfeng @@ -9,18 +17,18 @@ package com.engine.organization.transmethod; public class JobTransMethod { public static String getSpanById(String planId) { - //JobMapper compMapper = MapperProxyFactory.getProxy(CompMapper.class); - //List> maps = compMapper.listCompsByIds(DeleteParam.builder().ids(planId).build().getIds()); - //String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); - //return names; - return ""; + JobMapper jobMapper = MapperProxyFactory.getProxy(JobMapper.class); + List> maps = jobMapper.listJobsByIds(DeleteParam.builder().ids(planId).build().getIds()); + String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); + return names; } public static String getIsKeySpan(String isKey) { - if ("1".equals(isKey)) + if ("1".equals(isKey)) { return "是"; - else + } else { return "否"; + } } }