|
|
|
@ -51,8 +51,10 @@ public class BatchAskForLeaveWorkFlowSubmitAction implements Action {
|
|
|
|
|
Map<String, List<Map<String, String>>> detail1TabDataGroupByJqlx = detailTableData.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("qjlx"))));
|
|
|
|
|
for(Map.Entry<String,List<Map<String,String>>> entry : detail1TabDataGroupByJqlx.entrySet()) {
|
|
|
|
|
if (checkAmountJqIdList.contains(entry.getKey())) {
|
|
|
|
|
String sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye where jqid=? and sxrq<=? and yqsxrq>=? order by sxrq";
|
|
|
|
|
List<Map<String, Object>> holidayBalanceList = DbTools.getSqlToList(sql, entry.getKey(), firstStartDate, firstStartDate);
|
|
|
|
|
// String sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye where jqid=? and sxrq<=? and yqsxrq>=? order by sxrq";
|
|
|
|
|
// List<Map<String, Object>> holidayBalanceList = DbTools.getSqlToList(sql, entry.getKey(), firstStartDate, firstStartDate);
|
|
|
|
|
String sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye where jqid=?";
|
|
|
|
|
List<Map<String, Object>> holidayBalanceList = DbTools.getSqlToList(sql, entry.getKey());
|
|
|
|
|
if (holidayBalanceList.size() > 0) {
|
|
|
|
|
holidayBalanceMap.putAll(holidayBalanceList.stream().collect(Collectors.toMap(e -> e.get("id").toString(), e -> e)));
|
|
|
|
|
}
|
|
|
|
|