修改bug

imcs-admin-boot/imcs-authority-biz/src/main/java/com/github/zuihou/authority/service/auth/impl/UserServiceImpl.java

@@ -219,6 +219,10 @@ public class UserServiceImpl extends SuperCacheServiceImpl<UserMapper, User> imp
     @Transactional(rollbackFor = Exception.class)
     public User updateUser(User user) {
         // 不允许修改用户信息时修改密码，请单独调用修改密码接口
+        User oriUser = baseMapper.selectById(user.getId());
+        if(!oriUser.getAccount().equals(user.getAccount())){
+            isFalse(check(user), "账号重复，请重新输入");
+        }
         user.setPassword(null);
         updateById(user);
         return user;

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -637,7 +637,46 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 
     @Override
     public Map<String, Object> scheduleTaskByResource(Map<String, Object> map) {
-        return null;
+        String taskBatchNo = map.get("taskBatchNo")==null?"":map.get("taskBatchNo").toString();
+        String draftFlag = map.get("draftFlag")==null?"":map.get("draftFlag").toString();
+        //参数放置位置处理
+        getQueryMap(map);
+        String planId = map.get("planId")==null?"":map.get("planId").toString();
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId));
+        List<String>dateStrList = new ArrayList<>();
+        for(TTask t:taskList){
+            String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
+            String date2 = DateUtil.dateToString0(t.getExpectEndTime(),"yyyy-MM-dd");
+            if(!dateStrList.contains(date1)){
+                dateStrList.add(date1);
+            }
+            if(!dateStrList.contains(date2)){
+                dateStrList.add(date2);
+            }
+        }
+
+//        String queryDate = StringUtil.changeIdsListToSubQueryStr(dateStrList);
+//        String dateSql = "select * from c_common_date_info where left(date, 10)  in ("+queryDate+") ";
+//        List<Map<String,Object>> dateList = scheduleUserDateMapper.selectSql(dateSql);
+        List <Map<String,Object>>titleList = getHourTtileList();
+
+        int current = Integer.parseInt(map.get("current")==null?"1":map.get("current").toString());
+        int size = Integer.parseInt(map.get("size")==null?"10":map.get("size").toString());
+        current = (current-1)*size;
+        Map<String,Object>queryMap = new HashMap<String,Object>();
+        queryMap.put("current",current);
+        queryMap.put("size",size);
+        queryMap.put("taskBatchNo",taskBatchNo);
+        queryMap.put("draftFlag",draftFlag);
+        queryMap.put("planId",planId);
+        List<Map> dataList = baseMapper.getTaskList(queryMap);
+        Map<String,List<Map>>m = dataList.stream().filter(t->t.get("resourceDesc")!=null).collect(Collectors.groupingBy(t->t.get("resourceDesc").toString()));
+        //获取数据
+        Map<String, Object> retMap = new HashMap<String, Object>();
+        retMap.put("titleList",titleList);
+        retMap.put("data",m);
+        retMap.put("count",m.size());
+        return retMap;
     }
 
     List<Map<String,Object>>getTtileList(List<Map<String,Object>>list){
@@ -674,6 +713,32 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         return l;
     }
 
+
+    static  List<Map<String,Object>>getHourTtileList(){
+        List<Map<String,Object>>l = new ArrayList<Map<String,Object>>();
+        boolean b =true;
+        for(int j = 0;j<=47;j++){
+            String t = j/2+"";
+            if(b){
+                t=t+":00";
+            }else{
+                t=t+":30";
+            }
+            b = !b;
+            Map fieldMap = new HashMap();
+            fieldMap.put("field",t);
+            fieldMap.put("text", t);
+            fieldMap.put("id",t);
+            l.add(fieldMap);
+        }
+        return l;
+    }
+
+    public static void main(String args[]){
+        List list = getHourTtileList();
+        System.err.println();
+    }
+
     /**
      * 算法分配准备，准备好数据，准备调用
      * @param task