清理日志
This commit is contained in:
Harryxzy
parent
0318934724
commit
6ba1c8ae0f
|
|
@ -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";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId
|
|||
ArrayList<Rybs> needAddInfo = new ArrayList<>();
|
||||
addRybsInfo(list, needAddInfo, cal);
|
||||
getEmployeeIdentifiedDAO().addInfo(needAddInfo);
|
||||
baseBean.writeLog("根据时间给入转调离赋值，共"+needAddInfo.size()+"条，：",needAddInfo);
|
||||
baseBean.writeLog("根据时间给入转调离赋值，共"+needAddInfo.size()+"条");
|
||||
// 获取更新入转调离信息
|
||||
List<Rybs> updateRybsInfo = getUpdateRybsInfo(list, cal);
|
||||
baseBean.writeLog("获取更新入转调离信息，共"+updateRybsInfo.size()+"条，：",updateRybsInfo);
|
||||
baseBean.writeLog("获取更新入转调离信息，共"+updateRybsInfo.size()+"条");
|
||||
// 获取更新境内外信息
|
||||
List<Rybs> UpdateJnjwInfo = getUpdateJnjwInfo(list,cal);
|
||||
baseBean.writeLog("获取更新境内外信息，共"+UpdateJnjwInfo.size()+"条，：",UpdateJnjwInfo);
|
||||
baseBean.writeLog("获取更新境内外信息，共"+UpdateJnjwInfo.size()+"条");
|
||||
// 更新入转调离信息
|
||||
getEmployeeIdentifiedDAO().updateRybsInfo(updateRybsInfo);
|
||||
baseBean.writeLog("更新入转调离信息");
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
|
|||
baseBean.writeLog("获取已经离职并且已经发放过绩效的人员信息 共:"+haveSendDepartureInfo.size());
|
||||
// 获取所有人的入职日期、离职日期、其他缺勤天数
|
||||
List<DepartureInfo> rybsInfo = getMonthBonusDAO().getRybsInfo();
|
||||
baseBean.writeLog("获取所有人的入职日期、离职日期、其他缺勤天数"+rybsInfo);
|
||||
baseBean.writeLog("获取所有人的入职日期、离职日期、其他缺勤天数"+rybsInfo.size());
|
||||
Map<Integer,DepartureInfo> 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> departureInfo = getMonthBonusDAO().getDepartureInfo(bonusSendMonth);
|
||||
baseBean.writeLog("发放月离职人员信息："+departureInfo);
|
||||
baseBean.writeLog("发放月离职人员信息："+departureInfo.size());
|
||||
List<CountMonthBonus> 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<String, Double> qqDatas = getKQ4MonthBonusService().getKQDatas(p);
|
||||
baseBean.writeLog("获取所有用户考勤模块中缺勤天数"+qqDatas);
|
||||
baseBean.writeLog("获取所有用户考勤模块中缺勤天数:"+qqDatas.size());
|
||||
// 循环将离职人员的各个月的缺勤天数取到
|
||||
Map<String, Double> qqDatasDepar= new HashMap<>();
|
||||
for(int i=0;i<departureTemp.size();i++){
|
||||
|
|
@ -116,10 +116,10 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
|
|||
Date eaDate = BjcjCommonUtils.getEndAttendanceCal(departureTemp.get(i).getKqyf()).getTime();
|
||||
qqDatasDepar.putAll(getKQ4MonthBonusService().getKQDatas(Attend4MonthBonus.builder().beginDate(saDate).endDate(eaDate).user(Integer.valueOf(departureTemp.get(i).getXm())).build()));
|
||||
}
|
||||
baseBean.writeLog("获取所有离职人员的各个月的缺勤天数"+qqDatasDepar);
|
||||
baseBean.writeLog("获取所有离职人员的各个月的缺勤天数:"+qqDatasDepar.size());
|
||||
// 将缺勤信息合并
|
||||
qqDatas.putAll(qqDatasDepar);
|
||||
baseBean.writeLog("所有人员的各个月的缺勤天数"+qqDatas);
|
||||
baseBean.writeLog("所有人员的各个月的缺勤天数:"+qqDatas.size());
|
||||
// 所有有境外常驻信息的用户
|
||||
List<String> 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<Integer> departureUsers = departureInfo.stream().map(i -> i.getXm()).collect(Collectors.toList());
|
||||
baseBean.writeLog("将数据插入建模中共："+result.size());
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
|
|||
// 获取考勤员工的公务回国天数 及 缺勤日期
|
||||
Attend4MonthBonus build = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build();
|
||||
Map<String, Object> 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<Integer, List<JwCZInfoDetail>> 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<Date> qqDate = (List <Date>) kqData.get(result.getUser() + "-qq");
|
||||
// 公务回国List
|
||||
List<JwCZInfoDetail> 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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<entry key="lastExternalPluginCheckTime" value="1675584210944" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="version" value="13" />
|
||||
<option name="version" value="14" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
|
|
|
|||
Loading…
Reference in New Issue