考勤-批量请假，明细表1数据生成按钮接口、批量请假流程节点action中未休时长数据更新逻辑优化

src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowArchivingAction.java

@@ -26,25 +26,24 @@ public class BatchAskForLeaveWorkFlowArchivingAction implements Action {
 
         // 流程表单主表数据
         HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
-        log.debug("mainTableData : [{}]",mainTableData);
+        log.info("mainTableData : [{}]",mainTableData);
         // 流程表单明细表1数据
         List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
-        log.debug("detailTableData : [{}]",detailTableData);
+        log.info("detailTableData : [{}]",detailTableData);
 
         //流程表单明细表2数据
         List<Map<String, String>> detailTable2 = CommonUtil.getDetailTableInfo(requestInfo,1);
-        log.debug("detailTableData : [{}]",detailTable2);
+        log.info("detailTable2Data : [{}]",detailTable2);
 
         //第一笔开始时间
-        String firstStartDate = detailTableData.get(0).get("ksrq");
+//        String firstStartDate = detailTableData.get(0).get("ksrq");
 
-        String sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye where and sxrq<=? and yqsxrq>=? order by sxrq";
+        String sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye order by sxrq";
 
-        List<Map<String,Object>> holidayBalanceList = DbTools.getSqlToList(sql,firstStartDate,firstStartDate);
+        List<Map<String,Object>> holidayBalanceList = DbTools.getSqlToList(sql);
 
         Map<String,Object> holidayBalanceMap = holidayBalanceList.stream().collect(Collectors.toMap(e->e.get("id").toString(), e->e));
-
-
+//        log.info("holidayBalanceMap : [{}]",holidayBalanceMap);
         try {
             if (detailTable2.size() > 0) {
                 Map<String,Object> balanceMap = Maps.newHashMap();
@@ -60,7 +59,7 @@ public class BatchAskForLeaveWorkFlowArchivingAction implements Action {
                     String id = entry.getKey();
                     double ztsc = Double.valueOf(entry.getValue().toString());
                     Map<String,Object> map =  (Map<String,Object>)holidayBalanceMap.get(id);
-
+//                    log.info(id + "-map : [{}]",map);
                     double havedztsc = Util.null2String(map.get("ztsc")).equals("") ? 0 : Double.valueOf(map.get("ztsc").toString());
                     double havedyxsc = Util.null2String(map.get("yxsc")).equals("") ? 0 : Double.valueOf(map.get("yxsc").toString());
 

src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java

@@ -107,9 +107,10 @@ public class BatchAskForLeaveWorkFlowSubmitAction implements Action {
                 double havedwxsc = Util.null2String(map.get("wxsc")).equals("") ? 0 : Double.valueOf(map.get("wxsc").toString());
 
                 double updatedztsc = Utils.add(havedztsc, ztsc);
+                double updatedwxsc = Utils.subtract(havedwxsc, ztsc);
 
                 String updateSql = "update uf_jcl_kq_jqye set wxsc=?,ztsc=? where id=?";
-                if (!DbTools.update(updateSql, havedwxsc, updatedztsc, id)) {
+                if (!DbTools.update(updateSql, updatedwxsc, updatedztsc, id)) {
                     //更新假期余额失败
                     String message = "更新假期余额失败";
                     log.error(message);

src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java

@@ -147,6 +147,7 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
             List<String> errorMessage = new ArrayList<>();
             // 流程表单主表数据
             Map<String,String> mainTableData = (Map<String,String>)params.get("mainTableData");
+            log.info("mainTableData : {}", mainTableData);
             // 流程表单明细表1数据
             List<Map<String, String>> detailTableData = (List<Map<String, String>>)params.get("detailTableData");
             //需要校验假期额度的假期类型