修改日志

src/com/engine/bjcj220907/service/impl/EmployeeIdentifiedServiceImpl.java

@@ -42,10 +42,14 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId
         baseBean.writeLog("根据时间给入转调离赋值，共"+needAddInfo.size()+"条");
         // 获取更新入转调离信息
         List<Rybs> updateRybsInfo = getUpdateRybsInfo(list, cal);
+        if(updateRybsInfo != null){
             baseBean.writeLog("获取更新入转调离信息，共"+updateRybsInfo.size()+"条");
+        }
         // 获取更新境内外信息
         List<Rybs> UpdateJnjwInfo =  getUpdateJnjwInfo(list,cal);
+        if(UpdateJnjwInfo != null){
             baseBean.writeLog("获取更新境内外信息，共"+UpdateJnjwInfo.size()+"条");
+        }
         // 更新入转调离信息
         getEmployeeIdentifiedDAO().updateRybsInfo(updateRybsInfo);
         baseBean.writeLog("更新入转调离信息");

src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java

@@ -108,7 +108,9 @@ 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);
+        if(qqDatas != null){
             baseBean.writeLog("获取所有用户考勤模块中缺勤天数:"+qqDatas.size());
+        }
         // 循环将离职人员的各个月的缺勤天数取到
         Map<String, Double> qqDatasDepar= new HashMap<>();
         for(int i=0;i<departureTemp.size();i++){
@@ -119,7 +121,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
         baseBean.writeLog("获取所有离职人员的各个月的缺勤天数:"+qqDatasDepar.size());
         // 将缺勤信息合并
         qqDatas.putAll(qqDatasDepar);
-        baseBean.writeLog("所有人员的各个月的缺勤天数:"+qqDatas.size());
+//        baseBean.writeLog("所有人员的各个月的缺勤天数:"+qqDatas.size());
         // 所有有境外常驻信息的用户
         List<String> jwCZUsers = jwCZInfos.stream().map(item -> item.getXm()).collect(Collectors.toList());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
@@ -309,7 +311,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
 //        });
         // 先删除建模中脏数据
         getMonthBonusDAO().clear(bonusMonth,bonusSendMonth,haveSendDepartureInfo);
-        baseBean.writeLog("先删除建模中脏数据:"+bonusMonth+bonusSendMonth+haveSendDepartureInfo);
+        baseBean.writeLog("先删除建模中脏数据");
         // 将数据插入建模中
         List<Integer> departureUsers = departureInfo.stream().map(i -> i.getXm()).collect(Collectors.toList());
         baseBean.writeLog("将数据插入建模中共："+result.size());

src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java

@@ -66,7 +66,9 @@ 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);
+        if(kqDatas != null){
             baseBean.writeLog("调用考勤接口获取公务回国天数 及 缺勤日期："+kqDatas.size());
+        }
         // 处理国内应出勤，国内天数-休息天数
         handleGnycq(results,kqDatas);
         // 获取员工公务回国国内工作日天数
@@ -81,8 +83,9 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
         baseBean.writeLog("封装薪酬等级、境外津贴标准、考勤天数、境外实际常驻天数并计算实出勤天数、境外津贴,共:"+results.size());
         // 处理第三国出差(2)、境外国内出差（3）的艰苦地区补贴
         Map<Integer, List<JwCZInfoDetail>> dsgccJkdq = getOverseasAllowanceDAO().getDsgcc();
+        if(dsgccJkdq != null){
             baseBean.writeLog("获取第三国出差(2)、境外国内出差（3）艰苦地区补贴,共:"+dsgccJkdq.size());
-        baseBean.writeLog("第三国出差(2)、境外国内出差（3）艰苦地区补贴:"+dsgccJkdq.size());
+        }
         // 封装第三国出差数、境外国内出差据到result中
         getDsgcc(results,dsgccJkdq,startAttendanceCal.getTime(),endAttendanceCal.getTime());
         // 处理艰苦地区补贴天数（境外常驻补贴天数=境外实出勤-第三国出差-境外国内出差）
@@ -171,8 +174,10 @@ 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()));
+            if(qqDate != null && gwhgList != null){
                 baseBean.writeLog(result.getUser()+"缺勤List："+qqDate.size());
                 baseBean.writeLog(result.getUser()+"公务回国List："+gwhgList.size());
+            }
             // 减去缺勤、公务回国
             jwcc.stream().forEach(cc -> {
                 Calendar countKs = Calendar.getInstance();

weaver-bjcj.iml

@@ -7,10 +7,10 @@
           <map>
             <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
             <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1675584210944" />
+            <entry key="lastExternalPluginCheckTime" value="1679481054163" />
           </map>
         </option>
-        <option name="version" value="14" />
+        <option name="version" value="17" />
       </configuration>
     </facet>
   </component>