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

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

@@ -88,11 +88,11 @@ public class LogCheckService {
 
         if (list.size()!=oldlist.size()){
             for (ChuanyunWeekMemberHourDO chuanyunWeekMemberHourDO : list){
-                map.put(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek(),1);
+                map.put(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getProjectType()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek(),1);
             }
             for (ChuanyunWeekMemberHourDO chuanyunWeekMemberHourDO : oldlist){
                 if (!chuanyunWeekMemberHourDO.getProjectType().equals("生产项目")){
-                    Integer count = map.get(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek());
+                    Integer count = map.get(chuanyunWeekMemberHourDO.getUserId()+chuanyunWeekMemberHourDO.getProjectId()+chuanyunWeekMemberHourDO.getProjectType()+chuanyunWeekMemberHourDO.getYear()+chuanyunWeekMemberHourDO.getWeek());
                     if (count==null){
                         chuanyunWeekMemberHourDao.delete(chuanyunWeekMemberHourDO);
                         List<String> matchers = new ArrayList<>();
@@ -137,11 +137,11 @@ public class LogCheckService {
         if (list.size()!=costDOList.size()){
             Map<String, Integer> map = new HashMap<>(list.size()+costDOList.size());
             for (ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO : list){
-                map.put(chuanyunSelfWorkHourDO.getUserId()+chuanyunSelfWorkHourDO.getProjectId()+chuanyunSelfWorkHourDO.getDayLogDate().withDayOfMonth(1),1);
+                map.put(chuanyunSelfWorkHourDO.getUserId()+chuanyunSelfWorkHourDO.getProjectId()+chuanyunSelfWorkHourDO.getProjectType()+chuanyunSelfWorkHourDO.getDayLogDate().withDayOfMonth(1),1);
             }
             for (ChuanyunSelfCostDO chuanyunSelfCostDO : costDOList){
                 if (!chuanyunSelfCostDO.getProjectType().equals("生产项目")){
-                    Integer count = map.get(chuanyunSelfCostDO.getUserId()+chuanyunSelfCostDO.getProjectId()+chuanyunSelfCostDO.getDayLogDate().withDayOfMonth(1));
+                    Integer count = map.get(chuanyunSelfCostDO.getUserId()+chuanyunSelfCostDO.getProjectId()+chuanyunSelfCostDO.getProjectType()+chuanyunSelfCostDO.getDayLogDate().withDayOfMonth(1));
                     if (count==null){
                         chuanyunSelfCostDao.delete(chuanyunSelfCostDO);
                         List<String> matchers = new ArrayList<>();
@@ -235,7 +235,7 @@ public class LogCheckService {
         if (chuanyunWorkHourList.size() != chuanyunSelfWorkHourList.size()) {
             //如果有变动将
             for (ChuanyunWorkHourDO chuanyunWorkHourDO : chuanyunWorkHourList) {
-                map.put(chuanyunWorkHourDO.getUserId() + chuanyunWorkHourDO.getProjectId() + chuanyunWorkHourDO.getDayLogDate(), 1);
+                map.put(chuanyunWorkHourDO.getUserId() + chuanyunWorkHourDO.getProjectId() +chuanyunWorkHourDO.getProjectType()+ chuanyunWorkHourDO.getDayLogDate(), 1);
             }
             //比较是否有撤回工时
             for (ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO : chuanyunSelfWorkHourList) {
@@ -246,7 +246,7 @@ public class LogCheckService {
                     }else{
                         projectId=chuanyunSelfWorkHourDO.getProjectId();
                     }
-                    Integer count = map.get(chuanyunSelfWorkHourDO.getUserId() + projectId + chuanyunSelfWorkHourDO.getDayLogDate());
+                    Integer count = map.get(chuanyunSelfWorkHourDO.getUserId() + projectId +chuanyunSelfWorkHourDO.getProjectType()+chuanyunSelfWorkHourDO.getDayLogDate());
                     if (count == null) {
                         try {
                             //删除数据库日工时