calendar config相关接口和页面

atms-api/src/main/java/pwc/taxtech/atms/calendar/CalendarController.java → atms-api/src/main/java/pwc/taxtech/atms/calendar/TaxCalendarController.java

@@ -20,7 +20,7 @@ import java.util.Map;
  **/
 @RestController
 @RequestMapping("api/v1/")
-public class CalendarController {
+public class TaxCalendarController {
 
     @RequestMapping("taxCalendar/getAllTaxProjectList")
     @ResponseBody

atms-api/src/main/java/pwc/taxtech/atms/controller/CalendarController.java

+package pwc.taxtech.atms.controller;
+
+import org.apache.ibatis.annotations.Param;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.calendar.dao.ext.CalendarExtMapper;
+import pwc.taxtech.atms.calendar.entity.CalendarConfiguration;
+import pwc.taxtech.atms.calendar.entity.CalendarTaskType;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.dto.calendar.CalendarConfigQueryParamDto;
+import pwc.taxtech.atms.service.ICalendarService;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-10 13:59
+ * @Version: 1.0
+ **/
+@RestController
+@RequestMapping("api/v1/calendar/")
+public class CalendarController {
+
+    private static final Logger log = LoggerFactory.getLogger(CalendarController.class);
+
+    @Autowired
+    private ICalendarService calendarServiceImpl;
+
+    @Resource
+    CalendarExtMapper calendarExtMapper;
+
+    @PostMapping("saveTaskType")
+    public OperationResultDto saveTaskType(@RequestBody CalendarTaskType calendarTaskType){
+        return calendarServiceImpl.saveTaskType(calendarTaskType);
+    }
+
+    @GetMapping("getAllTaskTypeList")
+    public OperationResultDto getAllTaskTypeList(){
+        return calendarServiceImpl.getAllTaskTypeList();
+    }
+
+    @GetMapping("getTaskTypeList")
+    public OperationResultDto getTaskTypeList(){
+        return calendarServiceImpl.getTaskTypeList();
+    }
+
+    @GetMapping("getMaxConfigOrder")
+    public OperationResultDto getMaxConfigOrder(){
+        return calendarServiceImpl.getMaxConfigOrder();
+    }
+
+    @PostMapping("getCalendarDataForDisplay")
+    public OperationResultDto getTaxCalendarDataForDisplay(@Param("queryStartTime") Date queryStartTime, @Param("queryEndTime") Date queryEndTime){
+        return calendarServiceImpl.getTaxCalendarDataForDisplay(queryStartTime, queryEndTime);
+    }
+
+    @PostMapping("saveCalendarConfig")
+    public OperationResultDto saveCalendarConfig(@RequestBody CalendarConfiguration calendarConfig){
+        return calendarServiceImpl.saveCalendarConfig(calendarConfig);
+    }
+
+    @GetMapping("getCalendarConfigById/{id}")
+    public OperationResultDto getCalendarConfigById(@PathVariable("id") Long id){
+        return calendarServiceImpl.getCalendarConfigById(id);
+    }
+
+    @PostMapping("getCalendarConfigList")
+    public OperationResultDto getCalendarConfigList(@RequestBody CalendarConfigQueryParamDto queryParam){
+        return calendarServiceImpl.getCalendarConfigList(queryParam);
+    }
+
+    @GetMapping("getActiveEntityList")
+    public OperationResultDto getActiveEntityList(){
+        return calendarServiceImpl.getActiveEntityList();
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/controller/CalendarEventController.java

+package pwc.taxtech.atms.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.calendar.entity.CalendarEvent;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.service.ICalendarEventService;
+
+import javax.annotation.Resource;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-10 14:29
+ * @Version: 1.0
+ **/
+@Resource
+@RequestMapping("api/v1/calendarEvent/")
+public class CalendarEventController {
+
+    @Autowired
+    private ICalendarEventService calendarEventServiceImpl;
+
+    @PostMapping("add")
+    public OperationResultDto addEvent(@RequestBody CalendarEvent event){
+        return calendarEventServiceImpl.addEvent(event);
+    }
+
+    @PostMapping("update")
+    public OperationResultDto updateEvent(@RequestBody CalendarEvent event){
+        return calendarEventServiceImpl.updateEvent(event);
+    }
+
+    @GetMapping("delete/{id}")
+    public OperationResultDto deleteEvent(@PathVariable("id") Long id){
+        return calendarEventServiceImpl.deleteEvent(id);
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/calendar/CalendarConfigQueryParamDto.java

+package pwc.taxtech.atms.dto.calendar;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+import java.util.List;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-12 11:56
+ * @Version: 1.0
+ **/
+public class CalendarConfigQueryParamDto {
+
+    private List<Long> entityIdList;
+
+    private List<Long> taskTypeList;
+
+    private List<Integer> configMonthList;
+
+    private List<Integer> configDayList;
+
+    private String staff;
+
+    private int queryType;
+
+    private Byte status;
+
+    private Integer orderIndex;
+
+    private PagingDto pagingParam;
+
+    public List<Long> getEntityIdList() {
+        return entityIdList;
+    }
+
+    public void setEntityIdList(List<Long> entityIdList) {
+        this.entityIdList = entityIdList;
+    }
+
+    public List<Long> getTaskTypeList() {
+        return taskTypeList;
+    }
+
+    public void setTaskTypeList(List<Long> taskTypeList) {
+        this.taskTypeList = taskTypeList;
+    }
+
+    public List<Integer> getConfigMonthList() {
+        return configMonthList;
+    }
+
+    public void setConfigMonthList(List<Integer> configMonthList) {
+        this.configMonthList = configMonthList;
+    }
+
+    public List<Integer> getConfigDayList() {
+        return configDayList;
+    }
+
+    public void setConfigDayList(List<Integer> configDayList) {
+        this.configDayList = configDayList;
+    }
+
+    public String getStaff() {
+        return staff;
+    }
+
+    public void setStaff(String staff) {
+        this.staff = staff;
+    }
+
+    public int getQueryType() {
+        return queryType;
+    }
+
+    public void setQueryType(int queryType) {
+        this.queryType = queryType;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public PagingDto getPagingParam() {
+        return pagingParam;
+    }
+
+    public void setPagingParam(PagingDto pagingParam) {
+        this.pagingParam = pagingParam;
+    }
+
+    public Integer getOrderIndex() {
+        return orderIndex;
+    }
+
+    public void setOrderIndex(Integer orderIndex) {
+        this.orderIndex = orderIndex;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/service/ICalendarActionService.java

+package pwc.taxtech.atms.service;
+
+import pwc.taxtech.atms.calendar.entity.CalendarAction;
+import pwc.taxtech.atms.dto.OperationResultDto;
+
+public interface ICalendarActionService {
+
+    OperationResultDto saveEvent(CalendarAction record);
+
+    OperationResultDto deleteEvent(Long id);
+}

atms-api/src/main/java/pwc/taxtech/atms/service/ICalendarEventService.java

+package pwc.taxtech.atms.service;
+
+import pwc.taxtech.atms.calendar.entity.CalendarEvent;
+import pwc.taxtech.atms.dto.OperationResultDto;
+
+public interface ICalendarEventService {
+
+    OperationResultDto addEvent(CalendarEvent event);
+    OperationResultDto updateEvent(CalendarEvent event);
+    OperationResultDto deleteEvent(Long id);
+}

atms-api/src/main/java/pwc/taxtech/atms/service/ICalendarService.java

+package pwc.taxtech.atms.service;
+
+import pwc.taxtech.atms.calendar.dto.CalendarConfigDto;
+import pwc.taxtech.atms.calendar.dto.CalendarTaskTypeDto;
+import pwc.taxtech.atms.calendar.dto.EntityDto;
+import pwc.taxtech.atms.calendar.entity.CalendarConfiguration;
+import pwc.taxtech.atms.calendar.entity.CalendarTaskType;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.dto.calendar.CalendarConfigQueryParamDto;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ICalendarService {
+
+    OperationResultDto deleteConfiguration(Long id);
+
+    OperationResultDto saveTaskType(CalendarTaskType record);
+
+    /**
+     * 获取除“自定义”的其他taskType
+     * @return
+     */
+    OperationResultDto<List<CalendarTaskTypeDto>> getTaskTypeList();
+
+    /**
+     * 获取所有taskType
+     * @return
+     */
+    OperationResultDto<List<CalendarTaskTypeDto>> getAllTaskTypeList();
+
+    OperationResultDto saveCalendarConfig(CalendarConfiguration calendarConfig);
+
+    OperationResultDto<CalendarConfigDto> getCalendarConfigById(Long id);
+
+    OperationResultDto getCalendarConfigList(CalendarConfigQueryParamDto queryParam);
+
+    OperationResultDto<List<EntityDto>> getActiveEntityList();
+
+    OperationResultDto getMaxConfigOrder();
+
+    OperationResultDto getTaxCalendarDataForDisplay(Date queryStartTime, Date queryEndTime);
+}

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

+package pwc.taxtech.atms.service.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pwc.taxtech.atms.calendar.dao.CalendarActionJurisdictionRelationshipMapper;
+import pwc.taxtech.atms.calendar.dao.CalendarActionMapper;
+import pwc.taxtech.atms.calendar.dao.CalendarJurisdictionMapper;
+import pwc.taxtech.atms.calendar.entity.CalendarAction;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.service.ICalendarActionService;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-10 16:19
+ * @Version: 1.0
+ **/
+public class CalendarActionServiceImpl extends BaseService implements ICalendarActionService {
+
+    private static final Logger log = LoggerFactory.getLogger(CalendarActionServiceImpl.class);
+
+    @Resource
+    private CalendarActionMapper calendarActionMapper;
+
+    @Resource
+    private CalendarJurisdictionMapper calendarJurisdictionMapper;
+
+    @Resource
+    private CalendarActionJurisdictionRelationshipMapper calendarActionJurisdictionRelationshipMapper;
+
+    @Override
+    public OperationResultDto saveEvent(CalendarAction record) {
+        int count = 0;
+        try {
+            record.setUpdateTime(new Date());
+            // 无ID则新建，有ID则更新
+            if (record.getId() != null){
+                count = calendarActionMapper.updateByPrimaryKeySelective(record);
+            } else {
+                record.setId(idService.nextId());
+                record.setCreateTime(record.getUpdateTime());
+                count = calendarActionMapper.insert(record);
+            }
+
+        } catch (Exception e) {
+            log.error("save error", e);
+        }
+        boolean result = count > 0;
+        String msg = result ? "1" : "0";
+        return new OperationResultDto(result, msg);
+    }
+
+    @Override
+    public OperationResultDto deleteEvent(Long id) {
+        int count = 0;
+        try {
+            count = calendarActionMapper.deleteByPrimaryKey(id);
+        } catch (Exception e) {
+            log.error("deleteAction error", e);
+        }
+        boolean result = count > 0;
+        String msg = result ? "删除成功" : "删除失败";
+        return new OperationResultDto(result, msg);
+    }
+
+}

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

+package pwc.taxtech.atms.service.impl;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import pwc.taxtech.atms.calendar.dao.*;
+import pwc.taxtech.atms.calendar.dao.ext.CalendarExtMapper;
+import pwc.taxtech.atms.calendar.entity.CalendarEvent;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.service.ICalendarEventService;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-10 14:32
+ * @Version: 1.0
+ **/
+@Service
+public class CalendarEventServiceImpl extends BaseService implements ICalendarEventService {
+
+    private static final Logger log = LoggerFactory.getLogger(CalendarEventServiceImpl.class);
+
+    @Resource
+    private CalendarEventMapper calendarEventMapper;
+
+    @Override
+    public OperationResultDto addEvent(CalendarEvent event) {
+        if (event.getId() == null) {
+            event.setId(idService.nextId());
+        }
+        Date nowDate = new Date();
+        event.setCreateTime(nowDate);
+        event.setUpdateTime(nowDate);
+
+        int count = 0;
+        try {
+            count = calendarEventMapper.insert(event);
+        } catch (Exception e) {
+            log.error("addConfiguration error", e);
+        }
+        boolean result = count > 0;
+        String msg = result ? "1" : "-1";
+        return new OperationResultDto(result, msg);
+    }
+
+    @Override
+    public OperationResultDto updateEvent(CalendarEvent event) {
+        int count = 0;
+        event.setUpdateTime(new Date());
+        try {
+            count = calendarEventMapper.updateByPrimaryKeySelective(event);
+        } catch (Exception e) {
+            log.error("updateConfiguration error", e);
+        }
+        boolean result = count > 0;
+        String msg = result ? "1" : "-1";
+        return new OperationResultDto(result, msg);
+    }
+
+    @Override
+    public OperationResultDto deleteEvent(Long id) {
+        int count = 0;
+        try {
+            count = calendarEventMapper.deleteByPrimaryKey(id);
+        } catch (Exception e) {
+            log.error("deleteConfiguration error", e);
+        }
+        boolean result = count > 0;
+        String msg = result ? "1" : "-1";
+        return new OperationResultDto(result, msg);
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/dao/ext/CalendarExtMapper.java

+package pwc.taxtech.atms.calendar.dao.ext;
+
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.calendar.dto.CalendarTaskTypeDto;
+import pwc.taxtech.atms.calendar.dto.EntityDto;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-10 18:20
+ * @Version: 1.0
+ **/
+@Mapper
+public interface CalendarExtMapper extends MyMapper {
+
+    @Select("SELECT id FROM calendar_task_type WHERE name = #{name} LIMIT 1")
+    Long checkTaskTypeNameIsExist(String name);
+
+    @Select("SELECT id, name FROM calendar_task_type WHERE status = 1 ORDER BY id")
+    List<CalendarTaskTypeDto> getAllTaskTypeList();
+
+    @Select("SELECT id, name FROM calendar_task_type WHERE status = 1 AND id > 1 ORDER BY id")
+    List<CalendarTaskTypeDto> getTaskTypeList();
+
+    @Select("SELECT id, name FROM organization WHERE is_active = 1")
+    List<EntityDto> getActiveEntityList();
+
+    @Select("SELECT id, name FROM organization")
+    List<EntityDto> getAllEntityList();
+
+    @Select("SELECT id, name FROM calendar_task_type")
+    @MapKey("id")
+    Map<Long, CalendarTaskTypeDto> getAllTaskTypeMapList();
+
+    @Select("SELECT id, name FROM organization")
+    @MapKey("id")
+    Map<Long, EntityDto> getAllEntityMapList();
+
+    @Select("SELECT name FROM calendar_task_type WHERE id IN (${ids})")
+    List<String> getAllTaskTypes(@Param("ids") String ids);
+
+    @Select("SELECT name FROM organization WHERE id IN (${ids})")
+    List<String> getAllEntities(@Param("ids") String ids);
+
+    @Select("SELECT order_Index FROM calendar_configuration ORDER BY id DESC LIMIT 1")
+    Integer getMaxConfigOrder();
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/dto/CalendarConfigDto.java

+package pwc.taxtech.atms.calendar.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-11 18:04
+ * @Version: 1.0
+ **/
+public class CalendarConfigDto implements Serializable {
+
+    private static final long serialVersionUID = 3866378052812843016L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    private String taskName;
+
+//    private List<EntityDto> entityList;
+//
+//    private List<CalendarTaskTypeDto> taskTypeList;
+
+    private String entityIds;
+
+    private String entityNames;
+
+    private String taskTypeIds;
+
+    private String taskTypeNames;
+
+    private String projectMonths;
+
+    private String projectDays;
+
+    private Date validDateStart;
+
+    private Date validDateEnd;
+
+    private String validDate;
+
+    private String staff;
+
+    private Integer orderIndex;
+
+    private Byte status;
+
+    private String notes;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getEntityIds() {
+        return entityIds;
+    }
+
+    public void setEntityIds(String entityIds) {
+        this.entityIds = entityIds;
+    }
+
+    public String getEntityNames() {
+        return entityNames;
+    }
+
+    public void setEntityNames(String entityNames) {
+        this.entityNames = entityNames;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public String getTaskTypeIds() {
+        return taskTypeIds;
+    }
+
+    public void setTaskTypeIds(String taskTypeIds) {
+        this.taskTypeIds = taskTypeIds;
+    }
+
+    public String getTaskTypeNames() {
+        return taskTypeNames;
+    }
+
+    public void setTaskTypeNames(String taskTypeNames) {
+        this.taskTypeNames = taskTypeNames;
+    }
+
+    public String getProjectMonths() {
+        return projectMonths;
+    }
+
+    public void setProjectMonths(String projectMonths) {
+        this.projectMonths = projectMonths;
+    }
+
+    public String getProjectDays() {
+        return projectDays;
+    }
+
+    public void setProjectDays(String projectDays) {
+        this.projectDays = projectDays;
+    }
+
+    public Date getValidDateStart() {
+        return validDateStart;
+    }
+
+    public void setValidDateStart(Date validDateStart) {
+        this.validDateStart = validDateStart;
+    }
+
+    public Date getValidDateEnd() {
+        return validDateEnd;
+    }
+
+    public void setValidDateEnd(Date validDateEnd) {
+        this.validDateEnd = validDateEnd;
+    }
+
+    public String getStaff() {
+        return staff;
+    }
+
+    public void setStaff(String staff) {
+        this.staff = staff;
+    }
+
+    public Integer getOrderIndex() {
+        return orderIndex;
+    }
+
+    public void setOrderIndex(Integer orderIndex) {
+        this.orderIndex = orderIndex;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/dto/CalendarConfigGroupByEntityDto.java

+package pwc.taxtech.atms.calendar.dto;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-13 19:34
+ * @Version: 1.0
+ **/
+public class CalendarConfigGroupByEntityDto implements Serializable {
+
+    private static final long serialVersionUID = 663558017348889443L;
+
+    public CalendarConfigGroupByEntityDto() {
+
+    }
+
+    public CalendarConfigGroupByEntityDto(String entityName, int calendarCount, int taskTypeCount, List<CalendarConfigDto> entityCalendarList) {
+        this.entityName = entityName;
+        this.calendarCount = calendarCount;
+        this.taskTypeCount = taskTypeCount;
+        this.entityCalendarList = entityCalendarList;
+    }
+
+    private String entityName;
+
+    private int calendarCount;
+
+    private int taskTypeCount;
+
+    private List<CalendarConfigDto> entityCalendarList;
+
+    public String getEntityName() {
+        return entityName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
+    public int getCalendarCount() {
+        return calendarCount;
+    }
+
+    public void setCalendarCount(int calendarCount) {
+        this.calendarCount = calendarCount;
+    }
+
+    public int getTaskTypeCount() {
+        return taskTypeCount;
+    }
+
+    public void setTaskTypeCount(int taskTypeCount) {
+        this.taskTypeCount = taskTypeCount;
+    }
+
+    public List<CalendarConfigDto> getEntityCalendarList() {
+        return entityCalendarList;
+    }
+
+    public void setEntityCalendarList(List<CalendarConfigDto> entityCalendarList) {
+        this.entityCalendarList = entityCalendarList;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/dto/CalendarEventDto.java

+package pwc.taxtech.atms.calendar.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-11 18:04
+ * @Version: 1.0
+ **/
+public class CalendarEventDto implements Serializable {
+
+    private static final long serialVersionUID = -1194801351751686123L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long entityId;
+
+    private String entityName;
+
+    private String taskName;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskTypeId;
+
+    private String taskTypeName;
+
+    private String staff;
+
+    private Date effectiveDate;
+
+    private Date dueDate;
+
+    private Byte status;
+
+    private Integer orderIndex;
+
+    private String notes;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEntityId() {
+        return entityId;
+    }
+
+    public void setEntityId(Long entityId) {
+        this.entityId = entityId;
+    }
+
+    public String getEntityName() {
+        return entityName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public Long getTaskTypeId() {
+        return taskTypeId;
+    }
+
+    public void setTaskTypeId(Long taskTypeId) {
+        this.taskTypeId = taskTypeId;
+    }
+
+    public String getTaskTypeName() {
+        return taskTypeName;
+    }
+
+    public void setTaskTypeName(String taskTypeName) {
+        this.taskTypeName = taskTypeName;
+    }
+
+    public String getStaff() {
+        return staff;
+    }
+
+    public void setStaff(String staff) {
+        this.staff = staff;
+    }
+
+    public Date getEffectiveDate() {
+        return effectiveDate;
+    }
+
+    public void setEffectiveDate(Date effectiveDate) {
+        this.effectiveDate = effectiveDate;
+    }
+
+    public Date getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(Date dueDate) {
+        this.dueDate = dueDate;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Integer getOrderIndex() {
+        return orderIndex;
+    }
+
+    public void setOrderIndex(Integer orderIndex) {
+        this.orderIndex = orderIndex;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/dto/CalendarTaskTypeDto.java

+package pwc.taxtech.atms.calendar.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.io.Serializable;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-11 18:05
+ * @Version: 1.0
+ **/
+public class CalendarTaskTypeDto implements Serializable {
+
+    private static final long serialVersionUID = 5942786964744634629L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/dto/EntityDto.java

+package pwc.taxtech.atms.calendar.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.io.Serializable;
+
+/**
+ * <p> @Description </p>
+ *
+ * @Author: Mccoy Z Xia (Xia zhixin)
+ * @Date: 2019-07-12 09:52
+ * @Version: 1.0
+ **/
+public class EntityDto implements Serializable {
+
+    private static final long serialVersionUID = 1890912867933117745L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/calendar/entity/CalendarConfiguration.java

@@ -24,20 +24,20 @@ public class CalendarConfiguration extends BaseEntity implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column calendar_configuration.entity_ids
+     * This field corresponds to the database column calendar_configuration.task_name
      *
      * @mbg.generated
      */
-    private String entityIds;
+    private String taskName;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column calendar_configuration.task_name
+     * This field corresponds to the database column calendar_configuration.entity_ids
      *
      * @mbg.generated
      */
-    private String taskName;
+    private String entityIds;
 
     /**
      *
@@ -114,11 +114,11 @@ public class CalendarConfiguration extends BaseEntity implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column calendar_configuration.created_time
+     * This field corresponds to the database column calendar_configuration.create_time
      *
      * @mbg.generated
      */
-    private Date createdTime;
+    private Date createTime;
 
     /**
      *
@@ -172,50 +172,50 @@ public class CalendarConfiguration extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column calendar_configuration.entity_ids
+     * This method returns the value of the database column calendar_configuration.task_name
      *
-     * @return the value of calendar_configuration.entity_ids
+     * @return the value of calendar_configuration.task_name
      *
      * @mbg.generated
      */
-    public String getEntityIds() {
-        return entityIds;
+    public String getTaskName() {
+        return taskName;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column calendar_configuration.entity_ids
+     * This method sets the value of the database column calendar_configuration.task_name
      *
-     * @param entityIds the value for calendar_configuration.entity_ids
+     * @param taskName the value for calendar_configuration.task_name
      *
      * @mbg.generated
      */
-    public void setEntityIds(String entityIds) {
-        this.entityIds = entityIds == null ? null : entityIds.trim();
+    public void setTaskName(String taskName) {
+        this.taskName = taskName == null ? null : taskName.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column calendar_configuration.task_name
+     * This method returns the value of the database column calendar_configuration.entity_ids
      *
-     * @return the value of calendar_configuration.task_name
+     * @return the value of calendar_configuration.entity_ids
      *
      * @mbg.generated
      */
-    public String getTaskName() {
-        return taskName;
+    public String getEntityIds() {
+        return entityIds;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column calendar_configuration.task_name
+     * This method sets the value of the database column calendar_configuration.entity_ids
      *
-     * @param taskName the value for calendar_configuration.task_name
+     * @param entityIds the value for calendar_configuration.entity_ids
      *
      * @mbg.generated
      */
-    public void setTaskName(String taskName) {
-        this.taskName = taskName == null ? null : taskName.trim();
+    public void setEntityIds(String entityIds) {
+        this.entityIds = entityIds == null ? null : entityIds.trim();
     }
 
     /**
@@ -412,26 +412,26 @@ public class CalendarConfiguration extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column calendar_configuration.created_time
+     * This method returns the value of the database column calendar_configuration.create_time
      *
-     * @return the value of calendar_configuration.created_time
+     * @return the value of calendar_configuration.create_time
      *
      * @mbg.generated
      */
-    public Date getCreatedTime() {
-        return createdTime;
+    public Date getCreateTime() {
+        return createTime;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column calendar_configuration.created_time
+     * This method sets the value of the database column calendar_configuration.create_time
      *
-     * @param createdTime the value for calendar_configuration.created_time
+     * @param createTime the value for calendar_configuration.create_time
      *
      * @mbg.generated
      */
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     /**
@@ -495,8 +495,8 @@ public class CalendarConfiguration extends BaseEntity implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", entityIds=").append(entityIds);
         sb.append(", taskName=").append(taskName);
+        sb.append(", entityIds=").append(entityIds);
         sb.append(", taskTypeIds=").append(taskTypeIds);
         sb.append(", projectMonths=").append(projectMonths);
         sb.append(", projectDays=").append(projectDays);
@@ -505,7 +505,7 @@ public class CalendarConfiguration extends BaseEntity implements Serializable {
         sb.append(", staff=").append(staff);
         sb.append(", orderIndex=").append(orderIndex);
         sb.append(", status=").append(status);
-        sb.append(", createdTime=").append(createdTime);
+        sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", notes=").append(notes);
         sb.append("]");

atms-dao/src/main/java/pwc/taxtech/atms/calendar/entity/CalendarEvent.java

@@ -24,20 +24,20 @@ public class CalendarEvent extends BaseEntity implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column calendar_event.entity_id
+     * This field corresponds to the database column calendar_event.task_name
      *
      * @mbg.generated
      */
-    private Long entityId;
+    private String taskName;
 
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column calendar_event.task_name
+     * This field corresponds to the database column calendar_event.entity_id
      *
      * @mbg.generated
      */
-    private String taskName;
+    private Long entityId;
 
     /**
      *
@@ -111,11 +111,11 @@ public class CalendarEvent extends BaseEntity implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column calendar_event.last_update_time
+     * This field corresponds to the database column calendar_event.update_time
      *
      * @mbg.generated
      */
-    private Date lastUpdateTime;
+    private Date updateTime;
 
     /**
      *
@@ -160,50 +160,50 @@ public class CalendarEvent extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column calendar_event.entity_id
+     * This method returns the value of the database column calendar_event.task_name
      *
-     * @return the value of calendar_event.entity_id
+     * @return the value of calendar_event.task_name
      *
      * @mbg.generated
      */
-    public Long getEntityId() {
-        return entityId;
+    public String getTaskName() {
+        return taskName;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column calendar_event.entity_id
+     * This method sets the value of the database column calendar_event.task_name
      *
-     * @param entityId the value for calendar_event.entity_id
+     * @param taskName the value for calendar_event.task_name
      *
      * @mbg.generated
      */
-    public void setEntityId(Long entityId) {
-        this.entityId = entityId;
+    public void setTaskName(String taskName) {
+        this.taskName = taskName == null ? null : taskName.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column calendar_event.task_name
+     * This method returns the value of the database column calendar_event.entity_id
      *
-     * @return the value of calendar_event.task_name
+     * @return the value of calendar_event.entity_id
      *
      * @mbg.generated
      */
-    public String getTaskName() {
-        return taskName;
+    public Long getEntityId() {
+        return entityId;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column calendar_event.task_name
+     * This method sets the value of the database column calendar_event.entity_id
      *
-     * @param taskName the value for calendar_event.task_name
+     * @param entityId the value for calendar_event.entity_id
      *
      * @mbg.generated
      */
-    public void setTaskName(String taskName) {
-        this.taskName = taskName == null ? null : taskName.trim();
+    public void setEntityId(Long entityId) {
+        this.entityId = entityId;
     }
 
     /**
@@ -376,26 +376,26 @@ public class CalendarEvent extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column calendar_event.last_update_time
+     * This method returns the value of the database column calendar_event.update_time
      *
-     * @return the value of calendar_event.last_update_time
+     * @return the value of calendar_event.update_time
      *
      * @mbg.generated
      */
-    public Date getLastUpdateTime() {
-        return lastUpdateTime;
+    public Date getUpdateTime() {
+        return updateTime;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column calendar_event.last_update_time
+     * This method sets the value of the database column calendar_event.update_time
      *
-     * @param lastUpdateTime the value for calendar_event.last_update_time
+     * @param updateTime the value for calendar_event.update_time
      *
      * @mbg.generated
      */
-    public void setLastUpdateTime(Date lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
 
     /**
@@ -435,8 +435,8 @@ public class CalendarEvent extends BaseEntity implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", entityId=").append(entityId);
         sb.append(", taskName=").append(taskName);
+        sb.append(", entityId=").append(entityId);
         sb.append(", taskTypeId=").append(taskTypeId);
         sb.append(", staff=").append(staff);
         sb.append(", effectiveDate=").append(effectiveDate);
@@ -444,7 +444,7 @@ public class CalendarEvent extends BaseEntity implements Serializable {
         sb.append(", status=").append(status);
         sb.append(", orderIndex=").append(orderIndex);
         sb.append(", createTime=").append(createTime);
-        sb.append(", lastUpdateTime=").append(lastUpdateTime);
+        sb.append(", updateTime=").append(updateTime);
         sb.append(", notes=").append(notes);
         sb.append("]");
         return sb.toString();

atms-dao/src/main/resources/pwc/taxtech/atms/calendar/dao/CalendarConfigurationMapper.xml

@@ -7,8 +7,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="entity_ids" jdbcType="VARCHAR" property="entityIds" />
     <result column="task_name" jdbcType="VARCHAR" property="taskName" />
+    <result column="entity_ids" jdbcType="VARCHAR" property="entityIds" />
     <result column="task_type_ids" jdbcType="VARCHAR" property="taskTypeIds" />
     <result column="project_months" jdbcType="VARCHAR" property="projectMonths" />
     <result column="project_days" jdbcType="VARCHAR" property="projectDays" />
@@ -17,7 +17,7 @@
     <result column="staff" jdbcType="VARCHAR" property="staff" />
     <result column="order_index" jdbcType="INTEGER" property="orderIndex" />
     <result column="status" jdbcType="TINYINT" property="status" />
-    <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="pwc.taxtech.atms.calendar.entity.CalendarConfiguration">
@@ -98,8 +98,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, entity_ids, task_name, task_type_ids, project_months, project_days, valid_date_start, 
-    valid_date_end, staff, order_index, `status`, created_time, update_time
+    id, task_name, entity_ids, task_type_ids, project_months, project_days, valid_date_start, 
+    valid_date_end, staff, order_index, `status`, create_time, update_time
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -181,15 +181,15 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into calendar_configuration (id, entity_ids, task_name, 
+    insert into calendar_configuration (id, task_name, entity_ids, 
       task_type_ids, project_months, project_days, 
       valid_date_start, valid_date_end, staff, 
-      order_index, `status`, created_time, 
+      order_index, `status`, create_time, 
       update_time, notes)
-    values (#{id,jdbcType=BIGINT}, #{entityIds,jdbcType=VARCHAR}, #{taskName,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{entityIds,jdbcType=VARCHAR}, 
       #{taskTypeIds,jdbcType=VARCHAR}, #{projectMonths,jdbcType=VARCHAR}, #{projectDays,jdbcType=VARCHAR}, 
       #{validDateStart,jdbcType=TIMESTAMP}, #{validDateEnd,jdbcType=TIMESTAMP}, #{staff,jdbcType=VARCHAR}, 
-      #{orderIndex,jdbcType=INTEGER}, #{status,jdbcType=TINYINT}, #{createdTime,jdbcType=TIMESTAMP}, 
+      #{orderIndex,jdbcType=INTEGER}, #{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{notes,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.calendar.entity.CalendarConfiguration">
@@ -202,12 +202,12 @@
       <if test="id != null">
         id,
       </if>
-      <if test="entityIds != null">
-        entity_ids,
-      </if>
       <if test="taskName != null">
         task_name,
       </if>
+      <if test="entityIds != null">
+        entity_ids,
+      </if>
       <if test="taskTypeIds != null">
         task_type_ids,
       </if>
@@ -232,8 +232,8 @@
       <if test="status != null">
         `status`,
       </if>
-      <if test="createdTime != null">
-        created_time,
+      <if test="createTime != null">
+        create_time,
       </if>
       <if test="updateTime != null">
         update_time,
@@ -246,12 +246,12 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="entityIds != null">
-        #{entityIds,jdbcType=VARCHAR},
-      </if>
       <if test="taskName != null">
         #{taskName,jdbcType=VARCHAR},
       </if>
+      <if test="entityIds != null">
+        #{entityIds,jdbcType=VARCHAR},
+      </if>
       <if test="taskTypeIds != null">
         #{taskTypeIds,jdbcType=VARCHAR},
       </if>
@@ -276,8 +276,8 @@
       <if test="status != null">
         #{status,jdbcType=TINYINT},
       </if>
-      <if test="createdTime != null">
-        #{createdTime,jdbcType=TIMESTAMP},
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
@@ -307,12 +307,12 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.entityIds != null">
-        entity_ids = #{record.entityIds,jdbcType=VARCHAR},
-      </if>
       <if test="record.taskName != null">
         task_name = #{record.taskName,jdbcType=VARCHAR},
       </if>
+      <if test="record.entityIds != null">
+        entity_ids = #{record.entityIds,jdbcType=VARCHAR},
+      </if>
       <if test="record.taskTypeIds != null">
         task_type_ids = #{record.taskTypeIds,jdbcType=VARCHAR},
       </if>
@@ -337,8 +337,8 @@
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=TINYINT},
       </if>
-      <if test="record.createdTime != null">
-        created_time = #{record.createdTime,jdbcType=TIMESTAMP},
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -358,8 +358,8 @@
     -->
     update calendar_configuration
     set id = #{record.id,jdbcType=BIGINT},
-      entity_ids = #{record.entityIds,jdbcType=VARCHAR},
       task_name = #{record.taskName,jdbcType=VARCHAR},
+      entity_ids = #{record.entityIds,jdbcType=VARCHAR},
       task_type_ids = #{record.taskTypeIds,jdbcType=VARCHAR},
       project_months = #{record.projectMonths,jdbcType=VARCHAR},
       project_days = #{record.projectDays,jdbcType=VARCHAR},
@@ -368,7 +368,7 @@
       staff = #{record.staff,jdbcType=VARCHAR},
       order_index = #{record.orderIndex,jdbcType=INTEGER},
       `status` = #{record.status,jdbcType=TINYINT},
-      created_time = #{record.createdTime,jdbcType=TIMESTAMP},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       notes = #{record.notes,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -382,8 +382,8 @@
     -->
     update calendar_configuration
     set id = #{record.id,jdbcType=BIGINT},
-      entity_ids = #{record.entityIds,jdbcType=VARCHAR},
       task_name = #{record.taskName,jdbcType=VARCHAR},
+      entity_ids = #{record.entityIds,jdbcType=VARCHAR},
       task_type_ids = #{record.taskTypeIds,jdbcType=VARCHAR},
       project_months = #{record.projectMonths,jdbcType=VARCHAR},
       project_days = #{record.projectDays,jdbcType=VARCHAR},
@@ -392,7 +392,7 @@
       staff = #{record.staff,jdbcType=VARCHAR},
       order_index = #{record.orderIndex,jdbcType=INTEGER},
       `status` = #{record.status,jdbcType=TINYINT},
-      created_time = #{record.createdTime,jdbcType=TIMESTAMP},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -405,12 +405,12 @@
     -->
     update calendar_configuration
     <set>
-      <if test="entityIds != null">
-        entity_ids = #{entityIds,jdbcType=VARCHAR},
-      </if>
       <if test="taskName != null">
         task_name = #{taskName,jdbcType=VARCHAR},
       </if>
+      <if test="entityIds != null">
+        entity_ids = #{entityIds,jdbcType=VARCHAR},
+      </if>
       <if test="taskTypeIds != null">
         task_type_ids = #{taskTypeIds,jdbcType=VARCHAR},
       </if>
@@ -435,8 +435,8 @@
       <if test="status != null">
         `status` = #{status,jdbcType=TINYINT},
       </if>
-      <if test="createdTime != null">
-        created_time = #{createdTime,jdbcType=TIMESTAMP},
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -453,8 +453,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update calendar_configuration
-    set entity_ids = #{entityIds,jdbcType=VARCHAR},
-      task_name = #{taskName,jdbcType=VARCHAR},
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      entity_ids = #{entityIds,jdbcType=VARCHAR},
       task_type_ids = #{taskTypeIds,jdbcType=VARCHAR},
       project_months = #{projectMonths,jdbcType=VARCHAR},
       project_days = #{projectDays,jdbcType=VARCHAR},
@@ -463,7 +463,7 @@
       staff = #{staff,jdbcType=VARCHAR},
       order_index = #{orderIndex,jdbcType=INTEGER},
       `status` = #{status,jdbcType=TINYINT},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       notes = #{notes,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
@@ -474,8 +474,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update calendar_configuration
-    set entity_ids = #{entityIds,jdbcType=VARCHAR},
-      task_name = #{taskName,jdbcType=VARCHAR},
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      entity_ids = #{entityIds,jdbcType=VARCHAR},
       task_type_ids = #{taskTypeIds,jdbcType=VARCHAR},
       project_months = #{projectMonths,jdbcType=VARCHAR},
       project_days = #{projectDays,jdbcType=VARCHAR},
@@ -484,7 +484,7 @@
       staff = #{staff,jdbcType=VARCHAR},
       order_index = #{orderIndex,jdbcType=INTEGER},
       `status` = #{status,jdbcType=TINYINT},
-      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>

atms-dao/src/main/resources/pwc/taxtech/atms/calendar/dao/CalendarEventMapper.xml

@@ -7,8 +7,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="entity_id" jdbcType="BIGINT" property="entityId" />
     <result column="task_name" jdbcType="VARCHAR" property="taskName" />
+    <result column="entity_id" jdbcType="BIGINT" property="entityId" />
     <result column="task_type_id" jdbcType="BIGINT" property="taskTypeId" />
     <result column="staff" jdbcType="VARCHAR" property="staff" />
     <result column="effective_date" jdbcType="TIMESTAMP" property="effectiveDate" />
@@ -16,7 +16,7 @@
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="order_index" jdbcType="INTEGER" property="orderIndex" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="last_update_time" jdbcType="TIMESTAMP" property="lastUpdateTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="pwc.taxtech.atms.calendar.entity.CalendarEvent">
     <!--
@@ -96,8 +96,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, entity_id, task_name, task_type_id, staff, effective_date, due_date, `status`, 
-    order_index, create_time, last_update_time
+    id, task_name, entity_id, task_type_id, staff, effective_date, due_date, `status`, 
+    order_index, create_time, update_time
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -179,15 +179,15 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into calendar_event (id, entity_id, task_name, 
+    insert into calendar_event (id, task_name, entity_id, 
       task_type_id, staff, effective_date, 
       due_date, `status`, order_index, 
-      create_time, last_update_time, notes
+      create_time, update_time, notes
       )
-    values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{entityId,jdbcType=BIGINT}, 
       #{taskTypeId,jdbcType=BIGINT}, #{staff,jdbcType=VARCHAR}, #{effectiveDate,jdbcType=TIMESTAMP}, 
       #{dueDate,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT}, #{orderIndex,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{lastUpdateTime,jdbcType=TIMESTAMP}, #{notes,jdbcType=LONGVARCHAR}
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{notes,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.calendar.entity.CalendarEvent">
@@ -200,12 +200,12 @@
       <if test="id != null">
         id,
       </if>
-      <if test="entityId != null">
-        entity_id,
-      </if>
       <if test="taskName != null">
         task_name,
       </if>
+      <if test="entityId != null">
+        entity_id,
+      </if>
       <if test="taskTypeId != null">
         task_type_id,
       </if>
@@ -227,8 +227,8 @@
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="lastUpdateTime != null">
-        last_update_time,
+      <if test="updateTime != null">
+        update_time,
       </if>
       <if test="notes != null">
         notes,
@@ -238,12 +238,12 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="entityId != null">
-        #{entityId,jdbcType=BIGINT},
-      </if>
       <if test="taskName != null">
         #{taskName,jdbcType=VARCHAR},
       </if>
+      <if test="entityId != null">
+        #{entityId,jdbcType=BIGINT},
+      </if>
       <if test="taskTypeId != null">
         #{taskTypeId,jdbcType=BIGINT},
       </if>
@@ -265,8 +265,8 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="lastUpdateTime != null">
-        #{lastUpdateTime,jdbcType=TIMESTAMP},
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="notes != null">
         #{notes,jdbcType=LONGVARCHAR},
@@ -293,12 +293,12 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.entityId != null">
-        entity_id = #{record.entityId,jdbcType=BIGINT},
-      </if>
       <if test="record.taskName != null">
         task_name = #{record.taskName,jdbcType=VARCHAR},
       </if>
+      <if test="record.entityId != null">
+        entity_id = #{record.entityId,jdbcType=BIGINT},
+      </if>
       <if test="record.taskTypeId != null">
         task_type_id = #{record.taskTypeId,jdbcType=BIGINT},
       </if>
@@ -320,8 +320,8 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.lastUpdateTime != null">
-        last_update_time = #{record.lastUpdateTime,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.notes != null">
         notes = #{record.notes,jdbcType=LONGVARCHAR},
@@ -338,8 +338,8 @@
     -->
     update calendar_event
     set id = #{record.id,jdbcType=BIGINT},
-      entity_id = #{record.entityId,jdbcType=BIGINT},
       task_name = #{record.taskName,jdbcType=VARCHAR},
+      entity_id = #{record.entityId,jdbcType=BIGINT},
       task_type_id = #{record.taskTypeId,jdbcType=BIGINT},
       staff = #{record.staff,jdbcType=VARCHAR},
       effective_date = #{record.effectiveDate,jdbcType=TIMESTAMP},
@@ -347,7 +347,7 @@
       `status` = #{record.status,jdbcType=TINYINT},
       order_index = #{record.orderIndex,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      last_update_time = #{record.lastUpdateTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       notes = #{record.notes,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -360,8 +360,8 @@
     -->
     update calendar_event
     set id = #{record.id,jdbcType=BIGINT},
-      entity_id = #{record.entityId,jdbcType=BIGINT},
       task_name = #{record.taskName,jdbcType=VARCHAR},
+      entity_id = #{record.entityId,jdbcType=BIGINT},
       task_type_id = #{record.taskTypeId,jdbcType=BIGINT},
       staff = #{record.staff,jdbcType=VARCHAR},
       effective_date = #{record.effectiveDate,jdbcType=TIMESTAMP},
@@ -369,7 +369,7 @@
       `status` = #{record.status,jdbcType=TINYINT},
       order_index = #{record.orderIndex,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      last_update_time = #{record.lastUpdateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -381,12 +381,12 @@
     -->
     update calendar_event
     <set>
-      <if test="entityId != null">
-        entity_id = #{entityId,jdbcType=BIGINT},
-      </if>
       <if test="taskName != null">
         task_name = #{taskName,jdbcType=VARCHAR},
       </if>
+      <if test="entityId != null">
+        entity_id = #{entityId,jdbcType=BIGINT},
+      </if>
       <if test="taskTypeId != null">
         task_type_id = #{taskTypeId,jdbcType=BIGINT},
       </if>
@@ -408,8 +408,8 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="lastUpdateTime != null">
-        last_update_time = #{lastUpdateTime,jdbcType=TIMESTAMP},
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="notes != null">
         notes = #{notes,jdbcType=LONGVARCHAR},
@@ -423,8 +423,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update calendar_event
-    set entity_id = #{entityId,jdbcType=BIGINT},
-      task_name = #{taskName,jdbcType=VARCHAR},
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      entity_id = #{entityId,jdbcType=BIGINT},
       task_type_id = #{taskTypeId,jdbcType=BIGINT},
       staff = #{staff,jdbcType=VARCHAR},
       effective_date = #{effectiveDate,jdbcType=TIMESTAMP},
@@ -432,7 +432,7 @@
       `status` = #{status,jdbcType=TINYINT},
       order_index = #{orderIndex,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      last_update_time = #{lastUpdateTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
       notes = #{notes,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -442,8 +442,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update calendar_event
-    set entity_id = #{entityId,jdbcType=BIGINT},
-      task_name = #{taskName,jdbcType=VARCHAR},
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      entity_id = #{entityId,jdbcType=BIGINT},
       task_type_id = #{taskTypeId,jdbcType=BIGINT},
       staff = #{staff,jdbcType=VARCHAR},
       effective_date = #{effectiveDate,jdbcType=TIMESTAMP},
@@ -451,7 +451,7 @@
       `status` = #{status,jdbcType=TINYINT},
       order_index = #{orderIndex,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      last_update_time = #{lastUpdateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfig/tax-calendar-config.html

@@ -6,14 +6,14 @@
                 <div class="search-title-lable-2">
                     {{'Company' | translate}}：
                 </div>
-                <div class="search-box-100-2" ng-model="queryEntity.companyIdList" dx-tag-box="companyOptions"></div>
+                <div class="search-box-100-2" ng-model="queryEntity.entityIdList" dx-tag-box="companyOptions"></div>
             </div>
 
             <div class="search-part-2">
                 <div class="search-title-lable-4">
                     {{'TaxEvent' | translate}}：
                 </div>
-                <div class="search-box-100-4" ng-model="queryEntity.taxPorjectIdList" dx-tag-box="taxOptions"></div>
+                <div class="search-box-100-4" ng-model="queryEntity.taskTypeList" dx-tag-box="taskTypeOptions"></div>
             </div>
 
             <div class="search-part-3">
@@ -34,29 +34,29 @@
                 <div class="search-title-lable-7">
                     {{'EventMonth' | translate}}：
                 </div>
-                <div class="search-box-50-7" ng-model="queryEntity.eventMonthList" dx-tag-box="eventMonthOptions"></div>
+                <div class="search-box-50-7" ng-model="queryEntity.configMonthList" dx-tag-box="configMonthOptions"></div>
 
                 <div class="search-title-lable-7">
                     {{'EventDay' | translate}}：
                 </div>
-                <div class="search-box-50-7" ng-model="queryEntity.eventDayList" dx-tag-box="eventDateOptions"></div>
+                <div class="search-box-50-7" ng-model="queryEntity.configDayList" dx-tag-box="configDateOptions"></div>
             </div>
             <div class="search-part-2">
-                <div class="search-title-lable-4">
-                    {{'EventAddress' | translate}}：
-                </div>
-                <div class="search-box-50-4" ng-model="queryEntity.eventPlaceId" dx-select-box="addressOptions"></div>
+<!--                <div class="search-title-lable-4">-->
+<!--                    {{'EventAddress' | translate}}：-->
+<!--                </div>-->
+<!--                <div class="search-box-50-4" ng-model="queryEntity.eventPlaceId" dx-select-box="addressOptions"></div>-->
 
                 <div class="search-title-lable-3">
                     {{'EventPerson' | translate}}：
                 </div>
-                <div class="search-box-50-3" ng-model="queryEntity.operatorIdList" dx-tag-box="operatorOptions"></div>
+                <div class="search-box-50-3" ng-model="queryEntity.staff" dx-tag-box="operatorOptions"></div>
             </div>
             <div class="search-part-3">
                 <div class="search-title-lable-2">
                     {{'Number' | translate}}：
                 </div>
-                <div class="search-box-100-2" ng-model="queryEntity.number" dx-text-box="numberOptions"></div>
+                <div class="search-box-100-2" ng-model="queryEntity.orderIndex" dx-text-box="numberOptions"></div>
             </div>
 
             <div class="search-part-3">
@@ -69,14 +69,14 @@
     <div class="grid-container">
         <div class="grid-head-search-container">
             <div class="grid-head-search" ng-model="queryEntity.queryType" dx-radio-group="gridSearchRadioOptions"></div>
-            <div ng-click="goToEditConfig();" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.taxCalendarConfig.editConfig}}" class="btn btn-default btn-red">{{'NewTaxCalendar' | translate}}</div>
+            <div ng-click="goToEditConfig();" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.calendarSetting.editCode}}" class="btn btn-default btn-red">{{'NewTaxCalendar' | translate}}</div>
         </div>
         <div id="dx-tax-calendar-data-grid" ng-if="queryEntity.queryType == 1" dx-data-grid="taxDataGridOptions"></div>
         <div dx-data-grid="companyCalendarGridOptions" ng-if="queryEntity.queryType == 2" dx-item-alias="companyGroup">
             <div data-options="dxTemplate:{name:'companyCalendarTemplate'}">
                 <div class="internal-grid-container">
                     <div class="internal-grid" id="company-{{companyGroup.key}}"
-                         dx-data-grid="companyCalendarGridOptions.companyView(companyGroup.data.companyCalendars)">
+                         dx-data-grid="companyCalendarGridOptions.companyView(companyGroup.data.entityCalendarList)">
                     </div>
                 </div>
             </div>

atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.html

@@ -7,7 +7,7 @@
         <div class="edit-line row">
             <div class="col-user-define-left col-padding">
                 <span class="title-first-n">{{'Number' | translate}}：</span>
-                <div class="form-box bh-box" ng-model="taxCalendarConfiguration.calendarNumber" dx-text-box="bhOptions"></div>
+                <div class="form-box bh-box" ng-model="taxCalendarConfiguration.orderIndex" dx-text-box="bhOptions"></div>
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 <div class="form-box" ng-model="taxCalendarConfiguration.status" dx-radio-group="statusOptions"></div>
             </div>
@@ -39,7 +39,7 @@
                     {{'EventMonth' | translate}}：
                 </span>
 
-                <div class="form-box common-box" ng-model="taxCalendarConfiguration.monthArr" dx-validator="validateOption.eventMonthOptions" dx-tag-box="eventMonthOptions"></div>
+                <div class="form-box common-box" ng-model="taxCalendarConfiguration.monthArr" dx-validator="validateOption.configMonthOptions" dx-tag-box="configMonthOptions"></div>
             </div>
         </div>
         <div class="edit-line row">
@@ -48,8 +48,8 @@
                     <span style="color:red;">*</span>
                     {{'TaxEvent' | translate}}：
                 </span>
-                <div id="tax-project" class="form-box common-box" ng-model="taxCalendarConfiguration.taxProjectIdArr" dx-validator="validateOption.taxOptions" dx-tag-box="taxOptions"></div>
-                &nbsp;&nbsp;<span ng-if="!isReadOnly" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.taxCalendarConfig.editTaxProject}}" ng-click="editTaxProjectList();" class="right-link">{{'EditTaxProject'|translate}}</span>
+                <div id="tax-project" class="form-box common-box" ng-model="taxCalendarConfiguration.taskTypeIdArr" dx-validator="validateOption.taskTypeOptions" dx-tag-box="taskTypeOptions"></div>
+                &nbsp;&nbsp;<span ng-if="!isReadOnly" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.calendar.editTaskType}}" ng-click="editTaskTypeList();" class="right-link">{{'EditTaxProject'|translate}}</span>
             </div>
             
             <div class="col-user-define-right col-padding">
@@ -58,18 +58,16 @@
                         <span style="color:red;">*</span>
                         {{'EventDay' | translate}}：
                     </span>
-                    <div class="form-box common-box" ng-model="taxCalendarConfiguration.projectDayArr" dx-validator="validateOption.eventDateOptions" dx-tag-box="eventDateOptions"></div>
+                    <div class="form-box common-box" ng-model="taxCalendarConfiguration.projectDayArr" dx-validator="validateOption.configDateOptions" dx-tag-box="configDateOptions"></div>
                 </div>
             </div>
         </div>
         <div class="edit-line row">
             <div class="col-user-define-left col-padding">
-                <span class="title-first-n">{{'RelatedTaxAmount' | translate}}：</span>
-                <div class="form-box sssx-box" ng-model="taxCalendarConfiguration.isRelatedTaxMoney" dx-radio-group="isRelatedTaxMoneyOptions"></div>
 
-                <span class="title-first-n">{{'EventAddress' | translate}}：</span>
-                <div class="form-box common-box" ng-model="taxCalendarConfiguration.workPlaceIDs" dx-select-box="addressOptions"></div>
-                &nbsp;&nbsp;<span ng-if="!isReadOnly" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.taxCalendarConfig.editWorkPlace}}" ng-click="editWorkPlaceList();" class="right-link">{{'EditWorkPlace'|translate}}</span>
+<!--                <span class="title-first-n">{{'EventAddress' | translate}}：</span>-->
+<!--                <div class="form-box common-box" ng-model="taxCalendarConfiguration.workPlaceIDs" dx-select-box="addressOptions"></div>-->
+<!--                &nbsp;&nbsp;<span ng-if="!isReadOnly" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.taxCalendarConfig.editWorkPlace}}" ng-click="editWorkPlaceList();" class="right-link">{{'EditWorkPlace'|translate}}</span>-->
             </div>
             
 
@@ -93,20 +91,20 @@
                 <div class="form-box common-box" ng-model="taxCalendarConfiguration.operatorIdArr" dx-validator="validateOption.operatorOptions" dx-tag-box="operatorOptions"></div>
                 <br />
 
-                <span class="title-first-n">{{'RelatedPerson' | translate}}：</span>
-                <div class="form-box common-box" ng-model="taxCalendarConfiguration.notifierIdArr" dx-tag-box="notifierOptions"></div>
+<!--                <span class="title-first-n">{{'RelatedPerson' | translate}}：</span>-->
+<!--                <div class="form-box common-box" ng-model="taxCalendarConfiguration.notifierIdArr" dx-tag-box="notifierOptions"></div>-->
             </div>
             
             <div class="col-remark-right">
                 <span class="title-second-n">{{'Remark' | translate}}：</span>
-                <div class="form-box common-box" ng-model="taxCalendarConfiguration.remark" dx-text-area="bzOptions"></div>
+                <div class="form-box common-box" ng-model="taxCalendarConfiguration.notes" dx-text-area="bzOptions"></div>
             </div>
         </div>
     </div>
 
     <div class="taxCalendarFooter">
         <div ng-click="backToListPage();" class="btn btn-default btn-gray">{{'Cancel'|translate}}</div>
-        <div ng-if="!isReadOnly && calendarConfigId" ng-click="saveAsConfig();" class="btn btn-default btn-red">{{'SaveOther'|translate}}</div>
+<!--        <div ng-if="!isReadOnly && calendarConfigId" ng-click="saveAsConfig();" class="btn btn-default btn-red">{{'SaveOther'|translate}}</div>-->
         <div ng-if="!isReadOnly" ng-click="saveConfig(1);" class="btn btn-default btn-red">{{'Save'|translate}}</div>
     </div>
 
@@ -115,7 +113,7 @@
     <script type="text/ng-template" class="content" id="edit-tax-project-pop.html">
 
         <div class="modal-header">
-            <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideEditTaxProjectListPanel()">&times;</span>
+            <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideEditTaskTypeListPanel()">&times;</span>
 
             <h4 class="modal-title">
                 <i style="color: #b22;font-size: 23px; cursor: pointer;" class="fa fa-pencil"></i>
@@ -126,14 +124,14 @@
         <div class="modal-body">
             <div class="row pop-grid-container">
                 <div class="col-md-12">
-                    <div dx-data-grid="taxProjectGridOptions"></div>
+                    <div dx-data-grid="taskTypeGridOptions"></div>
                 </div>
             </div>
         </div>
 
         <div class="modal-footer">
-            <button ng-click="hideEditTaxProjectListPanel();" class="btn btn-default btn-gray">{{'Cancel' | translate}}</button>
-            <button ng-click="editTaxProject();" class="btn btn-default btn-red">{{'NewTaxCalendar' | translate}}</button>
+            <button ng-click="hideEditTaskTypeListPanel();" class="btn btn-default btn-gray">{{'Cancel' | translate}}</button>
+            <button ng-click="editTaskType();" class="btn btn-default btn-red">{{'NewTaxCalendar' | translate}}</button>
         </div>
 
     </script>
@@ -141,15 +139,15 @@
     <div id="edit-tax-project"></div>
     <script type="text/ng-template" class="content" id="edit-tax-project.html">
         <div class="modal-header">
-            <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideEditTaxProjectPanel()">&times;</span>
+            <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideEditTaskTypePanel()">&times;</span>
 
             <h4 class="modal-title">
                 <i style="color: #b22;font-size: 23px; cursor: pointer;" class="fa fa-pencil"></i>
-                &nbsp;{{editTaxProjectTitle}}
+                &nbsp;{{editTaskTypeTitle}}
             </h4>
         </div>
 
-        <div class="modal-body" id="editTaxProjectForm" dx-validation-group="{}">
+        <div class="modal-body" id="editTaskTypeForm" dx-validation-group="{}">
             <div class="row">
                 <div class="col-lg-3">
                     <span class="form-title">
@@ -157,14 +155,14 @@
                     </span>
                 </div>
                 <div class="col-lg-9">
-                    <div class="box-font" dx-text-box="{}" dx-validator="validateOption.taxProjectText" ng-model="editTaxProjectEntity.taxProjectName"></div>
+                    <div class="box-font" dx-text-box="{}" dx-validator="validateOption.taskTypeText" ng-model="editTaskTypeEntity.name"></div>
                 </div>
             </div>
         </div>
 
         <div class="modal-footer">
-            <button ng-click="hideEditTaxProjectPanel();" class="btn btn-default btn-gray">{{'Cancel' | translate}}</button>
-            <button ng-click="confirmSubmitTaxProject();" class="btn btn-default btn-red">{{'Confirm' | translate}}</button>
+            <button ng-click="hideEditTaskTypePanel();" class="btn btn-default btn-gray">{{'Cancel' | translate}}</button>
+            <button ng-click="confirmSubmitTaskType();" class="btn btn-default btn-red">{{'Confirm' | translate}}</button>
         </div>
 
     </script>

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

@@ -45,9 +45,9 @@
     			];
 
     			$scope.editModel = {};
-    			taxCalendarService.getWorkPlaceList().success(function (result) {
-    				if (result) {
-    					$scope.workPlaceList = result;
+    			taxCalendarService.getActiveEntityList().success(function (result) {
+    				if (result.result) {
+    					$scope.workPlaceList = result.data;
     				}
     			});
 
@@ -175,7 +175,7 @@
     		    $scope.isReadOnly = false;
     			if ($scope.operateModel) {
     			    $scope.editModel = $scope.operateModel;
-    			    $scope.editModel.taxProjectNameShow = $scope.editModel.taxProjectName;
+    			    $scope.editModel.taxProjectNameShow = $scope.editModel.taskTypeName;
     				$scope.editModel.id = window.PWC.newGuid();
     				$scope.editModel.eventDate = new Date($scope.operateModel.eventDate).formatDateTime('yyyy-MM-dd');
     				$scope.editModel.statusText = $translate.instant(taxEventFinishStatus[$scope.editModel.status]);
@@ -203,7 +203,7 @@
     		    if ($scope.operateModel) {
     		        $scope.editModel = $scope.operateModel;
 
-    		        var showText = $scope.operateModel.taxProjectName;
+    		        var showText = $scope.operateModel.taskTypeName;
 
     		        if ($scope.operateModel.calendarNumber) {
     		            showText += ' ' + $scope.operateModel.calendarNumber;

atms-web/src/main/webapp/app/common/webservices/taxCalendarConfiguration.svc.js

@@ -2,24 +2,42 @@
 webservices.factory('taxCalendarService', ['$http', 'apiConfig', function ($http, apiConfig) {
     'use strict';
     return {
-        test: function () { return $http.get('/taxCalendar/test', apiConfig.create()); },
-        getWorkPlaceList: function () {
-            return $http.get('/taxCalendar/getWorkPlaceList', apiConfig.create());
+
+        getActiveEntityList: function () {
+            return $http.get('/calendar/getActiveEntityList', apiConfig.create());
+        },
+        getTaskTypeList: function () {
+            return $http.get('/calendar/getTaskTypeList', apiConfig.create());
         },
-        getTaxProjectList: function () {
-            return $http.get('/taxCalendar/getTaxProjectList', apiConfig.create());
+        getAllTaskTypeList: function () {
+            return $http.get('/calendar/getAllTaskTypeList', apiConfig.create());
         },
-        getAllTaxProjectList: function () {
-            return $http.get('/taxCalendar/getAllTaxProjectList', apiConfig.create());
+        saveTaskType: function (data) {
+            return $http.post('/calendar/saveTaskType', data, apiConfig.create());
         },
-        getTaxCalendarConfigurationList: function (queryParam) {
-            return $http.post('/taxCalendar/getTaxCalendarConfigurationList', queryParam, apiConfig.create());
+        getCalendarConfigList: function (queryParam) {
+            return $http.post('/calendar/getCalendarConfigList', queryParam, apiConfig.create());
         },
-        getTaxCalendarConfigurationByID: function (configID) {
-            return $http.get('/taxCalendar/getTaxCalendarConfigurationByID/' + configID, apiConfig.create());
+        getCalendarConfigById: function (configID) {
+            return $http.get('/calendar/getCalendarConfigById/' + configID, apiConfig.create());
         },
-        saveTaxProject: function (data) {
-            return $http.post('/taxCalendar/saveTaxProject', data, apiConfig.create());
+        saveCalendarConfig: function (data) {
+            return $http.post('/calendar/saveCalendarConfig', data, apiConfig.create());
+        },
+        getCalendarDataForDisplay: function (startData, endDate) {
+            return $http.post('/calendar/getCalendarDataForDisplay', { queryStartTime: (new Date(startData)).dateTimeToString('yyyyMMdd'), queryEndTime: (new Date(endDate)).dateTimeToString('yyyyMMdd') + " 23:59:59", userID: '', userName: '' }, apiConfig.create());
+        },
+        getMaxNumber: function () {
+            return $http.get('/calendar/getMaxConfigOrder', apiConfig.create());
+        },
+
+
+
+
+
+        test: function () { return $http.get('/taxCalendar/test', apiConfig.create()); },
+        getWorkPlaceList: function () {
+            return $http.get('/taxCalendar/getWorkPlaceList', apiConfig.create());
         },
         deleteTaxProject: function(taxProjectId){
             return $http.post('/taxCalendar/deleteTaxProject/' + taxProjectId, {}, apiConfig.create());
@@ -30,15 +48,8 @@ webservices.factory('taxCalendarService', ['$http', 'apiConfig', function ($http
         deleteWorkPlace: function(workPlaceId){
             return $http.post('/taxCalendar/deleteWorkPlace/' + workPlaceId, {}, apiConfig.create());
         },
-        saveTaxCalendarConfig: function (data) {
-            return $http.post('/taxCalendar/saveTaxCalendarConfig', data, apiConfig.create());
-        },
-        getMaxNumber: function () {
-            return $http.get('/taxCalendar/getMaxNumber', apiConfig.create());
-        },
-        getTaxCalendarDataForDisplay: function (startData, endDate) {
-            return $http.post('/taxCalendar/getTaxCalendarDataForDisplay', { queryStartTime: (new Date(startData)).dateTimeToString('yyyyMMdd'), queryEndTime: (new Date(endDate)).dateTimeToString('yyyyMMdd'), userID: '', userName: '' }, apiConfig.create());
-        },
+
+
         getTaxCalendarUserCompanys: function (userName) {
             return $http.get('/taxCalendar/getTaxCalendarUserCompanys/' + userName, apiConfig.create());
         },

atms-web/src/main/webapp/app/common/webservices/taxCalendarEvent.svc.js

@@ -6,15 +6,15 @@ function ($http, apiConfig, httpCacheService) {
     return {
         
         add: function (model) {
-            return $http.post('/taxCalendarEvent/add', model, apiConfig.create());
+            return $http.post('api/v1/calendarEvent/add', model, apiConfig.create());
         },
 
         update: function (model) {
-            return $http.post('/taxCalendarEvent/update', model, apiConfig.create());
+            return $http.post('api/v1/calendarEvent/update', model, apiConfig.create());
         }
         ,
         deleteEvent: function (model) {
-            return $http.post('/taxCalendarEvent/delete', model, apiConfig.create());
+            return $http.post('api/v1/calendarEvent/delete', model, apiConfig.create());
         }
     };
 }]);
\ No newline at end of file