修复calendar页面的一些bug

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CalendarServiceImpl.java

@@ -415,7 +415,7 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService
 
     private List mergeEventList(List<CalendarEvent> config2EventList, List<CalendarEvent> eventList) {
 
-        if(CollectionUtils.isNotEmpty(eventList)) {
+        if (CollectionUtils.isNotEmpty(eventList)) {
             config2EventList = config2EventList.stream()
                     .filter(l1 -> eventList.stream()
                             .anyMatch(l2 ->
@@ -438,6 +438,7 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService
 
     /**
      * 将结果转换为CalendarEventDto List，并为EntityName，TaskTypeName，Type赋值
+     *
      * @param sourceList
      * @param type
      * @return
@@ -451,13 +452,21 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService
             taskTypeMap = calendarExtMapper.getAllTaskTypeMapList();
         }
 
+        if (activeEntityMap == null || taskTypeMap == null) {
+            return null;
+        }
+
         for (CalendarEvent p : sourceList) {
-            CalendarEventDto dto = new CalendarEventDto();
-            beanUtil.copyProperties(p, dto);
-            dto.setEntityName(activeEntityMap.get(p.getEntityId()).getName());
-            dto.setTaskTypeName(taskTypeMap.get(p.getTaskTypeId()).getName());
-            dto.setType(Integer.parseInt(type));
-            eventDtoList.add(dto);
+
+            if (activeEntityMap.containsKey(p.getEntityId()) && taskTypeMap.containsKey(p.getTaskTypeId())) {
+
+                CalendarEventDto dto = new CalendarEventDto();
+                beanUtil.copyProperties(p, dto);
+                dto.setEntityName(activeEntityMap.get(p.getEntityId()).getName());
+                dto.setTaskTypeName(taskTypeMap.get(p.getTaskTypeId()).getName());
+                dto.setType(Integer.parseInt(type));
+                eventDtoList.add(dto);
+            }
         }
 
         return eventDtoList;

atms-web/src/main/webapp/app/calendar/display/calendar-display.ctrl.js

@@ -622,16 +622,17 @@
                     };
 
                     $scope.popupOptions.operateModel = {
-                        operatorNames: loginContext.userName,
+                        staff: loginContext.userName,
                         type: 1,
                         entityId: '',
                         entityName: '',
-                        operatorIDs: loginContext.userId,
+                        operatorIDs: loginContext.userName,
+                        effectiveDate: new Date(),
                         dueDate: start,
                         status: 0,
                         btnCreate: true,
                         taskTypeId: userDefine.id,
-                        taskTypeName: userDefine.taskTypeName,
+                        taskTypeName: userDefine.name,
                         colorGroup: userDefine.colorGroup
                     };