From 8cda66dc8b3a2d925706c1651fd951aeffcb4d30 Mon Sep 17 00:00:00 2001 From: Mlin Date: Thu, 15 Dec 2022 20:29:58 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/VersionManageServiceImpl.java | 68 +++++++++---------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java index dcf70461..550910f0 100644 --- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java +++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java @@ -1,7 +1,6 @@ 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; @@ -35,11 +34,11 @@ import java.util.*; **/ public class VersionManageServiceImpl extends Service implements VersionManageService { - private CompanyVersionMapper getCompanyVersionMapper(){ + private CompanyVersionMapper getCompanyVersionMapper() { return MapperProxyFactory.getProxy(CompanyVersionMapper.class); } - private JclOrgMapper getJclOrgMapMapper(){ + private JclOrgMapper getJclOrgMapMapper() { return MapperProxyFactory.getProxy(JclOrgMapper.class); } @@ -48,10 +47,10 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe String id = (String) params.get("id"); JSONObject paramMap = null; - switch (moduleTypeEnum.getValue()){ + switch (moduleTypeEnum.getValue()) { case 1: paramMap = getCompanyVersionMapper().getHrmSubComp(id); - saveSubComToVersion(paramMap,user); + saveSubComToVersion(paramMap, user); saveSubComToMap(paramMap); break; case 2: @@ -64,8 +63,6 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe saveHrmToVersion(paramMap, user); saveHrmToMap(paramMap); break; - default: - break; } } @@ -92,9 +89,8 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe map.put("value", String.format("%.1f", hrmSubCompanyVersion.getVersion())); versions.add(map); } - if (StringUtils.isBlank(version)) { - size = size > 1 ? size - 1 : size; - version = String.format("%.1f", list.get(size - 1).getVersion()); + if (version.equals("1.0")) { + version = "1"; } list = getCompanyVersionMapper().getSubComVersionList(id, version); for (HrmSubCompanyVersion hrmSubCompanyVersion : list) { @@ -120,9 +116,8 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe map.put("value", String.format("%.1f", hrmDepartmentVersion.getVersion())); versions.add(map); } - if (StringUtils.isBlank(version)) { - deptSize = deptSize > 1 ? deptSize - 1 : deptSize; - version = String.format("%.1f", deptVersionList.get(deptSize).getVersion()); + if (version.equals("1.0")) { + version = "1"; } deptVersionList = getCompanyVersionMapper().getDeptVersionList(id, version); for (HrmDepartmentVersion hrmDepartmentVersion : deptVersionList) { @@ -151,9 +146,8 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe map.put("value", String.format("%.1f", hrmResourceVersion.getVersion())); versions.add(map); } - if (StringUtils.isBlank(version)) { - deptSize = resSize > 1 ? resSize - 1 : resSize; - version = String.format("%.1f", resVersionList.get(deptSize).getVersion()); + if (version.equals("1.0")) { + version = "1"; } resVersionList = getCompanyVersionMapper().getResourceVersionList(id, version); for (HrmResourceVersion hrmResourceVersion : resVersionList) { @@ -192,16 +186,16 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFClassName("行政维度"); jclOrgMap.setFName(params.getString("subcompanyname")); String supSubComId = params.getString("supsubcomid"); - jclOrgMap.setFParentId(StringUtils.isNotBlank(supSubComId)?Integer.parseInt(supSubComId):null); + 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())); - JclOrgMap jclOrgMapByFParentId = getJclOrgMapMapper().getSumPlanAndJobByFParentId(jclOrgMap.getFDateBegin(), String.valueOf(jclOrgMap.getId())); - if(jclOrgMapByFParentId !=null){ + JclOrgMap jclOrgMapByFParentId = getJclOrgMapMapper().getSumPlanAndJobByFParentId(jclOrgMap.getFDateBegin(), Util.null2String(jclOrgMap.getId())); + if (jclOrgMapByFParentId != null) { jclOrgMap.setFPlan(jclOrgMapByFParentId.getFPlan()); jclOrgMap.setFOnJob(jclOrgMapByFParentId.getFOnJob()); - }else{ + } else { jclOrgMap.setFPlan(0); jclOrgMap.setFOnJob(0); } @@ -213,7 +207,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe getJclOrgMapMapper().deleteMap("1", id, jclOrgMap.getFDateBegin()); getJclOrgMapMapper().updateMap("1", id, jclOrgMap.getFDateBegin(), time); - if(!params.getString("canceled").equals("1")){ + if (!params.getString("canceled").equals("1")) { getJclOrgMapMapper().insertMap(jclOrgMap); } } @@ -244,10 +238,10 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFName(params.getString("departmentname")); String subCompanyId1 = params.getString("subcompanyid1"); String supdepid = params.getString("supdepid"); - if (supdepid!=null){ + if (supdepid != null) { jclOrgMap.setFParentId(st + Integer.parseInt(supdepid)); } - if ("0".equals(supdepid)){ + if ("0".equals(supdepid)) { jclOrgMap.setFParentId(Integer.parseInt(subCompanyId1)); } jclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); @@ -269,7 +263,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe getJclOrgMapMapper().deleteMap("2", id, jclOrgMap.getFDateBegin()); getJclOrgMapMapper().updateMap("2", id, jclOrgMap.getFDateBegin(), time); - if(!params.getString("canceled").equals("1")){ + if (!params.getString("canceled").equals("1")) { getJclOrgMapMapper().insertMap(jclOrgMap); } } @@ -278,7 +272,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 人员保存至map */ - void saveHrmToMap(JSONObject params){ + void saveHrmToMap(JSONObject params) { String id = params.getString("id"); String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); int sk = 300000000; @@ -292,15 +286,15 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe jclOrgMap.setFClassName("行政维度"); jclOrgMap.setFName(params.getString("lastname")); if (StringUtils.isNotBlank(id)) { - rs.executeQuery("select messagerurl, lastname, jobtitle from hrmresource where id="+id+";"); - if (rs.next()){ + rs.executeQuery("select messagerurl, lastname, jobtitle from hrmresource where id=" + id + ";"); + if (rs.next()) { jclOrgMap.setFLeaderImg(Util.null2String(rs.getString("messagerurl"))); jclOrgMap.setFLeaderName(Util.null2String(rs.getString("lastname"))); jclOrgMap.setFLeaderJobId(Integer.valueOf(rs.getString("jobtitle"))); } } String jobtitle = params.getString("jobtitle"); - jclOrgMap.setFParentId(StringUtils.isNotBlank(jobtitle)?sk+Integer.parseInt(jobtitle):null); + jclOrgMap.setFParentId(StringUtils.isNotBlank(jobtitle) ? sk + Integer.parseInt(jobtitle) : null); jclOrgMap.setFPlan(0); jclOrgMap.setFOnJob(0); @@ -316,7 +310,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe getJclOrgMapMapper().deleteMap("4", id, jclOrgMap.getFDateBegin()); getJclOrgMapMapper().updateMap("4", id, jclOrgMap.getFDateBegin(), time); - if(!params.getString("canceled").equals("1")){ + if (!params.getString("canceled").equals("1")) { getJclOrgMapMapper().insertMap(jclOrgMap); } @@ -326,7 +320,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 分部保存至版本表 */ - void saveSubComToVersion(JSONObject params,User user) { + void saveSubComToVersion(JSONObject params, User user) { String currentDate = OrganizationDateUtil.getFormatLocalDateTime(new java.util.Date()); String id = params.getString("id"); HrmSubCompanyVersion hrmSubCompanyVersion = new HrmSubCompanyVersion(); @@ -354,7 +348,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 部门保存至版本 */ - void saveDeptToVersion(JSONObject params,User user) { + void saveDeptToVersion(JSONObject params, User user) { String id = params.getString("id"); String currentDate = OrganizationDateUtil.getFormatLocalDateTime(new java.util.Date()); @@ -391,7 +385,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 人员保存至版本 */ - void saveHrmToVersion(JSONObject params,User user){ + void saveHrmToVersion(JSONObject params, User user) { String id = params.getString("id"); String currentDate = OrganizationDateUtil.getFormatLocalDateTime(new java.util.Date()); @@ -401,17 +395,17 @@ 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( params.getString("departmentid"))); + 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.setMobile(params.getString("mobile")); hrmResourceVersion.setTelephone(params.getString("telephone")); String managerid = params.getString("managerid"); - hrmResourceVersion.setManagerid(StringUtils.isNotBlank(managerid) ? Integer.parseInt(managerid):null); + hrmResourceVersion.setManagerid(StringUtils.isNotBlank(managerid) ? Integer.parseInt(managerid) : null); hrmResourceVersion.setLastname(params.getString("lastname")); hrmResourceVersion.setOperator(user.getLastname()); - hrmResourceVersion.setVersion(genVersionId(4,id)); + hrmResourceVersion.setVersion(genVersionId(4, id)); hrmResourceVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime())); getCompanyVersionMapper().insertHrmResourceVersion(hrmResourceVersion); @@ -421,7 +415,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe /** * 版本号生成 */ - private Double genVersionId(int fType,String sid) { + private Double genVersionId(int fType, String sid) { // 版本V1.0 + 0.1 (默认字段) double id = 1.0; switch (fType) {