Merge remote-tracking branch 'origin/1.0' into 1.0

src/main/java/com/galaxis/manatee/service/LogCheckService.java

@@ -91,7 +91,7 @@ public class LogCheckService {
                 map.put(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getProjectType()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek(),1);
             }
             for (ChuanyunWeekMemberHourDO chuanyunWeekMemberHourDO : oldlist){
-                if (!chuanyunWeekMemberHourDO.getProjectType().equals("生产项目")){
+//                if (!chuanyunWeekMemberHourDO.getProjectType().equals("生产项目")){
                     Integer count = map.get(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getProjectType()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek());
                     if (count==null){
                         chuanyunWeekMemberHourDao.delete(chuanyunWeekMemberHourDO);
@@ -110,7 +110,7 @@ public class LogCheckService {
                         }
                         log.info(chuanyunWeekMemberHourDO.getUserId()+"删除项目"+chuanyunWeekMemberHourDO.getProjectId()+"时间为"+chuanyunWeekMemberHourDO.getYear()+"年"+chuanyunWeekMemberHourDO.getWeek()+"周工时");
                     }
-                }
+//                }
             }
         }
         log.info("核对耗时" + (System.currentTimeMillis() - start) + "毫秒");
@@ -140,7 +140,7 @@ public class LogCheckService {
                 map.put(chuanyunSelfWorkHourDO.getUserId()+chuanyunSelfWorkHourDO.getProjectId()+chuanyunSelfWorkHourDO.getProjectType()+chuanyunSelfWorkHourDO.getDayLogDate().withDayOfMonth(1),1);
             }
             for (ChuanyunSelfCostDO chuanyunSelfCostDO : costDOList){
-                if (!chuanyunSelfCostDO.getProjectType().equals("生产项目")){
+//                if (!chuanyunSelfCostDO.getProjectType().equals("生产项目")){
                     Integer count = map.get(chuanyunSelfCostDO.getUserId()+chuanyunSelfCostDO.getProjectId()+chuanyunSelfCostDO.getProjectType()+chuanyunSelfCostDO.getDayLogDate().withDayOfMonth(1));
                     if (count==null){
                         chuanyunSelfCostDao.delete(chuanyunSelfCostDO);
@@ -158,7 +158,7 @@ public class LogCheckService {
                         }
                         log.info(chuanyunSelfCostDO.getUserId()+"删除项目"+chuanyunSelfCostDO.getProjectId()+"时间为"+chuanyunSelfCostDO.getDayLogDate()+"月工时");
                     }
-                }
+//                }
             }
         }
         log.info("核对耗时" + (System.currentTimeMillis() - start) + "毫秒");
@@ -239,7 +239,7 @@ public class LogCheckService {
             }
             //比较是否有撤回工时
             for (ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO : chuanyunSelfWorkHourList) {
-                if (!chuanyunSelfWorkHourDO.getProjectType().equals("生产项目")){
+//                if (!chuanyunSelfWorkHourDO.getProjectType().equals("生产项目")){
                     String projectId;
                     if (chuanyunSelfWorkHourDO.getProjectId().equals(ChuanYunConstant.PRODUCTION_PROJECT_ID)){
                         projectId="";
@@ -272,7 +272,7 @@ public class LogCheckService {
                             log.error(e.getMessage());
                         }
                     }
-                }
+//                }
             }
         }
     }