diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.java b/src/com/engine/organization/mapper/version/CompanyVersionMapper.java index 02c8cbaa..85d7bb20 100644 --- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.java +++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.java @@ -1,10 +1,15 @@ package com.engine.organization.mapper.version; +import com.alibaba.fastjson.JSONObject; +import com.engine.common.entity.HrmDepartmentEntity; +import com.engine.common.entity.HrmSubCompanyEntity; import com.engine.organization.entity.version.HrmDepartmentVersion; import com.engine.organization.entity.version.HrmResourceVersion; import com.engine.organization.entity.version.HrmSubCompanyVersion; import org.apache.ibatis.annotations.Param; +import java.util.Map; + /** * @Author weaver_cl * @Description: @@ -45,4 +50,19 @@ public interface CompanyVersionMapper { * 新增人员版本 */ int insertHrmResourceVersion(HrmResourceVersion hrmResourceVersion); + + /** + * 获取分部信息 + */ + JSONObject getHrmSubComp(@Param("id") String id); + + /** + * 获取部门信息 + */ + JSONObject getHrmDepartment(@Param("id") String id); + + /** + * 获取人员信息 + */ + JSONObject getHrmResource(@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 c1e0e6e5..eaa36e11 100644 --- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml +++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml @@ -233,4 +233,34 @@ #{operateTime,jdbcType=TIMESTAMP}, + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java index 8db856f9..8511e027 100644 --- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java +++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java @@ -1,5 +1,7 @@ package com.engine.organization.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.engine.common.entity.HrmSubCompanyEntity; import com.engine.core.impl.Service; import com.engine.organization.entity.hrmresource.po.HrmResourcePO; import com.engine.organization.entity.map.JclOrgMap; @@ -9,7 +11,6 @@ import com.engine.organization.entity.version.HrmSubCompanyVersion; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.jclorgmap.JclOrgMapper; import com.engine.organization.mapper.resource.ResourceMapper; -import com.engine.organization.mapper.trigger.CompTriggerMapper; import com.engine.organization.mapper.version.CompanyVersionMapper; import com.engine.organization.service.VersionManageService; import com.engine.organization.util.OrganizationDateUtil; @@ -43,19 +44,23 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe @Override public void save(ModuleTypeEnum moduleTypeEnum, Map params, User user) { - + String id = (String) params.get("id"); + JSONObject paramMap = null; switch (moduleTypeEnum.getValue()){ case 1: - saveSubComToMap(params); - saveSubComToVersion(params,user); + paramMap = getCompanyVersionMapper().getHrmSubComp(id); + saveSubComToVersion(paramMap,user); + saveSubComToMap(paramMap); break; case 2: - saveDeptToVersion(params, user); - saveDeptToMap(params); + paramMap = getCompanyVersionMapper().getHrmDepartment(id); + saveDeptToVersion(paramMap, user); + saveDeptToMap(paramMap); break; case 4: - saveHrmToMap(params); - saveHrmToVersion(params, user); + paramMap = getCompanyVersionMapper().getHrmResource(id); + saveHrmToVersion(paramMap, user); + saveHrmToMap(paramMap); break; default: break; @@ -65,25 +70,36 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe @Override public Map getVersion(ModuleTypeEnum moduleTypeEnum, Map params) { + switch (moduleTypeEnum.getValue()){ + case 1: + + break; + case 2: + break; + case 4: + break; + default: + break; + } return null; } /** * 分部保存至map表 */ - void saveSubComToMap(Map params) { - String id = (String) params.get("id"); + void saveSubComToMap(JSONObject params) { String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + String id = params.getString("id"); JclOrgMap jclOrgMap = new JclOrgMap(); - jclOrgMap.setId(Integer.parseInt((String) params.get("id"))); + jclOrgMap.setId(Integer.parseInt(id)); jclOrgMap.setFType(1); - jclOrgMap.setFObjId(Integer.parseInt((String) params.get("id"))); + jclOrgMap.setFObjId(Integer.parseInt(id)); jclOrgMap.setFClass(0); jclOrgMap.setFClassName("行政维度"); - jclOrgMap.setFName((String) params.get("subCompanyName")); - String supSubComId = (String) params.get("supSubComId"); - jclOrgMap.setFParentId(Integer.parseInt((String) params.get("supSubComId"))); + jclOrgMap.setFName(params.getString("subcompanyname")); + String supSubComId = params.getString("supsubcomid"); + jclOrgMap.setFParentId(StringUtils.isNotBlank(supSubComId)?Integer.parseInt(supSubComId):null); jclOrgMap.setFIsVitual(0); jclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2022-12-31").getTime())); @@ -111,8 +127,8 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 部门保存到map表 */ - void saveDeptToMap(Map params) { - String id = (String) params.get("id"); + void saveDeptToMap(JSONObject params) { + String id = params.getString("id"); int st = 100000000; String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); @@ -123,7 +139,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFObjId(Integer.parseInt(id)); jclOrgMap.setFClass(0); jclOrgMap.setFClassName("行政维度"); - String bmfzr = (String) params.get("bmfzr"); + String bmfzr = params.getString("bmfzr"); if (StringUtils.isNotBlank(bmfzr)) { jclOrgMap.setFLeader(Integer.parseInt(bmfzr)); HrmResourcePO hrmResourcePO = MapperProxyFactory.getProxy(ResourceMapper.class).getResourceById(bmfzr); @@ -131,9 +147,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFLeaderName(hrmResourcePO.getLastName()); jclOrgMap.setFLeaderJobId(Math.toIntExact(hrmResourcePO.getJobTitle())); } - jclOrgMap.setFName((String) params.get("departmentName")); - String subCompanyId1 = (String) params.get("subCompanyId1"); - String supdepid = (String) params.get("supDepId"); + jclOrgMap.setFName(params.getString("departmentname")); + String subCompanyId1 = params.getString("subcompanyid1"); + String supdepid = params.getString("supdepid"); if (supdepid!=null){ jclOrgMap.setFParentId(st + Integer.parseInt(supdepid)); } @@ -152,7 +168,6 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFPlan(0); jclOrgMap.setFOnJob(0); } - Calendar cal = Calendar.getInstance(); cal.setTime(jclOrgMap.getFDateBegin()); Calendar calendar = DateUtil.addDay(cal, -1); @@ -160,7 +175,6 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe getJclOrgMapMapper().deleteMap("2", id, jclOrgMap.getFDateBegin()); getJclOrgMapMapper().updateMap("2", id, jclOrgMap.getFDateBegin(), time); - getJclOrgMapMapper().insertMap(jclOrgMap); } @@ -168,8 +182,8 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 人员保存至map */ - void saveHrmToMap(Map params){ - String id = (String) params.get("id"); + void saveHrmToMap(JSONObject params){ + String id = params.getString("id"); String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); int sk = 300000000; RecordSet rs = new RecordSet(); @@ -180,7 +194,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFObjId(Integer.parseInt(id)); jclOrgMap.setFClass(0); jclOrgMap.setFClassName("行政维度"); - jclOrgMap.setFName((String) params.get("lastname")); + jclOrgMap.setFName(params.getString("lastname")); if (StringUtils.isNotBlank(id)) { rs.executeQuery("select messagerurl, lastname, jobtitle from hrmresource where id="+id+";"); if (rs.next()){ @@ -189,15 +203,11 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFLeaderJobId(Integer.valueOf(rs.getString("jobtitle"))); } } - jclOrgMap.setFParentId(sk+Integer.parseInt((String) params.get("jobtitle"))); - JclOrgMap jclOrgMapByFParentId = getJclOrgMapMapper().getSumPlanAndJobByFParentId(jclOrgMap.getFDateBegin(), String.valueOf(jclOrgMap.getFParentId())); - if (null != jclOrgMapByFParentId) { - jclOrgMap.setFPlan(jclOrgMapByFParentId.getFPlan()); - jclOrgMap.setFOnJob(jclOrgMapByFParentId.getFOnJob()); - } else { - jclOrgMap.setFPlan(0); - jclOrgMap.setFOnJob(0); - } + String jobtitle = params.getString("jobtitle"); + jclOrgMap.setFParentId(StringUtils.isNotBlank(jobtitle)?sk+Integer.parseInt(jobtitle):null); + + jclOrgMap.setFPlan(0); + jclOrgMap.setFOnJob(0); jclOrgMap.setFIsVitual(0); jclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2022-12-31").getTime())); @@ -218,55 +228,58 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 分部保存至版本表 */ - void saveSubComToVersion(Map params,User user) { - String id = (String) params.get("id"); + void saveSubComToVersion(JSONObject params,User user) { String currentDate = OrganizationDateUtil.getFormatLocalDateTime(new java.util.Date()); - + String id = params.getString("id"); HrmSubCompanyVersion hrmSubCompanyVersion = new HrmSubCompanyVersion(); hrmSubCompanyVersion.setSubComId(Integer.parseInt(id)); - hrmSubCompanyVersion.setSubCompanyDesc((String) params.get("subCompanyDesc")); - hrmSubCompanyVersion.setSubCompanyCode((String) params.get("subCompanyCode")); - hrmSubCompanyVersion.setSubCompanyName((String) params.get("subCompanyName")); - hrmSubCompanyVersion.setSupsSubComId(Integer.parseInt((String) params.get("supSubComId"))); - String showOrder = (String) params.get("showOrder"); - hrmSubCompanyVersion.setShowOrder(null==showOrder ? null : Integer.parseInt(showOrder)); - - hrmSubCompanyVersion.setCanceled(Integer.parseInt((String) params.get("canceled"))); - hrmSubCompanyVersion.setDescription((String) params.get("description")); + hrmSubCompanyVersion.setSubCompanyDesc(params.getString("subcompanydesc")); + hrmSubCompanyVersion.setSubCompanyCode(params.getString("subcompanycode")); + hrmSubCompanyVersion.setSubCompanyName(params.getString("subcompanyname")); + String supSubComId = params.getString("supsubcomid"); + hrmSubCompanyVersion.setSupsSubComId(StringUtils.isNotBlank(supSubComId) ? Integer.parseInt(supSubComId) : null); + String showOrder = params.getString("showorder"); + showOrder = showOrder.substring(0,showOrder.indexOf(".")); + hrmSubCompanyVersion.setShowOrder(null == showOrder ? null : Integer.parseInt(showOrder)); + String canceled = params.getString("canceled");; + hrmSubCompanyVersion.setCanceled(StringUtils.isNotBlank(canceled) ? Integer.parseInt(canceled) : null); + hrmSubCompanyVersion.setDescription(null); hrmSubCompanyVersion.setOperator(user.getUsername()); - hrmSubCompanyVersion.setVersion(genVersionId(1,id)); + hrmSubCompanyVersion.setVersion(genVersionId(1, id)); hrmSubCompanyVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime())); - getCompanyVersionMapper().insertHrmSubComVersion(hrmSubCompanyVersion); } /** * 部门保存至版本 */ - void saveDeptToVersion(Map params,User user) { - String id = (String) params.get("id"); + void saveDeptToVersion(JSONObject params,User user) { + String id = params.getString("id"); String currentDate = OrganizationDateUtil.getFormatLocalDateTime(new java.util.Date()); HrmDepartmentVersion hrmDepartmentVersion = new HrmDepartmentVersion(); hrmDepartmentVersion.setDepartmentId(Integer.parseInt(id)); - hrmDepartmentVersion.setDepartmentMark((String) params.get("departmentMark")); - hrmDepartmentVersion.setDepartmentCode((String) params.get("departmentCode")); - hrmDepartmentVersion.setDepartmentName((String) params.get("departmentName")); - hrmDepartmentVersion.setSubCompanyId1(Integer.parseInt((String) params.get("subCompanyId1"))); - String supDepId = (String) params.get("supDepId"); - if (supDepId!=null){ + hrmDepartmentVersion.setDepartmentMark(params.getString("departmentmark")); + hrmDepartmentVersion.setDepartmentCode(params.getString("departmentcode")); + hrmDepartmentVersion.setDepartmentName(params.getString("departmentname")); + String subCompanyId1 = params.getString("subcompanyid1"); + hrmDepartmentVersion.setSubCompanyId1(StringUtils.isNotBlank(subCompanyId1) ? Integer.parseInt(subCompanyId1) : null); + String supDepId =params.getString("supdepid"); + if (supDepId != null) { hrmDepartmentVersion.setSupDepId(Integer.parseInt(supDepId)); } - String bmfzr = (String) params.get("bmfzr"); - if (!"".equals(bmfzr) && bmfzr!=null){ + String bmfzr = params.getString("bmfzr"); + if (!"".equals(bmfzr) && bmfzr != null) { hrmDepartmentVersion.setBmfzr(Integer.parseInt(bmfzr)); } - String showOrder = (String) params.get("showOrder"); - hrmDepartmentVersion.setShowOrder(null==showOrder ? null : Integer.parseInt(showOrder)); - hrmDepartmentVersion.setCanceled(Integer.parseInt((String) params.get("canceled"))); - hrmDepartmentVersion.setDescription((String) params.get("description")); + String showOrder = params.getString("showorder"); + 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); + hrmDepartmentVersion.setDescription(null); hrmDepartmentVersion.setOperator(user.getLastname()); - hrmDepartmentVersion.setVersion(genVersionId(2,id)); + hrmDepartmentVersion.setVersion(genVersionId(2, id)); hrmDepartmentVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime())); getCompanyVersionMapper().insertHrmDeptVersion(hrmDepartmentVersion); @@ -275,8 +288,8 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 人员保存至版本 */ - void saveHrmToVersion(Map params,User user){ - String id = (String) params.get("id"); + void saveHrmToVersion(JSONObject params,User user){ + String id = params.getString("id"); String currentDate = OrganizationDateUtil.getFormatLocalDateTime(new java.util.Date()); HrmResourceVersion hrmResourceVersion = new HrmResourceVersion(); @@ -285,15 +298,15 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe hrmResourceVersion.setCompanyworkyear(Integer.parseInt((String) params.get("companyworkyear"))); hrmResourceVersion.setWorkstartdate(new Date(OrganizationDateUtil.stringToDate((String) params.get("workstartdate")).getTime()));*/ - hrmResourceVersion.setDepartmentid(Integer.parseInt((String) params.get("departmentid"))); - hrmResourceVersion.setDsporder(Double.valueOf((String) params.get("dsporder")).intValue()); - hrmResourceVersion.setSubcompanyid1(Integer.parseInt((String) params.get("subcompanyid1"))); - hrmResourceVersion.setJobtitle(Integer.parseInt((String) params.get("jobtitle"))); - hrmResourceVersion.setMobile((String) params.get("mobile")); - hrmResourceVersion.setTelephone((String) params.get("telephone")); - String managerid = (String) params.get("managerid"); + hrmResourceVersion.setDepartmentid(Integer.parseInt( params.getString("departmentid"))); + hrmResourceVersion.setDsporder(Double.valueOf(params.getString("dsporder")).intValue()); + hrmResourceVersion.setSubcompanyid1(Integer.parseInt(params.getString("subcompanyid1"))); + hrmResourceVersion.setJobtitle(Integer.parseInt(params.getString("jobtitle"))); + hrmResourceVersion.setMobile( params.getString("mobile")); + hrmResourceVersion.setTelephone(params.getString("telephone")); + String managerid = params.getString("managerid"); hrmResourceVersion.setManagerid(StringUtils.isNotBlank(managerid) ? Integer.parseInt(managerid):null); - hrmResourceVersion.setLastname((String) params.get("lastname")); + hrmResourceVersion.setLastname(params.getString("lastname")); hrmResourceVersion.setOperator(user.getLastname()); hrmResourceVersion.setVersion(genVersionId(4,id)); hrmResourceVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime()));