diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index c0cf3d84..52e7844b 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -99,7 +99,7 @@ public class JobBrowserService extends BrowserService { */ private String buildSqlWhere(Map params) { DBType dbType = DBType.get(new RecordSet().getDBType()); - String sqlWhere = " where t.delete_type ='0' and forbidden_tag ='0' "; + String sqlWhere = " where t.delete_type = 0 "; String jobNo = Util.null2String(params.get("jobNo")); if (StringUtils.isNotBlank(jobNo)) { sqlWhere += " AND t.job_no " + dbType.like(jobNo); @@ -191,7 +191,7 @@ public class JobBrowserService extends BrowserService { compList = MapperProxyFactory.getProxy(CompMapper.class).listParent(); } // 获取顶层分部 - compList.stream().sorted(Comparator.comparing(CompPO::getShowOrder)).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); + compList.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); } else if ("1".equals(params.getType())) { // 当前节点下的元素 CompPO compBuild = CompPO.builder().supSubComId(Integer.parseInt(params.getId())).canceled(0).build(); diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index ba1762ec..71166d97 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -571,7 +571,9 @@ public class ExtendInfoBO { Map groupitem = null; List itemlist = null; try { - if (isAdd) viewAttr = 2; + if (isAdd) { + viewAttr = 2; + } if (id.length() == 0) { id = "" + user.getUID(); } @@ -587,8 +589,9 @@ public class ExtendInfoBO { if (recordSet.next()) { subcompanyid = Util.toScreen(recordSet.getString("subcompanyid1"), user.getLanguage()); departmentId = StringUtil.vString(recordSet.getString("departmentId")); - if (subcompanyid == null || subcompanyid.equals("") || subcompanyid.equalsIgnoreCase("null")) + if (subcompanyid == null || "".equals(subcompanyid) || "null".equalsIgnoreCase(subcompanyid)) { subcompanyid = "-1"; + } } int operatelevel = -1; //人力资源模块是否开启了管理分权，如不是，则不显示框架，直接转向到列表页面(新的分权管理) @@ -616,14 +619,18 @@ public class ExtendInfoBO { HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo(); com.engine.hrm.biz.HrmFieldManager hfm = new com.engine.hrm.biz.HrmFieldManager("HrmCustomFieldByInfoType", scopeId); CustomFieldManager cfm = new CustomFieldManager("HrmCustomFieldByInfoType", scopeId); - if (viewAttr != 1) hfm.isReturnDecryptData(true); + if (viewAttr != 1) { + hfm.isReturnDecryptData(true); + } hfm.getHrmData(Util.getIntValue(id)); cfm.getCustomData(Util.getIntValue(id)); HrmListValidate hrmListValidate = new HrmListValidate(); while (HrmFieldGroupComInfo.next()) { int grouptype = Util.getIntValue(HrmFieldGroupComInfo.getType()); - if (grouptype != scopeId) continue; + if (grouptype != scopeId) { + continue; + } int grouplabel = Util.getIntValue(HrmFieldGroupComInfo.getLabel()); int groupid = Util.getIntValue(HrmFieldGroupComInfo.getid()); hfm.getCustomFields(groupid); @@ -635,7 +642,7 @@ public class ExtendInfoBO { if (groupid == 4) { groupitem.put("hide", (!isAdd && !canEdit && isSelf && viewAttr == 2 && hfm.getContactEditCount() == 0) || !hrmListValidate.isValidate(42)); } else { - groupitem.put("hide", (!isAdd && !canEdit && isSelf && viewAttr == 2 && hfm.getContactEditCount() == 0) || !Util.null2String(HrmFieldGroupComInfo.getIsShow()).equals("1")); + groupitem.put("hide", (!isAdd && !canEdit && isSelf && viewAttr == 2 && hfm.getContactEditCount() == 0) || !"1".equals(Util.null2String(HrmFieldGroupComInfo.getIsShow()))); } groupitem.put("items", itemlist); lsGroup.add(groupitem); @@ -649,7 +656,9 @@ public class ExtendInfoBO { } else { fieldValue = Util.null2String(new EncryptUtil().decrypt("cus_fielddata", "field" + hfm.getFieldid(), "HrmCustomFieldByInfoType", "" + scopeId, cfm.getData("field" + hfm.getFieldid()), viewAttr == 2, true)); cusFieldname = "customfield" + hfm.getFieldid(); - if (isAdd) cusFieldname = "customfield_1_" + hfm.getFieldid(); + if (isAdd) { + cusFieldname = "customfield_1_" + hfm.getFieldid(); + } } if (!hfm.isUse() || (!isAdd && viewAttr == 2 && !canEdit && isSelf && !hfm.isModify())) { @@ -681,19 +690,19 @@ public class ExtendInfoBO { hrmFieldBean.setFieldvalue(fieldValue); } hrmFieldBean.setIsFormField(true); - if (viewAttr == 2 && ((String) hrmFieldConf.get("ismand")).equals("1")) { + if (viewAttr == 2 && "1".equals((String) hrmFieldConf.get("ismand"))) { tmpviewattr = 3; - if (hrmFieldBean.getFieldhtmltype().equals("3")) { + if ("3".equals(hrmFieldBean.getFieldhtmltype())) { hrmFieldBean.setRules("required|string"); // if (hrmFieldBean.getType().equals("2")||hrmFieldBean.getType().equals("161")||hrmFieldBean.getType().equals("162")) { // hrmFieldBean.setRules("required|string"); // }else{ // hrmFieldBean.setRules("required|integer"); // } - } else if (hrmFieldBean.getFieldhtmltype().equals("4") || - hrmFieldBean.getFieldhtmltype().equals("5")) { + } else if ("4".equals(hrmFieldBean.getFieldhtmltype()) || + "5".equals(hrmFieldBean.getFieldhtmltype())) { hrmFieldBean.setRules("required|integer"); - } else if (hrmFieldBean.getFieldhtmltype().equals("1") && hrmFieldBean.getType().equals("2")) { + } else if ("1".equals(hrmFieldBean.getFieldhtmltype()) && "2".equals(hrmFieldBean.getType())) { hrmFieldBean.setRules("required|integer"); } else { hrmFieldBean.setRules("required|string"); @@ -701,14 +710,18 @@ public class ExtendInfoBO { } SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user); - if (searchConditionItem == null) continue; + if (searchConditionItem == null) { + continue; + } if (searchConditionItem.getBrowserConditionParam() != null) { searchConditionItem.getBrowserConditionParam().setViewAttr(tmpviewattr); } searchConditionItem.setViewAttr(tmpviewattr); itemlist.add(searchConditionItem); } - if (itemlist.size() == 0) lsGroup.remove(groupitem); + if (itemlist.size() == 0) { + lsGroup.remove(groupitem); + } } result.put("conditions", lsGroup); @@ -764,7 +777,9 @@ public class ExtendInfoBO { LinkedHashMap ht = new LinkedHashMap(); RecordSet.executeSql("select id, formlabel,viewtype from cus_treeform where parentid=" + scopeId + " order by scopeorder"); while (RecordSet.next()) { - if (RecordSet.getInt("viewtype") != 1) continue; + if (RecordSet.getInt("viewtype") != 1) { + continue; + } titles = new ArrayList(); int subId = RecordSet.getInt("id"); CustomFieldManager cfm2 = new CustomFieldManager("HrmCustomFieldByInfoType", subId); @@ -775,19 +790,27 @@ public class ExtendInfoBO { int col = 0; while (cfm2.next()) { rowcount++; - if (!cfm2.isUse() || (!isAdd && viewAttr == 2 && !canEdit && isSelf && !cfm2.isModify())) continue; + if (!cfm2.isUse() || (!isAdd && viewAttr == 2 && !canEdit && isSelf && !cfm2.isModify())) { + continue; + } col++; } - if (rowcount == 0) continue; + if (rowcount == 0) { + continue; + } cfm2.beforeFirst(); ht.put("cus_list_" + subId, RecordSet.getString("formlabel")); cfm2.beforeFirst(); while (cfm2.next()) { - if (!cfm2.isUse() || (!isAdd && viewAttr == 2 && !canEdit && isSelf && !cfm2.isModify())) continue; + if (!cfm2.isUse() || (!isAdd && viewAttr == 2 && !canEdit && isSelf && !cfm2.isModify())) { + continue; + } int tmpviewattr = viewAttr; //创建表头 String fieldname = "customfield" + cfm2.getId() + "_" + subId; - if (isAdd) fieldname = "customfield_1_" + cfm2.getId() + "_" + subId; + if (isAdd) { + fieldname = "customfield_1_" + cfm2.getId() + "_" + subId; + } hrmFieldBean = new HrmFieldBean(); hrmFieldBean.setFieldid("" + cfm2.getId()); hrmFieldBean.setFieldname(fieldname); @@ -820,20 +843,22 @@ public class ExtendInfoBO { int fieldhtmltype = Util.getIntValue(cfm2.getHtmlType()); String fieldname = "customfield" + cfm2.getId() + "_" + subId; - if (isAdd) fieldname = "customfield_1_" + cfm2.getId() + "_" + subId; + if (isAdd) { + fieldname = "customfield_1_" + cfm2.getId() + "_" + subId; + } String fieldvalue = ""; if (!isAdd) { fieldvalue = Util.null2String(CustomFieldTreeManager.getMutiData("field" + fieldid)); } data.put(fieldname, fieldvalue); - if (cfm2.getHtmlType().equals("1") && cfm2.getType() == 1) { + if ("1".equals(cfm2.getHtmlType()) && cfm2.getType() == 1) { data.put(fieldname, TextUtil.toBase64ForMultilang(Util.null2String(fieldvalue))); - } else if (cfm2.getHtmlType().equals("3")) { + } else if ("3".equals(cfm2.getHtmlType())) { String fieldshowname = hfm.getFieldvalue(user, dmlurl, fieldid, fieldhtmltype, type, fieldvalue, 0); data.put(fieldname, fieldvalue); data.put(fieldname + "span", fieldshowname); - } else if (cfm2.getHtmlType().equals("4")) { - data.put(fieldname, fieldvalue.equals("1")); + } else if ("4".equals(cfm2.getHtmlType())) { + data.put(fieldname, "1".equals(fieldvalue)); } //只允许有权限的人删除明细行,没有权限的人只能修改不能删除 if (canEdit) { diff --git a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java index 69da67a0..097850f3 100644 --- a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java +++ b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java @@ -41,12 +41,12 @@ public class JobBrowserVO { @OrganizationTableColumn(text = "岗位名称", width = "25%", column = "name") private String jobName; - @OrganizationTableColumn(text = "等级方案", width = "25%", column = "scheme_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSchemeName") - private String schemeName; - @OrganizationTableColumn(text = "职等", width = "25%", column = "level_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getLevelName") - private String levelName; - @OrganizationTableColumn(text = "职级", width = "25%", column = "grade_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getGradeName") - private String gradeName; - @OrganizationTableColumn(text = "岗位序列", width = "25%", column = "sequence_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSequenceName") - private String sequenceName; + //@OrganizationTableColumn(text = "等级方案", width = "25%", column = "scheme_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSchemeName") + //private String schemeName; + //@OrganizationTableColumn(text = "职等", width = "25%", column = "level_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getLevelName") + //private String levelName; + //@OrganizationTableColumn(text = "职级", width = "25%", column = "grade_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getGradeName") + //private String gradeName; + //@OrganizationTableColumn(text = "岗位序列", width = "25%", column = "sequence_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSequenceName") + //private String sequenceName; } diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 03b81838..3fa37c9f 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -468,7 +468,7 @@ from jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id where delete_type = 0 - AND id IN + AND t.id IN #{id} diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index e293dca8..aa09aad6 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -274,17 +274,23 @@ public class DepartmentServiceImpl extends Service implements DepartmentService for (int tmp = 0; lsGroup != null && tmp < lsGroup.size(); tmp++) { String groupId = (String) lsGroup.get(tmp); List lsField = hfm.getLsField(groupId); - if (lsField.size() == 0) + if (lsField.size() == 0) { continue; - if (hfm.getGroupCount(lsField) == 0) + } + if (hfm.getGroupCount(lsField) == 0) { + continue; + } + if (!"1".equals(Util.null2String(HrmFieldGroupComInfo.getIsShow(groupId)))) { continue; - if (!"1".equals(Util.null2String(HrmFieldGroupComInfo.getIsShow(groupId)))) continue; + } String groupLabel = HrmFieldGroupComInfo.getLabel(groupId); itemList = new ArrayList<>(); for (Object o : lsField) { String fieldId = (String) o; String isUse = HrmFieldComInfo.getIsused(fieldId); - if (!"1".equals(isUse)) continue; + if (!"1".equals(isUse)) { + continue; + } String fieldName = HrmFieldComInfo.getFieldname(fieldId); String fieldLabel = HrmFieldComInfo.getLabel(fieldId); String fieldHtmlType = HrmFieldComInfo.getFieldhtmltype(fieldId); @@ -866,7 +872,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService String fieldId = (String) o; String fieldName = HrmFieldComInfo.getFieldname(fieldId); String isUse = HrmFieldComInfo.getIsused(fieldId); - if (!"1".equals(isUse)) continue; + if (!"1".equals(isUse)) { + continue; + } int tmpViewAttr = viewAttr; String rules = ""; String fieldLabel = HrmFieldComInfo.getLabel(fieldId); diff --git a/src/com/engine/organization/util/excel/ExcelSupport.java b/src/com/engine/organization/util/excel/ExcelSupport.java index 2d307995..63b0f7cf 100644 --- a/src/com/engine/organization/util/excel/ExcelSupport.java +++ b/src/com/engine/organization/util/excel/ExcelSupport.java @@ -20,7 +20,7 @@ import static org.apache.poi.ss.usermodel.CellType.STRING; public class ExcelSupport { - private static final String pattern = "yyyy-MM-dd HH:mm:ss"; + private static final String PATTERN = "yyyy-MM-dd HH:mm:ss"; //excel类型 public static final String EXCEL_TYPE_XLSX = "xlsx"; @@ -115,7 +115,7 @@ public class ExcelSupport { switch (cell.getCellType()) { case NUMERIC: // 数值类型 if (DateUtil.isCellDateFormatted(cell)) { - cellValue = getDateStr(cell.getDateCellValue(), pattern); + cellValue = getDateStr(cell.getDateCellValue(), PATTERN); } else { cell.setCellType(STRING); cellValue = cell.getStringCellValue(); diff --git a/src/com/engine/organization/util/relation/ResourceSyncUtil.java b/src/com/engine/organization/util/relation/ResourceSyncUtil.java index da831abb..0c013e2a 100644 --- a/src/com/engine/organization/util/relation/ResourceSyncUtil.java +++ b/src/com/engine/organization/util/relation/ResourceSyncUtil.java @@ -63,8 +63,8 @@ import java.util.Map; * @version: 1.0 */ public class ResourceSyncUtil { - private static final char separator = Util.getSeparator(); - private static final String today = DateUtil.getCurrentDate(); + private static final char SEPARATOR = Util.getSeparator(); + private static final String TODAY = DateUtil.getCurrentDate(); public static Map addResource(User user, Map params) { @@ -411,11 +411,11 @@ public class ResourceSyncUtil { } } workcode = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.USER, subcmpanyid1, departmentid, jobtitle, workcode); - para = new StringBuilder("" + id + separator + workcode + separator + lastname + separator + sex + separator + resourceimageid + separator + - departmentid + separator + costcenterid + separator + jobtitle + separator + joblevel + separator + jobactivitydesc + separator + - managerid + separator + assistantid + separator + status + separator + locationid + separator + workroom + separator + telephone + - separator + mobile + separator + mobilecall + separator + fax + separator + jobcall + separator + subcmpanyid1 + separator + managerstr + - separator + accounttype + separator + belongto + separator + systemlanguage + separator + email + separator + dsporder + separator + mobileshowtype); + para = new StringBuilder("" + id + SEPARATOR + workcode + SEPARATOR + lastname + SEPARATOR + sex + SEPARATOR + resourceimageid + SEPARATOR + + departmentid + SEPARATOR + costcenterid + SEPARATOR + jobtitle + SEPARATOR + joblevel + SEPARATOR + jobactivitydesc + SEPARATOR + + managerid + SEPARATOR + assistantid + SEPARATOR + status + SEPARATOR + locationid + SEPARATOR + workroom + SEPARATOR + telephone + + SEPARATOR + mobile + SEPARATOR + mobilecall + SEPARATOR + fax + SEPARATOR + jobcall + SEPARATOR + subcmpanyid1 + SEPARATOR + managerstr + + SEPARATOR + accounttype + SEPARATOR + belongto + SEPARATOR + systemlanguage + SEPARATOR + email + SEPARATOR + dsporder + SEPARATOR + mobileshowtype); rst.executeProc("HrmResourceBasicInfo_Insert", para.toString()); if (Util.null2String(locationid).length() > 0) { @@ -446,7 +446,7 @@ public class ResourceSyncUtil { } } int userid = user.getUID(); - String userpara = "" + userid + separator + today; + String userpara = "" + userid + SEPARATOR + TODAY; para = new StringBuilder("" + id); for (int i = 0; i < 5; i++) { int idx = i; @@ -457,10 +457,10 @@ public class ResourceSyncUtil { String numberfield = "" + Util.getDoubleValue(Util.null2String(params.get("numberfield" + idx)), 0); String textfield = Util.null2String(params.get("textfield" + idx)); String tinyintfield = "" + Util.getIntValue(Util.null2String(params.get("tinyintfield" + idx)), 0); - para.append(separator).append(datefield).append(separator).append(numberfield).append(separator).append(textfield).append(separator).append(tinyintfield); + para.append(SEPARATOR).append(datefield).append(SEPARATOR).append(numberfield).append(SEPARATOR).append(textfield).append(SEPARATOR).append(tinyintfield); } rs.executeProc("HrmResourceDefine_Update", para.toString()); - rs.executeProc("HrmResource_CreateInfo", "" + id + separator + userpara + separator + userpara); + rs.executeProc("HrmResource_CreateInfo", "" + id + SEPARATOR + userpara + SEPARATOR + userpara); //421944 用户自定义隐私设置 @@ -492,7 +492,7 @@ public class ResourceSyncUtil { ResourceComInfo.addResourceInfoCache(id); SalaryManager.initResourceSalary(id); - para = new StringBuilder("" + id + separator + managerid + separator + departmentid + separator + subcmpanyid1 + separator + "0" + separator + managerstr); + para = new StringBuilder("" + id + SEPARATOR + managerid + SEPARATOR + departmentid + SEPARATOR + subcmpanyid1 + SEPARATOR + "0" + SEPARATOR + managerstr); rs.executeProc("HrmResource_Trigger_Insert", para.toString()); String sql_1 = ("insert into HrmInfoStatus (itemid,hrmid) values(1," + id + ")"); @@ -532,7 +532,7 @@ public class ResourceSyncUtil { SWFTitle = SystemEnv.getHtmlLabelName(15670, user.getLanguage()); SWFTitle += ":" + lastname; SWFTitle += "-" + CurrentUserName; - SWFTitle += "-" + today; + SWFTitle += "-" + TODAY; SWFRemark = "" + Util.fromScreen2(Subject, user.getLanguage()) + ""; SWFSubmiter = CurrentUser; SysRemindWorkflow.setPrjSysRemind(SWFTitle, 0, Util.getIntValue(SWFSubmiter), SWFAccepter, SWFRemark); @@ -575,7 +575,7 @@ public class ResourceSyncUtil { String homeaddress = Util.null2String(rs.getString("homeaddress")); String tempresidentnumber = Util.null2String(rs.getString("tempresidentnumber")); - para = new StringBuilder("" + id + separator + birthday + separator + folk + separator + nativeplace + separator + regresidentplace + separator + maritalstatus + separator + policy + separator + bememberdate + separator + bepartydate + separator + islabouunion + separator + educationlevel + separator + degree + separator + healthinfo + separator + height + separator + weight + separator + residentplace + separator + homeaddress + separator + tempresidentnumber + separator + certificatenum); + para = new StringBuilder("" + id + SEPARATOR + birthday + SEPARATOR + folk + SEPARATOR + nativeplace + SEPARATOR + regresidentplace + SEPARATOR + maritalstatus + SEPARATOR + policy + SEPARATOR + bememberdate + SEPARATOR + bepartydate + SEPARATOR + islabouunion + SEPARATOR + educationlevel + SEPARATOR + degree + SEPARATOR + healthinfo + SEPARATOR + height + SEPARATOR + weight + SEPARATOR + residentplace + SEPARATOR + homeaddress + SEPARATOR + tempresidentnumber + SEPARATOR + certificatenum); RecordSet rs1 = new RecordSet(); rs1.executeProc("HrmResourcePersonalInfo_Insert", para.toString()); } @@ -810,12 +810,12 @@ public class ResourceSyncUtil { if (StringUtils.isNotEmpty(workcode)) { CodeRuleManager.getCodeRuleManager().checkReservedIfDel(RuleCodeType.USER.getValue(), workcode); } - para = new StringBuilder("" + id + separator + workcode + separator + lastname + separator + sex + separator + resourceimageid - + separator + departmentid + separator + costcenterid + separator + jobtitle + separator + joblevel - + separator + jobactivitydesc + separator + managerid + separator + assistantid + separator + status - + separator + locationid + separator + workroom + separator + telephone + separator + mobile - + separator + mobilecall + separator + fax + separator + jobcall + separator + systemlanguage - + separator + accounttype + separator + belongto + separator + email + separator + dsporder + separator + mobileshowtype); + para = new StringBuilder("" + id + SEPARATOR + workcode + SEPARATOR + lastname + SEPARATOR + sex + SEPARATOR + resourceimageid + + SEPARATOR + departmentid + SEPARATOR + costcenterid + SEPARATOR + jobtitle + SEPARATOR + joblevel + + SEPARATOR + jobactivitydesc + SEPARATOR + managerid + SEPARATOR + assistantid + SEPARATOR + status + + SEPARATOR + locationid + SEPARATOR + workroom + SEPARATOR + telephone + SEPARATOR + mobile + + SEPARATOR + mobilecall + SEPARATOR + fax + SEPARATOR + jobcall + SEPARATOR + systemlanguage + + SEPARATOR + accounttype + SEPARATOR + belongto + SEPARATOR + email + SEPARATOR + dsporder + SEPARATOR + mobileshowtype); RecordSetTrans rst = new RecordSetTrans(); rst.setAutoCommit(false); try { @@ -867,8 +867,8 @@ public class ResourceSyncUtil { } int userid = user.getUID(); - String userpara = "" + userid + separator + today; - rs.executeProc("HrmResource_ModInfo", "" + id + separator + userpara); + String userpara = "" + userid + SEPARATOR + TODAY; + rs.executeProc("HrmResource_ModInfo", "" + id + SEPARATOR + userpara); String managerstr = ""; if (!id.equals(managerid)) { sql = "select managerstr from HrmResource where id = " + Util.getIntValue(managerid); @@ -893,7 +893,7 @@ public class ResourceSyncUtil { rst = new RecordSetTrans(); rst.setAutoCommit(false); try { - para = new StringBuilder("" + id + separator + managerstr); + para = new StringBuilder("" + id + SEPARATOR + managerstr); rst.executeProc("HrmResource_UpdateManagerStr", para.toString()); rst.commit(); } catch (Exception e) { @@ -935,7 +935,7 @@ public class ResourceSyncUtil { rst = new RecordSetTrans(); rst.setAutoCommit(false); try { - para = new StringBuilder(resourceid + separator + nowmanagerstr2); + para = new StringBuilder(resourceid + SEPARATOR + nowmanagerstr2); rst.executeProc("HrmResource_UpdateManagerStr", para.toString()); rst.commit(); ResourceComInfo.updateResourceInfoCache(resourceid); //更新缓存 @@ -947,7 +947,7 @@ public class ResourceSyncUtil { } String subcmpanyid1 = DepartmentComInfo.getSubcompanyid1(departmentid); - para = new StringBuilder("" + id + separator + subcmpanyid1); + para = new StringBuilder("" + id + SEPARATOR + subcmpanyid1); rst = new RecordSetTrans(); rst.setAutoCommit(false); try { @@ -980,7 +980,7 @@ public class ResourceSyncUtil { String numberfield = "" + Util.getDoubleValue(Util.null2String(params.get("numberfield" + idx)), 0); String textfield = Util.null2String(params.get("textfield" + idx)); String tinyintfield = "" + Util.getIntValue(Util.null2String(params.get("tinyintfield" + idx)), 0); - para.append(separator).append(datefield).append(separator).append(numberfield).append(separator).append(textfield).append(separator).append(tinyintfield); + para.append(SEPARATOR).append(datefield).append(SEPARATOR).append(numberfield).append(SEPARATOR).append(textfield).append(SEPARATOR).append(tinyintfield); } rs.executeProc("HrmResourceDefine_Update", para.toString()); diff --git a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java index 8873e792..cc484069 100644 --- a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java +++ b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java @@ -622,7 +622,7 @@ public class HrmImportProcessE9 extends BaseBean { //职级 if (isInteger(vo.getJoblevel())) { - int joblevel = vo.getJoblevel().equals("") ? 0 : Integer.parseInt(vo.getJoblevel()); + int joblevel = "".equals(vo.getJoblevel()) ? 0 : Integer.parseInt(vo.getJoblevel()); hrm.setJoblevel((short) joblevel); } else { hrm.setJoblevel((short) 0); @@ -975,8 +975,9 @@ public class HrmImportProcessE9 extends BaseBean { jobtitle = resourcecominfo.getJobTitle(hrmId); jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); jobactivityname = jobActivitiesComInfo.getJobActivitiesname(jobactivityid); - } else + } else { jobactivityname = vo.getJobactivityid(); + } if (vo.getJobgroupid() == null) { jobtitle = resourcecominfo.getJobTitle(hrmId); jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); @@ -986,10 +987,12 @@ public class HrmImportProcessE9 extends BaseBean { jobgroupname = vo.getJobgroupid(); } int jobtitleid = getJobTitles(vo.getJobtitle(), jobactivityname, jobgroupname); - hrm.setJobtitle(new Integer(jobtitleid)); + hrm.setJobtitle(jobtitleid); } - if (Util.getIntValue(hrmId) < 0) continue; + if (Util.getIntValue(hrmId) < 0) { + continue; + } //上级id String managerstr = ""; //所有上级 @@ -1189,7 +1192,7 @@ public class HrmImportProcessE9 extends BaseBean { //职级 if (isInteger(vo.getJoblevel())) { - int joblevel = vo.getJoblevel().equals("") ? 0 : Integer.parseInt(vo.getJoblevel()); + int joblevel = "".equals(vo.getJoblevel()) ? 0 : Integer.parseInt(vo.getJoblevel()); hrm.setJoblevel((short) joblevel); } @@ -2115,7 +2118,7 @@ public class HrmImportProcessE9 extends BaseBean { /* 获取jobgroupid 职务类别 */ String selSql = "select id from HrmJobGroups where ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(jobgroupname))," + userlanguage + ")))='" + jobgroupname + "'"; - if (recordSet.getDBType().equalsIgnoreCase("oracle") || DialectUtil.isMySql(recordSet.getDBType()) || recordSet.getDBType().equalsIgnoreCase("postgresql")) { + if ("oracle".equalsIgnoreCase(recordSet.getDBType()) || DialectUtil.isMySql(recordSet.getDBType()) || "postgresql".equalsIgnoreCase(recordSet.getDBType())) { selSql = "select id from HrmJobGroups where ltrim(rtrim(convToMultiLang(ltrim(rtrim(jobgroupname))," + userlanguage + ")))='" + jobgroupname + "'"; } @@ -2135,7 +2138,7 @@ public class HrmImportProcessE9 extends BaseBean { /* 获取jobactivityid 职务 */ selSql = "select id from HrmJobActivities where ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(jobactivityname))," + userlanguage + ")))='" + jobactivityname + "' and jobgroupid=" + jobgroupid; - if (recordSet.getDBType().equalsIgnoreCase("oracle") || DialectUtil.isMySql(recordSet.getDBType()) || recordSet.getDBType().equalsIgnoreCase("postgresql")) { + if ("oracle".equalsIgnoreCase(recordSet.getDBType()) || DialectUtil.isMySql(recordSet.getDBType()) || "postgresql".equalsIgnoreCase(recordSet.getDBType())) { selSql = "select id from HrmJobActivities where ltrim(rtrim(convToMultiLang(ltrim(rtrim(jobactivityname))," + userlanguage + ")))='" + jobactivityname + "' and jobgroupid=" + jobgroupid; } @@ -2150,7 +2153,7 @@ public class HrmImportProcessE9 extends BaseBean { /*获取岗位id*/ selSql = "select id from HrmJobTitles where ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(jobtitlemark))," + userlanguage + ")))='" + jobtitlename + "' and jobactivityid=" + jobactivityid; - if (recordSet.getDBType().equalsIgnoreCase("oracle") || DialectUtil.isMySql(recordSet.getDBType()) || recordSet.getDBType().equalsIgnoreCase("postgresql")) { + if ("oracle".equalsIgnoreCase(recordSet.getDBType()) || DialectUtil.isMySql(recordSet.getDBType()) || "postgresql".equalsIgnoreCase(recordSet.getDBType())) { selSql = "select id from HrmJobTitles where ltrim(rtrim(convToMultiLang(ltrim(rtrim(jobtitlemark))," + userlanguage + ")))='" + jobtitlename + "' and jobactivityid=" + jobactivityid; } diff --git a/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java b/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java index 1dcc33e0..c7beb66d 100644 --- a/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java +++ b/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java @@ -13,9 +13,7 @@ import weaver.general.Util; import weaver.interfaces.schedule.BaseCronJob; import java.sql.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 定时任务刷新在岗数、编制数 @@ -91,7 +89,7 @@ public class JobAndPlanCron extends BaseCronJob { JclOrgMap jclOrgMap = getJclOrgMapMapper().getSumPlanAndJobByFParentId(date, fparentid); getJclOrgMapMapper().updateMapById(Integer.parseInt(fparentid), jclOrgMap.getFPlan(), null, date); - if (fparentid.equals("-1")) { + if ("-1".equals(fparentid)) { countJobAndPlans(ftype, Integer.parseInt(fparentid), String.valueOf(currentDate)); } }