|
|
@ -9,7 +9,6 @@ import com.engine.core.impl.Service;
|
|
|
|
import com.engine.kq.biz.KQHolidaySetBiz;
|
|
|
|
import com.engine.kq.biz.KQHolidaySetBiz;
|
|
|
|
import com.engine.kq.biz.KQReportBiz;
|
|
|
|
import com.engine.kq.biz.KQReportBiz;
|
|
|
|
import com.engine.kq.util.PageUidFactory;
|
|
|
|
import com.engine.kq.util.PageUidFactory;
|
|
|
|
import weaver.backup.logging.Logger;
|
|
|
|
|
|
|
|
import weaver.conn.RecordSet;
|
|
|
|
import weaver.conn.RecordSet;
|
|
|
|
import weaver.general.BaseBean;
|
|
|
|
import weaver.general.BaseBean;
|
|
|
|
import weaver.general.TimeUtil;
|
|
|
|
import weaver.general.TimeUtil;
|
|
|
@ -44,10 +43,10 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
public Map<String, Object> addAttendanceSummary(Map<String, Object> params) {
|
|
|
|
public Map<String, Object> addAttendanceSummary(Map<String, Object> params) {
|
|
|
|
|
|
|
|
|
|
|
|
bs.writeLog("params : " + params);
|
|
|
|
bs.writeLog("params : " + params);
|
|
|
|
|
|
|
|
String mainIds = Util.null2String(params.get("mainIds"));
|
|
|
|
|
|
|
|
bs.writeLog("mainIds : " + mainIds);
|
|
|
|
ExecutorService taskExecutor = Executors.newCachedThreadPool();
|
|
|
|
ExecutorService taskExecutor = Executors.newCachedThreadPool();
|
|
|
|
taskExecutor.execute(() -> {
|
|
|
|
taskExecutor.execute(() -> {
|
|
|
|
String mainIds = Util.null2String(params.get("mainIds"));
|
|
|
|
|
|
|
|
bs.writeLog("mainids : " + mainIds);
|
|
|
|
|
|
|
|
List<String> mainIdList = new ArrayList<>();
|
|
|
|
List<String> mainIdList = new ArrayList<>();
|
|
|
|
if (!mainIds.equals("")) {
|
|
|
|
if (!mainIds.equals("")) {
|
|
|
|
mainIdList = Arrays.asList(mainIds.split(","));
|
|
|
|
mainIdList = Arrays.asList(mainIds.split(","));
|
|
|
@ -101,14 +100,15 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
list.add(map.get("lf"));
|
|
|
|
list.add(map.get("lf"));
|
|
|
|
list.add(map.get("ls"));
|
|
|
|
list.add(map.get("ls"));
|
|
|
|
list.add(map.get("lt"));
|
|
|
|
list.add(map.get("lt"));
|
|
|
|
list.add(map.get("gsfb"));
|
|
|
|
list.add(map.get("gzfb"));
|
|
|
|
list.add(map.get("gsbm"));
|
|
|
|
list.add(map.get("gzbm"));
|
|
|
|
|
|
|
|
|
|
|
|
dataList.add(list);
|
|
|
|
dataList.add(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(dataList.size()>0){
|
|
|
|
bs.writeLog("dataList_size : " + dataList.size());
|
|
|
|
|
|
|
|
if(dataList.size() > 0){
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
bs.writeLog("addlist :[{}]", (Throwable) dataList);
|
|
|
|
bs.writeLog("入库开始---");
|
|
|
|
boolean insertSign =rs.executeBatchSql(insertSql,dataList);
|
|
|
|
boolean insertSign =rs.executeBatchSql(insertSql,dataList);
|
|
|
|
bs.writeLog("insertSign : " + insertSign);
|
|
|
|
bs.writeLog("insertSign : " + insertSign);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -204,9 +204,9 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
column = new HashMap<>();
|
|
|
|
column = new HashMap<>();
|
|
|
|
column.put("title", kqxm.get("mc"));
|
|
|
|
column.put("title", kqxm.get("mc"));
|
|
|
|
column.put("unit", unit);
|
|
|
|
column.put("unit", unit);
|
|
|
|
column.put("dataIndex", "kqxm" + kqxm.get("id"));
|
|
|
|
column.put("dataIndex", "kqxm" + "_" + kqxm.get("id"));
|
|
|
|
column.put("type", "kqxm" + kqxm.get("id"));
|
|
|
|
column.put("type", "kqxm" + "_" + kqxm.get("id"));
|
|
|
|
column.put("key", "kqxm" + kqxm.get("id"));
|
|
|
|
column.put("key", "kqxm" + "_" + kqxm.get("id"));
|
|
|
|
column.put("rowSpan", 3);
|
|
|
|
column.put("rowSpan", 3);
|
|
|
|
column.put("width", 105);
|
|
|
|
column.put("width", 105);
|
|
|
|
column.put("showDetial", "1");
|
|
|
|
column.put("showDetial", "1");
|
|
|
@ -240,11 +240,11 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
Map<String, String> itemMap = new HashMap<>();
|
|
|
|
Map<String, String> itemMap = new HashMap<>();
|
|
|
|
if (groupData.get(groupKey) == null) {
|
|
|
|
if (groupData.get(groupKey) == null) {
|
|
|
|
//尚未存在则新建,加入
|
|
|
|
//尚未存在则新建,加入
|
|
|
|
itemMap.put("resourceId", map.get("ry").toString());
|
|
|
|
itemMap.put("resourceId", Util.null2String(map.get("ry")));
|
|
|
|
itemMap.put("lastname", resourceComInfo.getLastname(Util.null2String(map.get("ry"))));
|
|
|
|
itemMap.put("lastname", resourceComInfo.getLastname(Util.null2String(map.get("ry"))));
|
|
|
|
itemMap.put("subcompanyId", map.get("gzfb").toString());
|
|
|
|
itemMap.put("subcompanyId", Util.null2String(map.get("gzfb")));
|
|
|
|
itemMap.put("subcompany", subCompanyComInfo.getSubcompanyname(Util.null2String(map.get("gzfb"))));
|
|
|
|
itemMap.put("subcompany", subCompanyComInfo.getSubcompanyname(Util.null2String(map.get("gzfb"))));
|
|
|
|
itemMap.put("departmentId", map.get("gzbm").toString());
|
|
|
|
itemMap.put("departmentId", Util.null2String(map.get("gzbm")));
|
|
|
|
itemMap.put("department", departmentComInfo.getDepartmentName(Util.null2String(map.get("gzbm"))));
|
|
|
|
itemMap.put("department", departmentComInfo.getDepartmentName(Util.null2String(map.get("gzbm"))));
|
|
|
|
//设置考勤项目累计数值,累天、累时、累分最多有一个有值,都没有则取累次
|
|
|
|
//设置考勤项目累计数值,累天、累时、累分最多有一个有值,都没有则取累次
|
|
|
|
String cumulativeValue = Util.null2String(map.get("lt")) + Util.null2String(map.get("ls")) + Util.null2String(map.get("lf"));
|
|
|
|
String cumulativeValue = Util.null2String(map.get("lt")) + Util.null2String(map.get("ls")) + Util.null2String(map.get("lf"));
|
|
|
@ -672,8 +672,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
itemMap.put("mainid", mainId);
|
|
|
|
itemMap.put("mainid", mainId);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("gsfb", gsfb);
|
|
|
|
itemMap.put("gzfb", gsfb);
|
|
|
|
itemMap.put("gsbm", gsbm);
|
|
|
|
itemMap.put("gzbm", gsbm);
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
@ -726,8 +726,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
itemMap.put("mainid", mainId);
|
|
|
|
itemMap.put("mainid", mainId);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("gsfb", gsfb);
|
|
|
|
itemMap.put("gzfb", gsfb);
|
|
|
|
itemMap.put("gsbm", gsbm);
|
|
|
|
itemMap.put("gzbm", gsbm);
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
|
|
|
|
|
|
|
|
bdkAddList.add(itemMap);
|
|
|
|
bdkAddList.add(itemMap);
|
|
|
@ -784,8 +784,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
itemMap.put("mainid", mainId);
|
|
|
|
itemMap.put("mainid", mainId);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("gsfb", gsfb);
|
|
|
|
itemMap.put("gzfb", gsfb);
|
|
|
|
itemMap.put("gsbm", gsbm);
|
|
|
|
itemMap.put("gzbm", gsbm);
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
@ -1056,8 +1056,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
Map<String, Object> itemMap = new HashMap<>();
|
|
|
|
Map<String, Object> itemMap = new HashMap<>();
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("gsfb", gsfb);
|
|
|
|
itemMap.put("gzfb", gsfb);
|
|
|
|
itemMap.put("gsbm", gsbm);
|
|
|
|
itemMap.put("gzbm", gsbm);
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
@ -1120,8 +1120,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
Map<String, Object> itemMap = new HashMap<>();
|
|
|
|
Map<String, Object> itemMap = new HashMap<>();
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("gsfb", gsfb);
|
|
|
|
itemMap.put("gzfb", gsfb);
|
|
|
|
itemMap.put("gsbm", gsbm);
|
|
|
|
itemMap.put("gzbm", gsbm);
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
|
|
|
|
|
|
|
|
bdkAddList.add(itemMap);
|
|
|
|
bdkAddList.add(itemMap);
|
|
|
@ -1188,8 +1188,8 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
|
|
|
|
Map<String, Object> itemMap = new HashMap<>();
|
|
|
|
Map<String, Object> itemMap = new HashMap<>();
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("ry", ry);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("kqxm", kqxm);
|
|
|
|
itemMap.put("gsfb", gsfb);
|
|
|
|
itemMap.put("gzfb", gsfb);
|
|
|
|
itemMap.put("gsbm", gsbm);
|
|
|
|
itemMap.put("gzbm", gsbm);
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
itemMap.put("lc", String.valueOf(num));
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
if (accountUnit.equals("0")) {
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
|
itemMap.put("lt", String.valueOf(time));
|
|
|
|