老代码提交

src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java

@@ -310,6 +310,9 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
       }
       bb.writeLog("laborCompaniesMap: " + laborCompaniesMap);
       /*考勤二开--劳务公司end*/
+      /*考勤二开--入离职时间start*/
+      Map<String, Map<String, String>> employAndResignDates = getAllEmployAndResignDateById();
+      /*考勤二开--入离职时间end*/
 
       rs.execute(sql);
       while (rs.next()) {
@@ -410,11 +413,13 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
             fieldValue = overtimeType;
           }else if(fieldName.equals("companystartdate")){
             //根据id查询入职日期
-            Map<String, String> map = getEmployAndResignDateById(id);
+            //Map<String, String> map = getEmployAndResignDateById(id);
+            Map<String, String> map = employAndResignDates.get(id);
             fieldValue = map.get("companystartdate");
           }else if(fieldName.equals("resignDate")){
             //根据id查询离职日期
-            Map<String, String> map = getEmployAndResignDateById(id);
+            //Map<String, String> map = getEmployAndResignDateById(id);
+            Map<String, String> map = employAndResignDates.get(id);
             fieldValue = map.get("resignDate");
           }else if(fieldName.equals("jobtitle")){
             String tmpJobtitleId = Util.null2String(rs.getString("jobtitle"));
@@ -834,6 +839,31 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
     map.put("resignDate",field30);
     return map;
   }
+  /*获取人员入离职时间*/
+  private Map<String,Map<String,String>> getAllEmployAndResignDateById(){
+    RecordSet rs = new RecordSet();
+    Map<String,Map<String,String>> result = new HashMap<>();
+
+    String companystartdate = "";//入职时间
+    String id = "";//人员
+    String created = "";//创建日期
+    String field30 = "";//离职时间
+    String sql = "select a.id, b.companystartdate,b.created,a.field30 from cus_fielddata a  left join hrmresource b  on" +
+            " a.id = b.id where a.scope='HrmCustomFieldByInfoType' and a.scopeid= 3 ";
+    rs.executeQuery(sql);
+    while (rs.next()){
+      id = Util.null2String(rs.getString("id"));
+      companystartdate = Util.null2String(rs.getString("companystartdate"));
+      created = Util.null2String(rs.getString("created"));
+      field30 = Util.null2String(rs.getString("field30"));
+      Map<String,String> map = new HashMap<>();
+      companystartdate = "".equals(companystartdate)?created:companystartdate;
+      map.put("companystartdate",companystartdate);
+      map.put("resignDate",field30);
+      result.put(id, map);
+    }
+    return result;
+  }
 
   private Map<String,Object> getChildColumnsInfo(String parentid, User user){
     Map<String,Object> returnMap = new HashMap<>();

src/com/engine/kq/cmd/report/ExportExcelCmd.java

@@ -448,11 +448,13 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
             fieldValue = overtimeType;
           }else if(fieldName.equals("companystartdate")){
             //根据id查询入职日期
-            Map<String, String> map = getEmployAndResignDateById(id);
+            //Map<String, String> map = getEmployAndResignDateById(id);
+            Map<String, String> map = employAndResignDates.get(id);
             fieldValue = map.get("companystartdate");
           }else if(fieldName.equals("resignDate")){
             //根据id查询离职日期
-            Map<String, String> map = getEmployAndResignDateById(id);
+            //Map<String, String> map = getEmployAndResignDateById(id);
+            Map<String, String> map = employAndResignDates.get(id);
             fieldValue = map.get("resignDate");
           }else if (fieldName.equals("jobtitle")) {
             String tmpJobtitleId = Util.null2String(rs.getString("jobtitle"));

src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java

@@ -295,6 +295,10 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
 			String isShowFullPath = Util.null2String(kqSettingsComInfo.getMain_val(fullPathMainKey),"0");
 
 			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+			/*考勤二开--入离职时间start*/
+			Map<String, Map<String, String>> employAndResignDates = getAllEmployAndResignDateById();
+			/*考勤二开--入离职时间end*/
 			rs.execute(sql);
 			writeLog("howec::::::::::::::::sql:"+sql);
 			while (rs.next()) {
@@ -413,12 +417,14 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
 						data.put(fieldName,fieldValue);
 					}else if(fieldName.equals("companystartdate")){
 						//根据id查询入职日期
-						Map<String, String> map = getEmployAndResignDateById(id);
+						//Map<String, String> map = getEmployAndResignDateById(id);
+						Map<String, String> map = employAndResignDates.get(id);
 						fieldValue = map.get("companystartdate");
 						data.put(fieldName,fieldValue);
 					}else if(fieldName.equals("resignDate")){
 						//根据id查询离职日期
-						Map<String, String> map = getEmployAndResignDateById(id);
+						//Map<String, String> map = getEmployAndResignDateById(id);
+						Map<String, String> map = employAndResignDates.get(id);
 						fieldValue = map.get("resignDate");
 						data.put(fieldName,fieldValue);
 					} else if (fieldName.equals("jobtitle")) {
@@ -725,6 +731,31 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
 		map.put("resignDate",field30);
 		return map;
 	}
+	/*获取人员入离职时间*/
+	private Map<String,Map<String,String>> getAllEmployAndResignDateById(){
+		RecordSet rs = new RecordSet();
+		Map<String,Map<String,String>> result = new HashMap<>();
+
+		String companystartdate = "";//入职时间
+		String id = "";//人员
+		String created = "";//创建日期
+		String field30 = "";//离职时间
+		String sql = "select a.id, b.companystartdate,b.created,a.field30 from cus_fielddata a  left join hrmresource b  on" +
+				" a.id = b.id where a.scope='HrmCustomFieldByInfoType' and a.scopeid= 3 ";
+		rs.executeQuery(sql);
+		while (rs.next()){
+			id = Util.null2String(rs.getString("id"));
+			companystartdate = Util.null2String(rs.getString("companystartdate"));
+			created = Util.null2String(rs.getString("created"));
+			field30 = Util.null2String(rs.getString("field30"));
+			Map<String,String> map = new HashMap<>();
+			companystartdate = "".equals(companystartdate)?created:companystartdate;
+			map.put("companystartdate",companystartdate);
+			map.put("resignDate",field30);
+			result.put(id, map);
+		}
+		return result;
+	}
 
 
 	private String getUnitType(String unitType, User user){

src/com/engine/kq/cmd/report/GetKQReportCmd.java

@@ -493,12 +493,14 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 						fieldValue = overtimeType;
 					}else if(fieldName.equals("companystartdate")){
 						//根据id查询入职日期
-						Map<String, String> map = getEmployAndResignDateById(id);
+						//Map<String, String> map = getEmployAndResignDateById(id);
+						Map<String, String> map = employAndResignDates.get(id);
 						data.put("companystartdate",map.get("companystartdate"));
 						fieldValue = map.get("companystartdate");
 					}else if(fieldName.equals("resignDate")){
 						//根据id查询离职日期
-						Map<String, String> map = getEmployAndResignDateById(id);
+						//Map<String, String> map = getEmployAndResignDateById(id);
+						Map<String, String> map = employAndResignDates.get(id);
 						data.put("resignDate",map.get("resignDate"));
 						fieldValue = map.get("resignDate");
 					} else if(fieldName.equals("jobtitle")){