From 6ba1c8ae0f33f8922feff72d9dc248493e5d279a Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 28 Feb 2023 15:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AbroadBusinessCountServiceImpl.java | 4 ++-- .../service/impl/EmployeeIdentifiedServiceImpl.java | 6 +++--- .../service/impl/GetKQ4MonthBonusServiceImpl.java | 3 +-- .../service/impl/MonthBonusCountServiceImpl.java | 12 ++++++------ .../impl/OverseasAllowanceCountServiceImpl.java | 11 +++++------ weaver-bjcj.iml | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/com/engine/bjcj220907/service/impl/AbroadBusinessCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/AbroadBusinessCountServiceImpl.java index 9a3a6da..e83fb0c 100644 --- a/src/com/engine/bjcj220907/service/impl/AbroadBusinessCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/AbroadBusinessCountServiceImpl.java @@ -224,7 +224,7 @@ public class AbroadBusinessCountServiceImpl extends Service implements AbroadBus // 处理艰苦地区补助 handleJkdqbt(build, searchMonthDetails, jkdqbtDates); results.add(build); - baseBean.writeLog("用户："+detail.get(0).getXm()+"前30天连续出差天数："+lastMonthCount+"本周期短期出差天数："+thisMonthCount+"长期出差天数："+thisMonthAbroadCount); +// baseBean.writeLog("用户："+detail.get(0).getXm()+"前30天连续出差天数："+lastMonthCount+"本周期短期出差天数："+thisMonthCount+"长期出差天数："+thisMonthAbroadCount); } baseBean.writeLog("开始获取岗级、薪点、补贴标准信息等数据"); results = results.stream().map(result -> { @@ -234,7 +234,7 @@ public class AbroadBusinessCountServiceImpl extends Service implements AbroadBus baseBean.writeLog("开始获取并计算艰苦地区补助,并计算境外工龄年份"); getDqBonus(results); // 计算结果插入建模表中 - baseBean.writeLog("计算结果插入建模表中"+results); + baseBean.writeLog("计算结果插入建模表中"+results.size()); getAbroadBusinessDAO().insertResult(results,param.getMonth()); return "success"; } diff --git a/src/com/engine/bjcj220907/service/impl/EmployeeIdentifiedServiceImpl.java b/src/com/engine/bjcj220907/service/impl/EmployeeIdentifiedServiceImpl.java index af393ad..b7a7dba 100644 --- a/src/com/engine/bjcj220907/service/impl/EmployeeIdentifiedServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/EmployeeIdentifiedServiceImpl.java @@ -39,13 +39,13 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId ArrayList needAddInfo = new ArrayList<>(); addRybsInfo(list, needAddInfo, cal); getEmployeeIdentifiedDAO().addInfo(needAddInfo); - baseBean.writeLog("根据时间给入转调离赋值，共"+needAddInfo.size()+"条，：",needAddInfo); + baseBean.writeLog("根据时间给入转调离赋值，共"+needAddInfo.size()+"条"); // 获取更新入转调离信息 List updateRybsInfo = getUpdateRybsInfo(list, cal); - baseBean.writeLog("获取更新入转调离信息，共"+updateRybsInfo.size()+"条，：",updateRybsInfo); + baseBean.writeLog("获取更新入转调离信息，共"+updateRybsInfo.size()+"条"); // 获取更新境内外信息 List UpdateJnjwInfo = getUpdateJnjwInfo(list,cal); - baseBean.writeLog("获取更新境内外信息，共"+UpdateJnjwInfo.size()+"条，：",UpdateJnjwInfo); + baseBean.writeLog("获取更新境内外信息，共"+UpdateJnjwInfo.size()+"条"); // 更新入转调离信息 getEmployeeIdentifiedDAO().updateRybsInfo(updateRybsInfo); baseBean.writeLog("更新入转调离信息"); diff --git a/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java b/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java index 88c1b99..c2a782f 100644 --- a/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java @@ -1,6 +1,5 @@ package com.engine.bjcj220907.service.impl; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSONObject; import com.engine.bjcj220907.entity.Attend4MonthBonus; import com.engine.bjcj220907.service.GetKQ4MonthBonusService; @@ -94,7 +93,7 @@ public class GetKQ4MonthBonusServiceImpl extends Service implements GetKQ4MonthB } }); - baseBean.writeLog("获取的考勤缺勤天数，{}", JSONUtils.toJSONString(qqDays)); +// baseBean.writeLog("获取的考勤缺勤天数，{}", JSONUtils.toJSONString(qqDays)); return qqDays; } catch (Exception e) { baseBean.writeLog("获取考勤数据失败{}", e); diff --git a/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java index 81f5efe..2753e29 100644 --- a/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java @@ -53,7 +53,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou baseBean.writeLog("获取已经离职并且已经发放过绩效的人员信息 共:"+haveSendDepartureInfo.size()); // 获取所有人的入职日期、离职日期、其他缺勤天数 List rybsInfo = getMonthBonusDAO().getRybsInfo(); - baseBean.writeLog("获取所有人的入职日期、离职日期、其他缺勤天数"+rybsInfo); + baseBean.writeLog("获取所有人的入职日期、离职日期、其他缺勤天数"+rybsInfo.size()); Map rybsInfoMap = SalaryEntityUtil.convert2Map(rybsInfo, DepartureInfo::getXm); // 入职日期小于绩效所属月的不核算绩效 rybsInfo.stream().forEach(info -> { @@ -66,7 +66,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou baseBean.writeLog("获取所有人的绩效等级、绩效系数等信息,共计："+result.size()); // 获取所有本月(薪资发放月)离职人员信息 List departureInfo = getMonthBonusDAO().getDepartureInfo(bonusSendMonth); - baseBean.writeLog("发放月离职人员信息："+departureInfo); + baseBean.writeLog("发放月离职人员信息："+departureInfo.size()); List departureTemp = new ArrayList<>(); // 循环所属月下一个月到离职月之间的绩效等级-》绩效系数 baseBean.writeLog("获取所有离职人员所属月下一个月到离职月之间的绩效等级、绩效系数等信息"); @@ -108,7 +108,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou // 获取所有用户考勤模块中缺勤天数 Attend4MonthBonus p = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build(); Map qqDatas = getKQ4MonthBonusService().getKQDatas(p); - baseBean.writeLog("获取所有用户考勤模块中缺勤天数"+qqDatas); + baseBean.writeLog("获取所有用户考勤模块中缺勤天数:"+qqDatas.size()); // 循环将离职人员的各个月的缺勤天数取到 Map qqDatasDepar= new HashMap<>(); for(int i=0;i jwCZUsers = jwCZInfos.stream().map(item -> item.getXm()).collect(Collectors.toList()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); @@ -309,7 +309,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou // }); // 先删除建模中脏数据 getMonthBonusDAO().clear(bonusMonth,bonusSendMonth,haveSendDepartureInfo); - baseBean.writeLog("先删除建模中脏数据"+bonusMonth+bonusSendMonth+haveSendDepartureInfo); + baseBean.writeLog("先删除建模中脏数据:"+bonusMonth+bonusSendMonth+haveSendDepartureInfo); // 将数据插入建模中 List departureUsers = departureInfo.stream().map(i -> i.getXm()).collect(Collectors.toList()); baseBean.writeLog("将数据插入建模中共："+result.size()); diff --git a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java index 8ff3258..b74e731 100644 --- a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java @@ -66,7 +66,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse // 获取考勤员工的公务回国天数 及 缺勤日期 Attend4MonthBonus build = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build(); Map kqDatas = GetKQ4OverseasAllowanceCountService().getKQDatas(build,users); - baseBean.writeLog("调用考勤接口获取公务回国天数 及 缺勤日期："+kqDatas); + baseBean.writeLog("调用考勤接口获取公务回国天数 及 缺勤日期："+kqDatas.size()); // 处理国内应出勤，国内天数-休息天数 handleGnycq(results,kqDatas); // 获取员工公务回国国内工作日天数 @@ -82,7 +82,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse // 处理第三国出差(2)、境外国内出差（3）的艰苦地区补贴 Map> dsgccJkdq = getOverseasAllowanceDAO().getDsgcc(); baseBean.writeLog("获取第三国出差(2)、境外国内出差（3）艰苦地区补贴,共:"+dsgccJkdq.size()); - baseBean.writeLog("第三国出差(2)、境外国内出差（3）艰苦地区补贴:"+dsgccJkdq); + baseBean.writeLog("第三国出差(2)、境外国内出差（3）艰苦地区补贴:"+dsgccJkdq.size()); // 封装第三国出差数、境外国内出差据到result中 getDsgcc(results,dsgccJkdq,startAttendanceCal.getTime(),endAttendanceCal.getTime()); // 处理艰苦地区补贴天数（境外常驻补贴天数=境外实出勤-第三国出差-境外国内出差） @@ -91,7 +91,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse coutJkdqbthj(results); // 四项补贴合计（天标准）*（公务回国工作日天数+国内工作日天数） countSxbthj(results); - baseBean.writeLog("计算四项补贴合计:"+results); + baseBean.writeLog("计算四项补贴合计:"+results.size()); // 将结果插入建模表中 getOverseasAllowanceDAO().insertOverseasAllowance(results); baseBean.writeLog("将结果插入建模表中"); @@ -171,8 +171,8 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse List qqDate = (List ) kqData.get(result.getUser() + "-qq"); // 公务回国List List gwhgList = gwhgInfos.get(new Integer(result.getUser())); - baseBean.writeLog(result.getUser()+"缺勤List："+qqDate); - baseBean.writeLog(result.getUser()+"公务回国List："+gwhgList); + baseBean.writeLog(result.getUser()+"缺勤List："+qqDate.size()); + baseBean.writeLog(result.getUser()+"公务回国List："+gwhgList.size()); // 减去缺勤、公务回国 jwcc.stream().forEach(cc -> { Calendar countKs = Calendar.getInstance(); @@ -433,7 +433,6 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse // } }); }catch (Exception e){ - baseBean.writeLog("eeeeeeeeeeeeeeee"); baseBean.writeLog(e); } } diff --git a/weaver-bjcj.iml b/weaver-bjcj.iml index fa4bec1..6706408 100644 --- a/weaver-bjcj.iml +++ b/weaver-bjcj.iml @@ -10,7 +10,7 @@ -