From b3057e2f4e863c0475f04ce4bcd96b2fbfed1e42 Mon Sep 17 00:00:00 2001 From: Mlin Date: Thu, 15 Dec 2022 14:38:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/version/HrmSubCompanyVersion.java | 2 +- .../mapper/version/CompanyVersionMapper.java | 6 +++ .../mapper/version/CompanyVersionMapper.xml | 24 ++++++++- .../service/VersionManageService.java | 2 +- .../impl/VersionManageServiceImpl.java | 50 +++++++++++++++---- .../web/VersionManageController.java | 15 ++++++ .../wrapper/VersionManageWrapper.java | 8 ++- 7 files changed, 90 insertions(+), 17 deletions(-) diff --git a/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java b/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java index 5fcd7fa4..a9a1701d 100644 --- a/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java +++ b/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java @@ -12,7 +12,7 @@ public class HrmSubCompanyVersion { String subCompanyDesc; String subCompanyCode; String subCompanyName; - Integer supsSubComId; + Integer supSubComId; Integer showOrder; Integer canceled; String description; diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.java b/src/com/engine/organization/mapper/version/CompanyVersionMapper.java index 85d7bb20..c35b2bda 100644 --- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.java +++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.java @@ -8,6 +8,7 @@ import com.engine.organization.entity.version.HrmResourceVersion; import com.engine.organization.entity.version.HrmSubCompanyVersion; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -65,4 +66,9 @@ public interface CompanyVersionMapper { * 获取人员信息 */ JSONObject getHrmResource(@Param("id") String id); + + /** + * 获取分部版本记录 + */ + List getSubComVersionList(@Param("operateName") String operateName,@Param("operateTime") String operateTime,@Param("subComId") String subComId,@Param("id") String id); } diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml index eaa36e11..0e83d20e 100644 --- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml +++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ insert into hrmsubcompany_version (subcomid ,subcompanydesc ,subcompanycode ,subcompanyname ,supsubcomid , showorder ,canceled ,description ,operator ,version ,operate_time) - values (#{subComId}, #{subCompanyDesc}, #{subCompanyCode}, #{subCompanyName}, #{supsSubComId}, + values (#{subComId}, #{subCompanyDesc}, #{subCompanyCode}, #{subCompanyName}, #{supSubComId}, #{showOrder}, #{canceled}, #{description}, #{operator}, #{version}, #{operateTime}) @@ -263,4 +263,24 @@ workyear,DISMISSDATE,encKey,crc,usbscope,tenant_key,clauthtype,hashData,signData from HrmResource where id=#{id} + + \ No newline at end of file diff --git a/src/com/engine/organization/service/VersionManageService.java b/src/com/engine/organization/service/VersionManageService.java index da2e7e8f..65312702 100644 --- a/src/com/engine/organization/service/VersionManageService.java +++ b/src/com/engine/organization/service/VersionManageService.java @@ -25,5 +25,5 @@ public interface VersionManageService { * @param moduleTypeEnum * @param params */ - Map getVersion(ModuleTypeEnum moduleTypeEnum,Map params); + Map getVersion(ModuleTypeEnum moduleTypeEnum,Map params, User user); } diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java index 8511e027..576d32ad 100644 --- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java +++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java @@ -23,8 +23,7 @@ import weaver.hrm.User; import java.sql.Date; import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Map; +import java.util.*; /** * @Author weaver_cl @@ -46,6 +45,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe public void save(ModuleTypeEnum moduleTypeEnum, Map params, User user) { String id = (String) params.get("id"); JSONObject paramMap = null; + switch (moduleTypeEnum.getValue()){ case 1: paramMap = getCompanyVersionMapper().getHrmSubComp(id); @@ -69,10 +69,33 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe } @Override - public Map getVersion(ModuleTypeEnum moduleTypeEnum, Map params) { + public Map getVersion(ModuleTypeEnum moduleTypeEnum, Map params, User user) { + String operateName = user.getUsername(); + String id = (String) params.get("id"); + String supComId = (String) params.get("subComId"); + String operateTime = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + Map resultMap = new HashMap<>(); switch (moduleTypeEnum.getValue()){ case 1: - + List list = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,null); + List versions = new ArrayList<>(); + Map map = new HashMap<>(); + for (HrmSubCompanyVersion hrmSubCompanyVersion:list){ + map.put("value", String.valueOf(hrmSubCompanyVersion.getVersion())); + versions.add(map); + } + List list2 = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,id); +// List datas = new ArrayList<>(); +// Map map2 = new HashMap<>(); +// for (HrmSubCompanyVersion hrmSubCompanyVersion:list){ +// map2.put("fieldId", String.valueOf(hrmSubCompanyVersion.getVersion())); +// map2.put("fieldValue", String.valueOf(hrmSubCompanyVersion.getVersion())); +// versions.add(map); +// } + resultMap.put("operateName",operateName); + resultMap.put("operateTime",operateTime); + resultMap.put("versions",versions); + resultMap.put("datas",list2); break; case 2: break; @@ -81,7 +104,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe default: break; } - return null; + return resultMap; } /** @@ -237,11 +260,14 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe hrmSubCompanyVersion.setSubCompanyCode(params.getString("subcompanycode")); hrmSubCompanyVersion.setSubCompanyName(params.getString("subcompanyname")); String supSubComId = params.getString("supsubcomid"); - hrmSubCompanyVersion.setSupsSubComId(StringUtils.isNotBlank(supSubComId) ? Integer.parseInt(supSubComId) : null); + hrmSubCompanyVersion.setSupSubComId(StringUtils.isNotBlank(supSubComId) ? Integer.parseInt(supSubComId) : null); String showOrder = params.getString("showorder"); - showOrder = showOrder.substring(0,showOrder.indexOf(".")); + if (showOrder != null) { + showOrder = showOrder.substring(0, showOrder.indexOf(".")); + } hrmSubCompanyVersion.setShowOrder(null == showOrder ? null : Integer.parseInt(showOrder)); - String canceled = params.getString("canceled");; + String canceled = params.getString("canceled"); + ; hrmSubCompanyVersion.setCanceled(StringUtils.isNotBlank(canceled) ? Integer.parseInt(canceled) : null); hrmSubCompanyVersion.setDescription(null); hrmSubCompanyVersion.setOperator(user.getUsername()); @@ -264,7 +290,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe hrmDepartmentVersion.setDepartmentName(params.getString("departmentname")); String subCompanyId1 = params.getString("subcompanyid1"); hrmDepartmentVersion.setSubCompanyId1(StringUtils.isNotBlank(subCompanyId1) ? Integer.parseInt(subCompanyId1) : null); - String supDepId =params.getString("supdepid"); + String supDepId = params.getString("supdepid"); if (supDepId != null) { hrmDepartmentVersion.setSupDepId(Integer.parseInt(supDepId)); } @@ -272,8 +298,10 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe if (!"".equals(bmfzr) && bmfzr != null) { hrmDepartmentVersion.setBmfzr(Integer.parseInt(bmfzr)); } - String showOrder = params.getString("showorder"); - showOrder = showOrder.substring(0,showOrder.indexOf(".")); + String showOrder = params.getString("showorder"); + if (showOrder != null) { + showOrder = showOrder.substring(0, showOrder.indexOf(".")); + } hrmDepartmentVersion.setShowOrder(null == showOrder ? null : Integer.parseInt(showOrder)); String canceled = params.getString("canceled"); hrmDepartmentVersion.setCanceled(StringUtils.isNotBlank(canceled) ? Integer.parseInt(canceled) : null); diff --git a/src/com/engine/organization/web/VersionManageController.java b/src/com/engine/organization/web/VersionManageController.java index 080de3cb..fd873077 100644 --- a/src/com/engine/organization/web/VersionManageController.java +++ b/src/com/engine/organization/web/VersionManageController.java @@ -41,4 +41,19 @@ public class VersionManageController { return ReturnResult.exceptionHandle(e); } } + + @GET + @Path("/{moduleTypeEnum}/getVersion") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getVersion(@Context HttpServletRequest request, @Context HttpServletResponse response, + @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { + try { + User user = HrmUserVarify.getUser(request, response); + Map params = ParamUtil.request2Map(request); + Map map = getVersionManageWrapper(user).getVersion(moduleTypeEnum,params); + return ReturnResult.successed(map); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } } diff --git a/src/com/engine/organization/wrapper/VersionManageWrapper.java b/src/com/engine/organization/wrapper/VersionManageWrapper.java index c8187866..c9b0c9d9 100644 --- a/src/com/engine/organization/wrapper/VersionManageWrapper.java +++ b/src/com/engine/organization/wrapper/VersionManageWrapper.java @@ -19,10 +19,14 @@ import java.util.Map; public class VersionManageWrapper extends OrganizationWrapper { private VersionManageService getVersionManageService(User user) { - return ServiceUtil.getService(VersionManageServiceImpl.class,user); + return ServiceUtil.getService(VersionManageServiceImpl.class, user); } public void save(ModuleTypeEnum moduleTypeEnum, Map params) { - getVersionManageService(user).save(moduleTypeEnum,params,user); + getVersionManageService(user).save(moduleTypeEnum, params, user); + } + + public Map getVersion(ModuleTypeEnum moduleTypeEnum, Map params) { + return getVersionManageService(user).getVersion(moduleTypeEnum, params, user); } }