修改打印日志

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java

@@ -111,7 +111,7 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
             }
 
             sql = sql.substring(0,sql.length()-1) +" where ygid=? and rq=?";
-            log.info("update sql : {}",sql);
+            log.debug("update sql : {}",sql);
             DbTools.update(sql,userId,analysisDate);
         }else {
             sql = "select subcompanyid1,departmentid,jobtitle from hrmresource  where id=?";
@@ -170,8 +170,8 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
             }
             value = value.substring(0,value.length()-1);
             sql  = sql +cloumns +") values ("+value+")";
-            log.info("insert sql : {}",sql);
-            log.info("insert data : {}",insertDatas);
+            log.debug("insert sql : {}",sql);
+            log.debug("insert data : {}",insertDatas);
             DbTools.update(sql,insertDatas.toArray());
 
         }

src/com/engine/jucailinkq/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java

@@ -40,7 +40,7 @@ public class AttendanceAnalysisJob extends BaseCronJob {
     private String executeDate;
     @Override
     public void execute() {
-        log.debug("********AttendanceAnalysisJob  start********");
+        log.info("********AttendanceAnalysisJob  start********");
 
         if (executeDate == null || "".equals(executeDate)){
             executeDate = DateUtil.getCurrentDate();
@@ -112,6 +112,6 @@ public class AttendanceAnalysisJob extends BaseCronJob {
         param.put("startDate",DateUtil.beforeDay(allDateList.get(0),2));
         param.put("endDate",executeDate);
         allowanceService.addAllowanceRecords(param);
-        log.debug("********AttendanceAnalysisJob  end********");
+        log.info("********AttendanceAnalysisJob  end********");
     }
 }

src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java

@@ -46,6 +46,7 @@ public class AttendanceanalysisAction {
     @Produces({"text/plain"})
     public String getSchedulingData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
+            log.info("********AttendanceAnalysisJob  start********");
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
 //            paramMap.put("startDate","2024-08-11");
@@ -191,6 +192,7 @@ public class AttendanceanalysisAction {
                 paramMap.put("empIds",paramMap.get("userIds"));
                 allowanceService.addAllowanceRecords(paramMap);
             }
+            log.info("********AttendanceAnalysisJob  start********");
             return null;
         }catch (Exception e){
             log.error("execute fail,catch error: [{}]",e);

src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java

@@ -96,7 +96,7 @@ public class AttendanceAnalysisWrapper extends Service {
      * @param attendanceItems 人员考勤项目
      */
     public void attendanceAnalysisForApi(String userId, String analysisDate, List<Map<String, Object>> dataList, List<Map<String, Object>> attendanceItems, Map<String, Object> schedulMap, List<Map<String, Object>> workHourItems, Map<String, Map<String, Object>> clockInTimeMap,List<Map<String,Object>> attendaceResult) {
-        log.info("***********analysis userId:{},analysisDate:{} start***********", userId, analysisDate);
+        log.debug("***********analysis userId:{},analysisDate:{} start***********", userId, analysisDate);
         log.debug("clockInTimeDate : [{}]", dataList);
         log.debug("attendaceResult : [{}]",attendaceResult);
         if (attendaceResult!=null && attendaceResult.size()>0 && (CheckBoxEnum.CHECKED.getKey().equals(attendaceResult.get(0).get("sgsj")) ||

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

@@ -47,6 +47,7 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action {
         List<Map<String,Object>> holidayBalanceList = DbTools.getSqlToList(sql);
 
         Map<String,Object> holidayBalanceMap = holidayBalanceList.stream().collect(Collectors.toMap(e->e.get("id").toString(), e->e));
+
         try {
             if (detailTable2.size() > 0) {
                 Map<String,Object> balanceMap = Maps.newHashMap();
@@ -57,17 +58,19 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action {
                     sysc = Utils.add(sysc,havedSysc);
                     balanceMap.put(jqye,sysc);
                 }
-
+                log.info("balanceMap : [{}]",balanceMap);
                 for (Map.Entry<String,Object> entry:balanceMap.entrySet()){
                     String id = entry.getKey();
                     double ztsc = Double.valueOf(entry.getValue().toString());
                     Map<String,Object> map =  (Map<String,Object>)holidayBalanceMap.get(id);
                     boolean updateSign = true;
+                    log.info("jlzt : [{}]",jlzt);
                     if ("1".equals(jlzt)) {
                         double havedyxsc = Util.null2String(map.get("yxsc")).equals("") ? 0 : Double.valueOf(map.get("yxsc").toString());
 
                         double updatedyxsc = Utils.subtract(havedyxsc,ztsc);
 
+                        log.info("updatedyxsc : [{}],id:[{}]",updatedyxsc,id);
                         String updateSql = "update uf_jcl_kq_jqye set yxsc=? where id=?";
                         updateSign = DbTools.update(updateSql,updatedyxsc,id);
                     } else if("0".equals(jlzt)){
@@ -77,11 +80,12 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action {
                         double updatedztsc = Utils.subtract(havedztsc,ztsc);
                         double updatedwxsc = Utils.add(havedwxsc,ztsc);
 
+                        log.info("updatedwxsc : [{}],updatedztsc:[{}],id:[{}]",updatedwxsc,updatedztsc,id);
                         String updateSql = "update uf_jcl_kq_jqye set wxsc=?,ztsc=? where id=?";
                         updateSign = DbTools.update(updateSql,updatedwxsc,updatedztsc,id);
                     }
 
-
+                    log.info("updateSign : [{}]",updateSign);
                     if (!updateSign){
                         //更新假期余额失败
                         String message = "更新假期余额失败";

src/com/engine/jucailinkq/attendance/workflow/proxy/DoRepossessedProxyCmd.java

@@ -0,0 +1,38 @@
+package com.engine.jucailinkq.attendance.workflow.proxy;
+
+import com.engine.core.cfg.annotation.CommandDynamicProxy;
+import com.engine.core.interceptor.AbstractCommandProxy;
+import com.engine.core.interceptor.Command;
+import com.engine.workflow.cmd.monitor.DoRepossessedCmd;
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.workflow.workflow.RequestForceDrawBack;
+
+import java.util.Map;
+
+
+/**
+ * 流程强制收回代理类
+ */
+@CommandDynamicProxy(target = DoRepossessedCmd.class, desc="流程强制收回")
+public class DoRepossessedProxyCmd extends AbstractCommandProxy<Map<String,Object>> {
+    @Override
+    public Map<String, Object> execute(Command<Map<String, Object>> command) {
+        Map<String, Object> resultMap = nextExecute(command);
+
+        RecordSet rs = new RecordSet();
+        BaseBean bb = new BaseBean();
+        Map<String, Object> requestMap = (Map<String, Object>)resultMap.get("result");
+        bb.writeLog("DoRepossessedProxyCmd requestMap"+requestMap.toString());
+        requestMap.entrySet().forEach(e->{
+            String requestId = e.getKey();
+            String status = e.getValue().toString();
+            if (status.equals(RequestForceDrawBack.SUCCESS)){
+                rs.executeProc("workflow_Requestbase_SByID", requestId);
+                int workflowid = rs.getInt("workflowid");
+            }
+        });
+
+        return resultMap;
+    }
+}