From 0dab7a93492bbb914d1242c194b131ede649055a Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Mon, 19 Aug 2024 15:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendanceanalysis/cmd/RecordDataCmd.java | 6 +-- .../job/AttendanceAnalysisJob.java | 4 +- .../web/AttendanceanalysisAction.java | 2 + .../wrapper/AttendanceAnalysisWrapper.java | 2 +- .../BatchAskForLeaveWorkFlowBackAction.java | 8 +++- .../workflow/proxy/DoRepossessedProxyCmd.java | 38 +++++++++++++++++++ 6 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 src/com/engine/jucailinkq/attendance/workflow/proxy/DoRepossessedProxyCmd.java diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java index db17838..160453b 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java @@ -111,7 +111,7 @@ public class RecordDataCmd extends AbstractCommonCommand> { } 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> { } 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()); } diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java index fa3e932..496fb15 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java +++ b/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********"); } } diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java index 78ea0b4..a8b77dd 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java +++ b/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 paramMap = ParamUtil.request2Map(request); // Map 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); diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java index 7009f1a..ec25665 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java +++ b/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> dataList, List> attendanceItems, Map schedulMap, List> workHourItems, Map> clockInTimeMap,List> 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")) || diff --git a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java index 02fe67f..700294b 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java +++ b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java @@ -47,6 +47,7 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action { List> holidayBalanceList = DbTools.getSqlToList(sql); Map holidayBalanceMap = holidayBalanceList.stream().collect(Collectors.toMap(e->e.get("id").toString(), e->e)); + try { if (detailTable2.size() > 0) { Map 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 entry:balanceMap.entrySet()){ String id = entry.getKey(); double ztsc = Double.valueOf(entry.getValue().toString()); Map map = (Map)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 = "更新假期余额失败"; diff --git a/src/com/engine/jucailinkq/attendance/workflow/proxy/DoRepossessedProxyCmd.java b/src/com/engine/jucailinkq/attendance/workflow/proxy/DoRepossessedProxyCmd.java new file mode 100644 index 0000000..a80805c --- /dev/null +++ b/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> { + @Override + public Map execute(Command> command) { + Map resultMap = nextExecute(command); + + RecordSet rs = new RecordSet(); + BaseBean bb = new BaseBean(); + Map requestMap = (Map)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; + } +}