Merge branch 'dev_neo' into 'dev'

[DEV] and index template and dependence js and controller

See merge request root/atms!13

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.ApiOperation;
 import pwc.taxtech.atms.dto.ProjectClientDto;
 import pwc.taxtech.atms.dto.ServiceTypeDto;
+import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
 import pwc.taxtech.atms.service.ProjectService;
 
 @RestController
@@ -40,4 +41,11 @@ public class ProjectController {
         return projectService.getProjectClientList();
     }
 
+    @ApiOperation(value = "getProject" ,notes = "Get Project")
+    @RequestMapping(value = "getProject", method = RequestMethod.GET)
+    public @ResponseBody List<ProjectDisplayDto> GetProjectByID(String projectID)
+    {
+        return projectService.getProjectByID(projectID);
+    }
+
 }

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

+package pwc.taxtech.atms.controller;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1/tempStorage/")
+public class TempStorageController {
+    //TODO: only for index running ,should be query from db (neo)
+    @RequestMapping(value = "storage/{userID}/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public String GetTempStorage(String userId, String name) {//TODO:only for running,should be query from db (neo)
+        return "";
+    }
+}

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

+package pwc.taxtech.atms.controller;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.taxadmin.NotificationFilterDto;
+import pwc.taxtech.atms.dto.taxadmin.PushNotificationsWithTasksInfor;
+
+@RestController
+@RequestMapping("/api/v1/workflow/")
+public class WorkflowController {//TODO:only for index running,should be delete future (neo)
+    @RequestMapping(value = "getPushNotifications", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    PushNotificationsWithTasksInfor getPushNotifications(@RequestBody NotificationFilterDto notificationFilterDto) {
+        PushNotificationsWithTasksInfor notificationsWithTasksInfor = new PushNotificationsWithTasksInfor();
+        return notificationsWithTasksInfor;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/DictionaryDto.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+import java.util.Date;
+
+public class DictionaryDto {
+    private String Code;
+    private Date CreateTime;
+    private String DictionaryKey;
+    private String DictionaryValue;
+    private String ID;
+    private Boolean IsActive;
+    private Integer OrderIndex;
+    private String ParentCode;
+    private String Remark;
+    private Date UpdateTime;
+
+    public String getCode() {
+        return Code;
+    }
+
+    public void setCode(String code) {
+        Code = code;
+    }
+
+    public Date getCreateTime() {
+        return CreateTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        CreateTime = createTime;
+    }
+
+    public String getDictionaryKey() {
+        return DictionaryKey;
+    }
+
+    public void setDictionaryKey(String dictionaryKey) {
+        DictionaryKey = dictionaryKey;
+    }
+
+    public String getDictionaryValue() {
+        return DictionaryValue;
+    }
+
+    public void setDictionaryValue(String dictionaryValue) {
+        DictionaryValue = dictionaryValue;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
+    public Boolean getActive() {
+        return IsActive;
+    }
+
+    public void setActive(Boolean active) {
+        IsActive = active;
+    }
+
+    public Integer getOrderIndex() {
+        return OrderIndex;
+    }
+
+    public void setOrderIndex(Integer orderIndex) {
+        OrderIndex = orderIndex;
+    }
+
+    public String getParentCode() {
+        return ParentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        ParentCode = parentCode;
+    }
+
+    public String getRemark() {
+        return Remark;
+    }
+
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
+
+    public Date getUpdateTime() {
+        return UpdateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        UpdateTime = updateTime;
+    }
+
+    public DictionaryDto() {
+        Code = "124";
+        CreateTime = new Date();
+        DictionaryKey = "d1";
+        DictionaryValue = "dv";
+        this.ID = "1234";
+        IsActive = true;
+        OrderIndex = 1;
+        ParentCode = "1";
+        Remark = "mark";
+        UpdateTime = new Date();
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/NotificationFilterDto.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+import java.util.Date;
+
+public class NotificationFilterDto {
+   private String FilterType;
+   private Boolean IsFirstTimeLoading;
+   private String MainFilter;
+   private Date MultipleDueDate;
+   private String MultipleNode;
+   private String MultiplePriority;
+   private String MultipleStatus;
+   private String MultipleTask;
+   private String MultipleType;
+   private String SearchKeyword;
+   private Integer ServiceType;
+   private String SingleNode;
+   private String SingleTask;
+
+    public String getFilterType() {
+        return FilterType;
+    }
+
+    public void setFilterType(String filterType) {
+        FilterType = filterType;
+    }
+
+    public Boolean getFirstTimeLoading() {
+        return IsFirstTimeLoading;
+    }
+
+    public void setFirstTimeLoading(Boolean firstTimeLoading) {
+        IsFirstTimeLoading = firstTimeLoading;
+    }
+
+    public String getMainFilter() {
+        return MainFilter;
+    }
+
+    public void setMainFilter(String mainFilter) {
+        MainFilter = mainFilter;
+    }
+
+    public Date getMultipleDueDate() {
+        return MultipleDueDate;
+    }
+
+    public void setMultipleDueDate(Date multipleDueDate) {
+        MultipleDueDate = multipleDueDate;
+    }
+
+    public String getMultipleNode() {
+        return MultipleNode;
+    }
+
+    public void setMultipleNode(String multipleNode) {
+        MultipleNode = multipleNode;
+    }
+
+    public String getMultiplePriority() {
+        return MultiplePriority;
+    }
+
+    public void setMultiplePriority(String multiplePriority) {
+        MultiplePriority = multiplePriority;
+    }
+
+    public String getMultipleStatus() {
+        return MultipleStatus;
+    }
+
+    public void setMultipleStatus(String multipleStatus) {
+        MultipleStatus = multipleStatus;
+    }
+
+    public String getMultipleTask() {
+        return MultipleTask;
+    }
+
+    public void setMultipleTask(String multipleTask) {
+        MultipleTask = multipleTask;
+    }
+
+    public String getMultipleType() {
+        return MultipleType;
+    }
+
+    public void setMultipleType(String multipleType) {
+        MultipleType = multipleType;
+    }
+
+    public String getSearchKeyword() {
+        return SearchKeyword;
+    }
+
+    public void setSearchKeyword(String searchKeyword) {
+        SearchKeyword = searchKeyword;
+    }
+
+    public int getServiceType() {
+        return ServiceType;
+    }
+
+    public void setServiceType(int serviceType) {
+        ServiceType = serviceType;
+    }
+
+    public String getSingleNode() {
+        return SingleNode;
+    }
+
+    public void setSingleNode(String singleNode) {
+        SingleNode = singleNode;
+    }
+
+    public String getSingleTask() {
+        return SingleTask;
+    }
+
+    public void setSingleTask(String singleTask) {
+        SingleTask = singleTask;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/ProjectDisplayDto.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.List;
+
+public class ProjectDisplayDto {
+    private String clientCode ;
+    private String code ;
+    private Date createTime ;
+    private String dbName ;
+    private Date effectiveDate ;
+    private Integer endPeriod ;
+    private String enterpriseAccountSetID ;
+    private Date expiredDate ;
+    private Boolean haveCreateProject ;
+    private String id ;
+    private String industryID ;
+    private String industryName ;
+    private Boolean isActive ;
+    private String name ;
+    private String organizationID ;
+    private String organizationName ;
+    private Dictionary<Integer, Integer> projectStatusList ;
+    private String regionID ;
+    private String regionName ;
+    private Integer ruleType ;
+    private String serviceTypeID ;
+    private List<String> serviceTypeIDs ;
+    private String serviceTypeName ;
+    private List<ServiceTypeTemplateGroup> serviceTypeTemplateGroupList ;
+    private Integer startPeriod ;
+    private String templateGroupID ;
+    private String templateGroupName ;
+    private Date upDate ;
+    private Integer year ;
+
+    public String getClientCode() {
+        return clientCode;
+    }
+
+    public void setClientCode(String clientCode) {
+        this.clientCode = clientCode;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDbName() {
+        return dbName;
+    }
+
+    public void setDbName(String dbName) {
+        this.dbName = dbName;
+    }
+
+    public Date getEffectiveDate() {
+        return effectiveDate;
+    }
+
+    public void setEffectiveDate(Date effectiveDate) {
+        this.effectiveDate = effectiveDate;
+    }
+
+    public Integer getEndPeriod() {
+        return endPeriod;
+    }
+
+    public void setEndPeriod(Integer endPeriod) {
+        this.endPeriod = endPeriod;
+    }
+
+    public String getEnterpriseAccountSetID() {
+        return enterpriseAccountSetID;
+    }
+
+    public void setEnterpriseAccountSetID(String enterpriseAccountSetID) {
+        this.enterpriseAccountSetID = enterpriseAccountSetID;
+    }
+
+    public Date getExpiredDate() {
+        return expiredDate;
+    }
+
+    public void setExpiredDate(Date expiredDate) {
+        this.expiredDate = expiredDate;
+    }
+
+    public Boolean getHaveCreateProject() {
+        return haveCreateProject;
+    }
+
+    public void setHaveCreateProject(Boolean haveCreateProject) {
+        this.haveCreateProject = haveCreateProject;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIndustryID() {
+        return industryID;
+    }
+
+    public void setIndustryID(String industryID) {
+        this.industryID = industryID;
+    }
+
+    public String getIndustryName() {
+        return industryName;
+    }
+
+    public void setIndustryName(String industryName) {
+        this.industryName = industryName;
+    }
+
+    public Boolean getActive() {
+        return isActive;
+    }
+
+    public void setActive(Boolean active) {
+        isActive = active;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOrganizationID() {
+        return organizationID;
+    }
+
+    public void setOrganizationID(String organizationID) {
+        this.organizationID = organizationID;
+    }
+
+    public String getOrganizationName() {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName) {
+        this.organizationName = organizationName;
+    }
+
+    public Dictionary<Integer, Integer> getProjectStatusList() {
+        return projectStatusList;
+    }
+
+    public void setProjectStatusList(Dictionary<Integer, Integer> projectStatusList) {
+        this.projectStatusList = projectStatusList;
+    }
+
+    public String getRegionID() {
+        return regionID;
+    }
+
+    public void setRegionID(String regionID) {
+        this.regionID = regionID;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public Integer getRuleType() {
+        return ruleType;
+    }
+
+    public void setRuleType(Integer ruleType) {
+        this.ruleType = ruleType;
+    }
+
+    public String getServiceTypeID() {
+        return serviceTypeID;
+    }
+
+    public void setServiceTypeID(String serviceTypeID) {
+        this.serviceTypeID = serviceTypeID;
+    }
+
+    public List<String> getServiceTypeIDs() {
+        return serviceTypeIDs;
+    }
+
+    public void setServiceTypeIDs(List<String> serviceTypeIDs) {
+        this.serviceTypeIDs = serviceTypeIDs;
+    }
+
+    public String getServiceTypeName() {
+        return serviceTypeName;
+    }
+
+    public void setServiceTypeName(String serviceTypeName) {
+        this.serviceTypeName = serviceTypeName;
+    }
+
+    public List<ServiceTypeTemplateGroup> getServiceTypeTemplateGroupList() {
+        return serviceTypeTemplateGroupList;
+    }
+
+    public void setServiceTypeTemplateGroupList(List<ServiceTypeTemplateGroup> serviceTypeTemplateGroupList) {
+        this.serviceTypeTemplateGroupList = serviceTypeTemplateGroupList;
+    }
+
+    public Integer getStartPeriod() {
+        return startPeriod;
+    }
+
+    public void setStartPeriod(Integer startPeriod) {
+        this.startPeriod = startPeriod;
+    }
+
+    public String getTemplateGroupID() {
+        return templateGroupID;
+    }
+
+    public void setTemplateGroupID(String templateGroupID) {
+        this.templateGroupID = templateGroupID;
+    }
+
+    public String getTemplateGroupName() {
+        return templateGroupName;
+    }
+
+    public void setTemplateGroupName(String templateGroupName) {
+        this.templateGroupName = templateGroupName;
+    }
+
+    public Date getUpDate() {
+        return upDate;
+    }
+
+    public void setUpDate(Date upDate) {
+        this.upDate = upDate;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public ProjectDisplayDto demo() {
+        this.clientCode = "1";
+        this.code = "1";
+        this.createTime = new Date();
+        this.dbName = "db";
+        this.effectiveDate = new Date();
+        this.endPeriod = 1;
+        this.enterpriseAccountSetID = "1";
+        this.expiredDate = new Date();
+        this.haveCreateProject = true;
+        this.id = "1";
+        this.industryID = "1";
+        this.industryName = "dname";
+        this.isActive = true;
+        this.name = "na";
+        this.organizationID = "oid";
+        this.organizationName = "oname";
+        this.projectStatusList=null;
+        this.regionID = "1";
+        this.regionName = "rn";
+        this.ruleType = 1;
+        this.serviceTypeID = "1";
+        this.serviceTypeIDs = new ArrayList<>();
+        this.serviceTypeName = "sn";
+        this.serviceTypeTemplateGroupList =new ArrayList<>();
+        this.startPeriod = 1;
+        this.templateGroupID = "1";
+        this.templateGroupName = "tn";
+        this.upDate = new Date();
+        this.year = 1;
+        return this;
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/PushNotificationsWithTasksInfor.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PushNotificationsWithTasksInfor {
+    private List<WorkflowMessageCategoryDto> MessageCategoryList;
+    private List<DictionaryDto> NodesAndTaskesList;
+    private List<WorkflowMessageResultDto> NotificationList;
+
+    public List<WorkflowMessageCategoryDto> getMessageCategoryList() {
+        return MessageCategoryList;
+    }
+
+    public void setMessageCategoryList(List<WorkflowMessageCategoryDto> messageCategoryList) {
+        MessageCategoryList = messageCategoryList;
+    }
+
+    public List<DictionaryDto> getNodesAndTaskesList() {
+        return NodesAndTaskesList;
+    }
+
+    public void setNodesAndTaskesList(List<DictionaryDto> nodesAndTaskesList) {
+        NodesAndTaskesList = nodesAndTaskesList;
+    }
+
+    public List<WorkflowMessageResultDto> getNotificationList() {
+        return NotificationList;
+    }
+
+    public void setNotificationList(List<WorkflowMessageResultDto> notificationList) {
+        NotificationList = notificationList;
+    }
+
+    public PushNotificationsWithTasksInfor() {
+        MessageCategoryList = new ArrayList<>(1);
+        MessageCategoryList.add(new WorkflowMessageCategoryDto());
+
+        NodesAndTaskesList = new ArrayList<>(1);
+        NodesAndTaskesList.add(new DictionaryDto());
+
+        NotificationList = new ArrayList<>(1);
+        NotificationList.add(new WorkflowMessageResultDto());
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/ServiceTypeTemplateGroup.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+public class ServiceTypeTemplateGroup {
+    private String ProjectServiceTypeID ;
+    private String ServiceTypeID ;
+    private String ServiceTypeName ;
+    private String TemplateGroupID ;
+    private String TemplateGroupName ;
+
+    public String getProjectServiceTypeID() {
+        return ProjectServiceTypeID;
+    }
+
+    public void setProjectServiceTypeID(String projectServiceTypeID) {
+        ProjectServiceTypeID = projectServiceTypeID;
+    }
+
+    public String getServiceTypeID() {
+        return ServiceTypeID;
+    }
+
+    public void setServiceTypeID(String serviceTypeID) {
+        ServiceTypeID = serviceTypeID;
+    }
+
+    public String getServiceTypeName() {
+        return ServiceTypeName;
+    }
+
+    public void setServiceTypeName(String serviceTypeName) {
+        ServiceTypeName = serviceTypeName;
+    }
+
+    public String getTemplateGroupID() {
+        return TemplateGroupID;
+    }
+
+    public void setTemplateGroupID(String templateGroupID) {
+        TemplateGroupID = templateGroupID;
+    }
+
+    public String getTemplateGroupName() {
+        return TemplateGroupName;
+    }
+
+    public void setTemplateGroupName(String templateGroupName) {
+        TemplateGroupName = templateGroupName;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/WorkflowMessageCategoryDto.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+public class WorkflowMessageCategoryDto {
+    private String Code;
+    private String ID;
+    private String Name;
+    private short OrderIndex;
+
+    public String getCode() {
+        return Code;
+    }
+
+    public void setCode(String code) {
+        Code = code;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
+    public String getName() {
+        return Name;
+    }
+
+    public void setName(String name) {
+        Name = name;
+    }
+
+    public short getOrderIndex() {
+        return OrderIndex;
+    }
+
+    public void setOrderIndex(short orderIndex) {
+        OrderIndex = orderIndex;
+    }
+
+    public WorkflowMessageCategoryDto() {
+        Code = "124";
+        this.ID = "1234";
+        Name = "admin_name";
+        OrderIndex = 1;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/taxadmin/WorkflowMessageResultDto.java

+package pwc.taxtech.atms.dto.taxadmin;
+
+import java.util.Date;
+
+public class WorkflowMessageResultDto {
+
+    private String Category;
+    private Date CreateTime;
+    private String CreatorID;
+    private String DbName;
+    private Date DeadlineDateTime;
+    private String DisplayCategory;
+    private String DisplayDeadlineDateFormat;
+    private String DisplaySendingDateFormat;
+    private String DisplaySubCategory;
+    private String ID;
+    private Integer IsRead;
+    private String MessageCategoryID;
+    private String MessageDetail;
+    private String MessageTitle;
+    private Integer OffsetHours;
+    private Integer PeriodID;
+    private Integer Priority;
+    private String Remarks;
+    private Date SendingDateTime;
+    private Integer ServiceTypeID;
+    private String TaskDictKey;
+    private Date UpdateTime;
+    private String WorkflowMessageID;
+    private String WorkflowNodeID;
+    private String WorkflowTaskID;
+
+    public String getCategory() {
+        return Category;
+    }
+
+    public void setCategory(String category) {
+        Category = category;
+    }
+
+    public Date getCreateTime() {
+        return CreateTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        CreateTime = createTime;
+    }
+
+    public String getCreatorID() {
+        return CreatorID;
+    }
+
+    public void setCreatorID(String creatorID) {
+        CreatorID = creatorID;
+    }
+
+    public String getDbName() {
+        return DbName;
+    }
+
+    public void setDbName(String dbName) {
+        DbName = dbName;
+    }
+
+    public Date getDeadlineDateTime() {
+        return DeadlineDateTime;
+    }
+
+    public void setDeadlineDateTime(Date deadlineDateTime) {
+        DeadlineDateTime = deadlineDateTime;
+    }
+
+    public String getDisplayCategory() {
+        return DisplayCategory;
+    }
+
+    public void setDisplayCategory(String displayCategory) {
+        DisplayCategory = displayCategory;
+    }
+
+    public String getDisplayDeadlineDateFormat() {
+        return DisplayDeadlineDateFormat;
+    }
+
+    public void setDisplayDeadlineDateFormat(String displayDeadlineDateFormat) {
+        DisplayDeadlineDateFormat = displayDeadlineDateFormat;
+    }
+
+    public String getDisplaySendingDateFormat() {
+        return DisplaySendingDateFormat;
+    }
+
+    public void setDisplaySendingDateFormat(String displaySendingDateFormat) {
+        DisplaySendingDateFormat = displaySendingDateFormat;
+    }
+
+    public String getDisplaySubCategory() {
+        return DisplaySubCategory;
+    }
+
+    public void setDisplaySubCategory(String displaySubCategory) {
+        DisplaySubCategory = displaySubCategory;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
+    public Integer getIsRead() {
+        return IsRead;
+    }
+
+    public void setIsRead(Integer isRead) {
+        IsRead = isRead;
+    }
+
+    public String getMessageCategoryID() {
+        return MessageCategoryID;
+    }
+
+    public void setMessageCategoryID(String messageCategoryID) {
+        MessageCategoryID = messageCategoryID;
+    }
+
+    public String getMessageDetail() {
+        return MessageDetail;
+    }
+
+    public void setMessageDetail(String messageDetail) {
+        MessageDetail = messageDetail;
+    }
+
+    public String getMessageTitle() {
+        return MessageTitle;
+    }
+
+    public void setMessageTitle(String messageTitle) {
+        MessageTitle = messageTitle;
+    }
+
+    public Integer getOffsetHours() {
+        return OffsetHours;
+    }
+
+    public void setOffsetHours(Integer offsetHours) {
+        OffsetHours = offsetHours;
+    }
+
+    public Integer getPeriodID() {
+        return PeriodID;
+    }
+
+    public void setPeriodID(Integer periodID) {
+        PeriodID = periodID;
+    }
+
+    public Integer getPriority() {
+        return Priority;
+    }
+
+    public void setPriority(Integer priority) {
+        Priority = priority;
+    }
+
+    public String getRemarks() {
+        return Remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        Remarks = remarks;
+    }
+
+    public Date getSendingDateTime() {
+        return SendingDateTime;
+    }
+
+    public void setSendingDateTime(Date sendingDateTime) {
+        SendingDateTime = sendingDateTime;
+    }
+
+    public Integer getServiceTypeID() {
+        return ServiceTypeID;
+    }
+
+    public void setServiceTypeID(Integer serviceTypeID) {
+        ServiceTypeID = serviceTypeID;
+    }
+
+    public String getTaskDictKey() {
+        return TaskDictKey;
+    }
+
+    public void setTaskDictKey(String taskDictKey) {
+        TaskDictKey = taskDictKey;
+    }
+
+    public Date getUpdateTime() {
+        return UpdateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        UpdateTime = updateTime;
+    }
+
+    public String getWorkflowMessageID() {
+        return WorkflowMessageID;
+    }
+
+    public void setWorkflowMessageID(String workflowMessageID) {
+        WorkflowMessageID = workflowMessageID;
+    }
+
+    public String getWorkflowNodeID() {
+        return WorkflowNodeID;
+    }
+
+    public void setWorkflowNodeID(String workflowNodeID) {
+        WorkflowNodeID = workflowNodeID;
+    }
+
+    public String getWorkflowTaskID() {
+        return WorkflowTaskID;
+    }
+
+    public void setWorkflowTaskID(String workflowTaskID) {
+        WorkflowTaskID = workflowTaskID;
+    }
+
+    public WorkflowMessageResultDto() {
+        Category = "cat";
+        CreateTime = new Date();
+        CreatorID = "11";
+        DbName = "db";
+        DeadlineDateTime = new Date();
+        DisplayCategory = "cat";
+        DisplayDeadlineDateFormat = "dd";
+        DisplaySendingDateFormat = "dd";
+        DisplaySubCategory = "ssc";
+        this.ID = "1234";
+        IsRead = 11;
+        MessageCategoryID = "11";
+        MessageDetail = "11";
+        MessageTitle = "11";
+        OffsetHours = 1;
+        PeriodID = 1;
+        Priority = 1;
+        Remarks = "mark";
+        SendingDateTime = new Date();
+        ServiceTypeID = 1;
+        TaskDictKey = "1";
+        UpdateTime = new Date();
+        WorkflowMessageID = "1";
+        WorkflowNodeID = "1";
+        WorkflowTaskID = "1";
+    }
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import pwc.taxtech.atms.dto.ProjectClientDto;
 import pwc.taxtech.atms.dto.ServiceTypeDto;
+import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
 
 public interface ProjectService {
     /** @see PwC.Tax.Tech.Atms..Admin.Application\Services\IProjectService.cs */
@@ -33,6 +34,8 @@ public interface ProjectService {
 
     List<ProjectClientDto> getProjectClientList();
 
+    List<ProjectDisplayDto> getProjectByID(String projectID);
+
     // Map<Integer, Integer> getProjectAllStatus(String dbName);
 
 }

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

 package pwc.taxtech.atms.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -15,6 +16,7 @@ import pwc.taxtech.atms.dao.TemplateGroupMapper;
 import pwc.taxtech.atms.dto.ProjectClientDto;
 import pwc.taxtech.atms.dto.ServiceTypeDto;
 import pwc.taxtech.atms.dto.TemplateGroupDto;
+import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
 import pwc.taxtech.atms.entitiy.ProjectClient;
 import pwc.taxtech.atms.entitiy.ProjectClientExample;
 import pwc.taxtech.atms.entitiy.ProjectClientExample.Criteria;
@@ -77,6 +79,14 @@ public class ProjectServiceImpl implements ProjectService {
         return projectClientList.stream().map(this::rotateProjectClient).collect(Collectors.toList());
     }
 
+    /** @TODO: this dmeo only for running,should change to query data from db (neo)*/
+    @Override
+    public List<ProjectDisplayDto> getProjectByID(String projectID) {
+        List<ProjectDisplayDto> displayDtos =new ArrayList<>();
+        displayDtos.add(new ProjectDisplayDto().demo());
+        return displayDtos;
+    }
+
     /** @TODO: change the return part after copyProperties function updated */
     private ServiceTypeDto rotateServiceType(ServiceType serviceType) {
         ServiceTypeDto serviceTypeDto = new ServiceTypeDto();

atms-web/src/main/java/pwc/taxtech/atms/web/controller/IndexController.java

@@ -18,4 +18,12 @@ public class IndexController {
         return "redirect:Account/LogOn";
     }
 
+    @RequestMapping(value = {"/admin", "/admin.html" }, method = RequestMethod.GET)
+    public String admin(@CookieValue(value = "AtmsApiToken", required = false) String atmsApiToken) {
+        if (StringUtils.hasText(atmsApiToken)) {
+            return "admin";
+        }
+        return "redirect:Account/LogOn";
+    }
+
 }

atms-web/src/main/webapp/Gruntfile.js

@@ -163,7 +163,9 @@ grunt.initConfig({
                 "Scripts/fileSaver/FileSaver.js",
                 "Scripts/fileSaver/angular-file-saver.js",
                 "Scripts/moment.min.js",
-                "Scripts/jquery-daterangepicker/jquery.daterangepicker.js"],
+                "Scripts/jquery-daterangepicker/jquery.daterangepicker.js",
+                "Scripts/sortable.js",
+                "Scripts/malhar-angular-dashboard.js"],
             dest: '<%= pkg.bundleDest %>/angular.js'
         },
         angularui: {
@@ -247,7 +249,7 @@ grunt.initConfig({
             dest: '<%= pkg.bundleDest %>/common.js'
         },
         frameworkJs: {
-            src: ["app/framework/**/*.js"],
+            src: ["app/framework/**/*.js", "app/dashboard/**/*.js"],
             dest: '<%= pkg.bundleDest %>/framework.js'
         },
         cldr: {
@@ -295,7 +297,69 @@ grunt.initConfig({
         scriptsLogin: {
             src: ["Scripts/login.js", "Scripts/jquery.validate.js"],
             dest: '<%= pkg.bundleDest %>/scriptsLogin.js'
+        },
+        jsword: {
+            src: ["Scripts/jsword/canvas-toBlob.js",
+                                          "Scripts/jsword/FileSaver.js",
+                                          "Scripts/jsword/docxtemplater.v3.0.0.js",
+                                          "Scripts/jsword/imagemodule.js",
+                                          "Scripts/jsword/jszip.js",
+                                          "Scripts/jsword/jszip-utils.js"],
+            dest: '<%= pkg.bundleDest %>/jsword.js'
+        },
+        monthPicker:{
+            src: ["Scripts/month-picker/datePicker.js", "Scripts/month-picker/tether.min.js"],
+            dest: '<%= pkg.bundleDest %>/month-picker.js'
+        },
+        frameworkLess: {
+            options: { process },
+            files: {
+                '<%= pkg.bundleDest %>/less/framework.less': ["app/framework/**/*.less",
+                "app/dashboard/**/*.less"]
+            }
+        },
+        taxDocumentManageLess: {
+            options: { process },
+            files: {
+                '<%= pkg.bundleDest %>/less/taxDocumentManage.less': "app/taxDocumentManage/**/*.less"
+            }
+        },
+        taxDocumentManageJs: {
+            src: "app/taxDocumentManage/**/*.js",
+            dest: '<%= pkg.bundleDest %>/taxDocumentManage.js'
+        },
+        appJs: {
+            src: ["Scripts/app.js",
+                 "Scripts/app.config.js",
+                 "Scripts/module-part1.js",
+                 "Scripts/module-part2.js",
+                 "Scripts/module-part3.js",
+                 "Scripts/module-part4.js"
+            ],
+            dest: '<%= pkg.bundleDest %>/app.js'
+        },
+        summaryCs: {
+            src: [ "Content/jquery-ui.theme.css",
+                   "Content/jquery-ui-themes-1.8.10.custom.css",
+                   "Content/axure_rp_page.css",
+                   "Content/styles.css"],
+            dest: '<%= pkg.bundleDest %>/summary.css'
+        },
+        vatJs: {
+            src: "app/vat/**/*.js",
+            dest: '<%= pkg.bundleDest %>/vat.js'
+        },
+        vatCss: {
+            src: "app/vat/**/*.css",
+            dest: '<%= pkg.bundleDest %>/vat.css'
+        },
+        vatLess: {
+            options: { process },
+                files: {
+                    '<%= pkg.bundleDest %>/vat.less': "app/framework/**/*.less"
+                }
         }
+
     },
     less: {
         adminHomePage: {

atms-web/src/main/webapp/Scripts/app.config.js

+(function () {
+    'use strict';
+
+    angular.module('app.config', [])
+        // region of current application
+        .constant('region', 'zh-CN')
+        //.constant('region', 'en-US')
+        // version of current application
+        .constant('version', '1.0.0.0')
+        // Exceptionless Server URL
+        .constant('exceptionlessServerURL', '')
+        .run([
+            'region', function (region) {
+                $.when(
+                    $.getJSON("/Scripts/cldr/main/zh/numbers.json"),
+                    $.getJSON("/Scripts/cldr/main/zh/ca-gregorian.json"),
+                    $.getJSON("/Scripts/cldr/supplemental/likelySubtags.json")
+                ).then(function () {
+                    return [].slice.apply(arguments, [0]).map(function (result) {
+                        return result[0];
+                    });
+                }).then(Globalize.load).then(function () {
+                     Globalize.locale("zh-CN");
+                   // Globalize.locale("en-US");
+                    DevExpress.localization.locale(region);
+                    //DevExpress.localization.locale(navigator.language || navigator.browserLanguage);
+                });
+            }
+        ]);
+}());
\ No newline at end of file

atms-web/src/main/webapp/Scripts/module-part4.js

+
+var noPermissionPageModule = angular.module('app.noPermissionPage', [])
+    .run(['$log', function ($log) {
+        $log.debug('app.noPermissionPage.run()...');
+    }])
+    .config(['$controllerProvider', '$compileProvider', '$filterProvider', '$provide', 'scriptDependencyProvider', '$stateProvider', '$urlRouterProvider',
+        function ($controllerProvider, $compileProvider, $filterProvider, $provide, scriptDependencyProvider, $stateProvider, $urlRouterProvider) {
+            'use strict';
+
+
+            // this is required to add controller/directive/filter/service after angular bootstrap
+            bindModule(noPermissionPageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
+
+
+            $stateProvider.state({
+                name: 'noPermissionPage',
+                url: '/noPermissionPage',
+                views: {
+                    '@': {
+                        controller: ['$scope', '$stateParams', 'appTranslation',
+                       function ($scope, $stateParams, appTranslation) {
+                           appTranslation.load([appTranslation.noPermissionPage]);
+                       }],
+                        template: '<no-permission-page></no-permission-page>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.noPermissionPage),
+                deepStateRedirect: true,
+                sticky: true
+            });
+        }]);
+
+var taxDocumentManageModule = angular.module('app.taxDocumentManage', ['ui.grid', 'ui.grid.selection', 'ui.grid.moveColumns'
+    , 'ui.grid.grouping', 'ui.grid.expandable', 'ui.grid.treeView', 'ui.grid.exporter', 'ui.grid.resizeColumns'
+    , 'mc.resizer', 'ui.select', 'ngSanitize', 'ui.grid.edit', 'perfect_scrollbar', 'dx', 'ui.grid.pinning'])
+    .run(['$log', function ($log) {
+        $log.debug('app.taxDocumentManage.run()...');
+    }])
+    .config(['$controllerProvider', '$urlRouterProvider', '$compileProvider', '$filterProvider', '$provide', '$stateProvider', 'uiSelectConfig', 'scriptDependencyProvider',
+        function ($controllerProvider, $urlRouterProvider, $compileProvider, $filterProvider, $provide, $stateProvider, uiSelectConfig, scriptDependencyProvider) {
+            'use strict';
+            // this is required to add controller/directive/filter/service after angular bootstrap
+            bindModule(taxDocumentManageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
+
+            //uiSelectConfig.theme = 'select2';
+
+            //$urlRouterProvider.when('/taxDocumentManage', '/taxDocumentManage/document-manage/documentManage');
+
+
+            //$stateProvider.state({
+            //    name: 'taxDocumentManage',
+            //    url: '/taxDocumentManage',
+            //    cache: false,
+            //    views: {
+            //        '@': {
+            //            controller: ['$scope', '$stateParams', 'appTranslation',
+            //                function ($scope, $stateParams, appTranslation) {
+            //                    appTranslation.load([appTranslation.cit]);
+            //                }],
+            //            template: '<document-manage></document-manage>',
+            //        }
+            //    },
+            //    resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.taxDocumentManage), //???
+            //    deepStateRedirect: true,
+            //    sticky: true
+            //});
+
+        }]);
+
+
+var taxTaskManageModule = angular.module('app.taxTaskManage', ['ui.grid', 'ui.grid.selection', 'ui.grid.moveColumns'
+    , 'ui.grid.grouping', 'ui.grid.expandable', 'ui.grid.treeView', 'ui.grid.exporter', 'ui.grid.resizeColumns'
+    , 'mc.resizer', 'ui.select', 'ngSanitize', 'ui.grid.edit', 'perfect_scrollbar', 'dx', 'ui.grid.pinning'])
+    .run(['$log', function ($log) {
+        $log.debug('app.taxTaskManage.run()...');
+    }])
+    .config(['$controllerProvider', '$urlRouterProvider', '$compileProvider', '$filterProvider', '$provide', '$stateProvider', 'uiSelectConfig', 'scriptDependencyProvider',
+        function ($controllerProvider, $urlRouterProvider, $compileProvider, $filterProvider, $provide, $stateProvider, uiSelectConfig, scriptDependencyProvider) {
+            'use strict';
+            // this is required to add controller/directive/filter/service after angular bootstrap
+            bindModule(taxTaskManageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
+
+            $stateProvider.state({
+                name: 'taxTaskManage',
+                url: '/taxTaskManage?{code:string}',
+                cache: false,
+                views: {
+                    '@': {
+                        controller: ['$scope', '$stateParams', 'appTranslation',
+                            function ($scope, $stateParams, appTranslation) {
+                                console.log("taxTaskManageModule $stateParams:" + $stateParams.code);
+                                $scope.code = $stateParams.code;
+                                console.log("taxTaskManageModule $scope.code:" + $scope.code);
+                                appTranslation.load([appTranslation.cit]);
+                            }],
+                        template: '<tax-task-manage code="code"></tax-task-manage>',
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.taxTaskManage),
+                deepStateRedirect: false,
+                sticky: false
+            });
+        }]);
+
+var dataImportModule = angular.module('app.dataImport', [])
+    .run(['$log', function ($log) {
+        $log.debug('app.dataImport.run()...');
+    }])
+    .config(['$controllerProvider', '$compileProvider', '$filterProvider', '$provide', 'scriptDependencyProvider', '$stateProvider', '$urlRouterProvider',
+        function ($controllerProvider, $compileProvider, $filterProvider, $provide, scriptDependencyProvider, $stateProvider, $urlRouterProvider) {
+            'use strict';
+
+            // this is required to add controller/directive/filter/service after angular bootstrap
+            bindModule(dataImportModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
+
+            $stateProvider.state({
+                name: 'GlobalDataImportLayout',
+                url: '/globalDataImportLayout',
+                template: '<div global-data-import-layout></div>',
+                controller: ['$scope', '$stateParams', 'appTranslation', function ($scope, $stateParams, appTranslation) {
+                    appTranslation.load([appTranslation.appPart]);
+                }],
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImport),
+                deepStateRedirect: true,
+                sticky: true
+            });
+
+            $stateProvider.state({
+                name: 'GlobalDataImportView',
+                url: '/globalDataImportView',
+                params: {
+                    "organization": null,
+                    "dataType": null,
+                    "periodYear": null,
+                    "periodMonth": null,
+                    "project": null,
+                    "isBatchImport": null
+                },
+                template: '<div global-data-import-view="stateParams"></div>',
+                controller: ['$scope', '$stateParams', 'appTranslation', function ($scope, $stateParams, appTranslation) {
+                    appTranslation.load([appTranslation.appPart]);
+                    $scope.stateParams = $stateParams;
+                }],
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImport),
+                deepStateRedirect: true,
+                sticky: true
+            });
+        }]);
\ No newline at end of file

atms-web/src/main/webapp/WEB-INF/templates/admin.html

+<!--@using Scripts = System.Web.Optimization.Scripts
+@using Styles = System.Web.Optimization.Styles
+@{
+    Layout = null;
+}-->
+
+<!DOCTYPE html>
+<html ng-app="adminApp">
+<head>
+    <!--<base href="/Home/Admin/" />-->
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="chrome=1; IE=11; IE=10; IE=9; IE=EDGE">
+    <title>Apex+ ATMS</title>
+    <style>
+        [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+            display: none !important;
+        }
+
+        a.back-to-top {
+            top: 90%;
+            display: none;
+            width: 50px;
+            height: 50px;
+            text-indent: -9999px;
+            position: fixed;
+            z-index: 999;
+            right: 20px;
+            background: #a32020 url("/app-resources/images/up-arrow.png") no-repeat center 43%;
+            -webkit-border-radius: 30px;
+            -moz-border-radius: 30px;
+            border-radius: 30px;
+        }
+
+        a:hover.back-to-top {
+            background-color: #eb8c00;
+        }
+    </style>
+    <!--@Styles.Render("~/Content/css")
+    @Styles.Render("~/appresources/css")
+    @Styles.Render("~/bundles/appresources.less")
+    @Styles.Render("~/bundles/common.css")
+    @Styles.Render("~/bundles/common.less")-->
+
+    <link href="Content/bundle_content.css" rel="stylesheet" type="text/css" />
+    <link href="bundles/appresources.css" rel="stylesheet" type="text/css" />
+    <link href="bundles/appresources.less" rel="stylesheet" type="text/css" />
+    <link href="bundles/common.css" rel="stylesheet" type="text/css" />
+    <link href="bundles/common.less" rel="stylesheet" type="text/css" />
+</head>
+<body ng-controller="AdminAppController">
+    <!--@Html.AntiForgeryToken()-->
+    <div class="admin-wrapper">
+        <admin-app-nav></admin-app-nav>
+        <div class="page-wrapper">
+            <div class="main-content" ui-view></div>
+        </div>
+        <div class="clear"></div>
+        <atms-busy-indicator></atms-busy-indicator>
+
+        <app-modal></app-modal>
+    </div>
+    <!-- /#wrapper -->
+    <!--@Scripts.Render("~/bundles/modernizr")
+    @Scripts.Render("~/bundles/jquery", "~/bundles/jquerysignalR", "~/bundles/angular", "~/bundles/angularui", "~/bundles/bootstrap", "~/bundles/util", "~/bundles/jqueryval", "~/bundles/exceptionless", "~/bundles/angular-cache", "~/bundles/echarts", "~/bundles/mentio")
+    @Scripts.Render("~/bundles/adminApp.js", "~/bundles/common.js", "~/bundles/framework.js")
+    @Scripts.Render("~/signalr/hubs")-->
+    <!-- localization use globalize -->
+    <!--@Scripts.Render("~/bundles/cldr")
+    @Scripts.Render("~/bundles/globalize")
+    @Scripts.Render("~/bundles/dx")
+
+    @Scripts.Render("~/bundles/spreadjs")
+    @Scripts.Render("~/bundles/ivh-treeview")
+    @Scripts.Render("~/bundles/ui-select")-->
+
+    <!-- <script type="text/javascript" src="dummy/dummyCookie.js"></script> -->
+    <script type="text/javascript" src="atmsExtra.js"></script>
+    <script type="text/javascript" src="bundles/modernizr.js"></script>
+    <script type="text/javascript" src="bundles/jquery.js"></script>
+    <script type="text/javascript" src="bundles/jquerysignalR.js"></script>
+    <script type="text/javascript" src="bundles/angular.js"></script>
+    <script type="text/javascript" src="bundles/angularui.js"></script>
+    <script type="text/javascript" src="bundles/bootstrap.js"></script>
+    <script type="text/javascript" src="bundles/util.js"></script>
+    <script type="text/javascript" src="bundles/jqueryval.js"></script>
+    <script type="text/javascript" src="bundles/exceptionless.js"></script>
+    <script type="text/javascript" src="bundles/angular-cache.js"></script>
+    <script type="text/javascript" src="bundles/echarts.js"></script>
+    <script type="text/javascript" src="bundles/mentio.js"></script>
+    <script type="text/javascript" src="bundles/adminApp.js"></script>
+    <script type="text/javascript" src="bundles/common.js"></script>
+    <script type="text/javascript" src="bundles/framework.js"></script>
+    <script type="text/javascript" src="bundles/cldr.js"></script>
+    <script type="text/javascript" src="bundles/globalize.js"></script>
+    <script type="text/javascript" src="bundles/dx.js"></script>
+    <script type="text/javascript" src="bundles/spread.js"></script>
+    <script type="text/javascript" src="bundles/ivh-treeview.js"></script>
+    <script type="text/javascript" src="bundles/ui-select.js"></script>
+    <script type="text/javascript" src="bundles/spreadio.js"></script>
+
+    <script type="text/javascript">
+        //window.location.href = '/Home/Admin/#/userDetail/808b7a8c-0265-4497-9adb-6b7a757bd2f2';
+        //window.location.href = '/Home/Admin/#/role'; 
+        //window.location.href = '/Home/Admin/#/basicDataInfrastructure/customerListManage'; 
+        //window.location.href = '/Home/Admin/#/organizationViewInfrastructure/organizationBusinessUnitView';
+        //window.location.href = '/Home/Admin/#/organizationViewInfrastructure/organizationSubsidiaryView';
+        //window.location.href = '/Home/Admin/#/userlist';
+        //window.location.href = '/Home/Admin/#/noPermissionPage';
+        // window.location.href = '/Home/Admin/#/organization';
+        //window.location.href = '/Home/Admin/#/subjectCorresponding';
+        //window.location.href = '/Home/Admin/#/basicDataInfrastructure/regionManage';
+        // create the back to top button 
+        $('body').prepend('<a href="#" class="back-to-top">Back to Top</a>');
+
+        var amountScrolled = 300;
+
+        $(window).scroll(function () {
+            if ($(window).scrollTop() > amountScrolled) {
+                $('a.back-to-top').fadeIn('slow');
+            } else {
+                $('a.back-to-top').fadeOut('slow');
+            }
+        });
+
+        $('a.back-to-top, a.simple-back-to-top').click(function () {
+            $('html, body').animate({
+                scrollTop: 0
+            }, 700);
+            return false;
+        });
+    </script>
+</body>
+
+</html>

atms-web/src/main/webapp/app/common/vatservices/BSPLService.js

+webservices.factory('BSPLService', ['$log', '$http', 'apiConfig',
+    function ($log,$http,apiConfig) {
+        'use strict';
+        $log.debug('BSPLService.ctor()...');
+        return {
+
+            //CIT Remove(可以直接使用vat已有的):
+            //    citSwitchPeriod: function (templateID, period)
+            //    citGetCellDetailInfo: function (keyValueDataID)
+            //    citGetCellInfo: function (templateId,col,row)
+            //    citGenerateBSPL: function (projectId, period)
+            //    citGenerateBSPLWithoutLoading: function (projectId, period)
+            //    citGetReportData: function (projectId, templateId, period, generator)
+
+            GetCellDetailInfo: function (keyValueDataID) {
+                return $http.get('/bspl/cellDetail/' + keyValueDataID, apiConfig.createVat());
+            },
+            GetCellInfo: function (templateId,col,row) {
+                return $http.get('/bspl/cellDetail?templateId=' + templateId + '&col=' + col + '&row=' + row, apiConfig.createVat({ignoreLoadingBar:true}));
+            },
+            SwitchPeriod: function (templateID, period) {
+                return $http.get('/bspl/filter', apiConfig.createVat());
+            },
+            GenerateBSPL: function (projectId, period) {
+                return $http.get('/bspl/generate?projectId=' + projectId + '&period=' + period, apiConfig.createVat());
+            },
+            GenerateBSPLWithoutLoading: function (projectId, period) {
+                return $http.get('/bspl/generate?projectId=' + projectId + '&period=' + period, apiConfig.createVat({ ignoreLoadingBar: true }));
+            },
+            getReportData: function (projectId, templateId, period, generator) {
+                return $http.get('/bspl/reportData?templateId=' + templateId + '&projectID=' + projectId + '&period=' + period + '&generator=' + generator, apiConfig.createVat());
+            }
+        };
+
+}]);
\ No newline at end of file

atms-web/src/main/webapp/app/common/vatservices/keyValueDataParser.js

+
\ No newline at end of file

atms-web/src/main/webapp/app/common/vatservices/vatDifferenceService.js

+webservices.factory('vatDifferenceService', ['$log', '$http', 'apiConfig',
+    function ($log, $http, apiConfig) {
+        'use strict';
+        $log.debug('vatDifferenceService.ctor()...');
+        return {
+            taxDifferenceByVoucher: function (dto) {
+                return $http.post('/voucher/voucherSelectAdvancedByVoucher', dto, apiConfig.create());
+            },
+            getTaxDifferenceList: function (projectID,period) {
+                return $http.get('/taxDifference/getTaxDifferenceData/' + projectID+'/'+period, apiConfig.createVat());
+            }
+          
+        };
+
+    }]);
\ No newline at end of file