[DEL] delete statistic attribute service interface

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

 package pwc.taxtech.atms.controller;
 
-import java.util.List;
-
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,30 +8,32 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.ApiOperation;
 import pwc.taxtech.atms.dpo.StatisticAttributeDisplayDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.StatisticAttributeDto;
-import pwc.taxtech.atms.service.StatisticAttributeService;
+import pwc.taxtech.atms.service.impl.StatisticAttributeServiceImpl;
+
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/v1/statisticAttribute/")
 public class StatisticAttributeController {
 
     @Autowired
-    private StatisticAttributeService statisticAttributeService;
+    private StatisticAttributeServiceImpl statisticAttributeService;
 
     @ApiOperation(value = "显示自定义显示字段")
     @RequestMapping(value = "getByParentDimensionID", method = RequestMethod.GET)
-    public @ResponseBody List<StatisticAttributeDisplayDto> getDimensionStatics(
+    public @ResponseBody
+    List<StatisticAttributeDisplayDto> getDimensionStatics(
             @RequestParam("parentDimensionID") String parentDimensionId) {
         return statisticAttributeService.getStatisticAttributeListByDimensionId(parentDimensionId, null);
     }
 
     @ApiOperation(value = "自定义显示字段下拉框")
     @RequestMapping(value = "get", method = RequestMethod.GET)
-    public @ResponseBody List<StatisticAttributeDto> getStatisticAttributeList(
+    public @ResponseBody
+    List<StatisticAttributeDto> getStatisticAttributeList(
             @RequestParam("dictionaryCode") String dictionaryCode) {
         return statisticAttributeService.getStatisticAttributeList(dictionaryCode);
     }
@@ -47,7 +48,8 @@ public class StatisticAttributeController {
 
     @ApiOperation(value = "机构管理/卡片/机构/点击自定义显示内容按钮")
     @RequestMapping(value = "getOrgSubChildrenStatAttributeList", method = RequestMethod.GET)
-    public @ResponseBody List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList(
+    public @ResponseBody
+    List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList(
             @RequestParam("parentDimensionId") String parentDimensionId) {
         return statisticAttributeService.getOrgSubChildrenStatAttributeList(parentDimensionId);
     }

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

-package pwc.taxtech.atms.service;
-
-import java.util.List;
-
-import pwc.taxtech.atms.dpo.StatisticAttributeDisplayDto;
-import pwc.taxtech.atms.dto.OperationResultDto;
-import pwc.taxtech.atms.dto.StatisticAttributeDto;
-
-public interface StatisticAttributeService {
-
-    List<StatisticAttributeDisplayDto> getStatisticAttributeListByDimensionId(String parentDimensionId,
-            List<StatisticAttributeDisplayDto> rawAttrList);
-
-    @SuppressWarnings("rawtypes")
-    OperationResultDto updateStatisticAttribute(List<StatisticAttributeDisplayDto> attributeList);
-
-    List<StatisticAttributeDto> getStatisticAttributeList(String dictionaryCode);
-    
-    List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList(String parentDimensionId);
-
-}

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

@@ -29,7 +29,6 @@ import pwc.taxtech.atms.dto.navtree.DevTreeDto;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.service.BusinessUnitService;
 import pwc.taxtech.atms.service.DimensionService;
-import pwc.taxtech.atms.service.StatisticAttributeService;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -52,7 +51,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
     @Autowired
     private BusinessUnitService businessUnitService;
     @Autowired
-    private StatisticAttributeService statisticAttributeService;
+    private StatisticAttributeServiceImpl statisticAttributeService;
 
     @Override
     public List<DimensionDto> getDimensionStatics() {
@@ -164,7 +163,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
                 dimensionDto.setDimensionType(dimensionTypeEnum.value());
             }
         }
-        return resultList.stream().filter(x->!Strings.equals(x.getId(),DimensionConstant.OrgSubChildrenId)).collect(Collectors.toList());
+        return resultList.stream().filter(x -> !Strings.equals(x.getId(), DimensionConstant.OrgSubChildrenId)).collect(Collectors.toList());
     }
 
     private List<DimensionValue> findDimensionValueByDimensionIdAndIsActiveTrue(String dimensionId) {
@@ -393,7 +392,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
         return list;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     public List<DevTreeDto> getDevDimensionTreeList() {
         List<DevTreeDto> devTreeList = new ArrayList<>();
@@ -422,7 +421,7 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
     }
 
     @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings({"rawtypes", "unchecked"})
     public OperationResultDto addDimension(DimensionDto model) {
         Assert.notNull(model, "Null model");
         Assert.hasText(model.getName(), "Empty name");

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

@@ -61,7 +61,6 @@ import pwc.taxtech.atms.service.DimensionService;
 import pwc.taxtech.atms.service.OperationLogService;
 import pwc.taxtech.atms.service.OrganizationService;
 import pwc.taxtech.atms.service.RoleService;
-import pwc.taxtech.atms.service.StatisticAttributeService;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -98,7 +97,7 @@ public class OrganizationServiceImpl implements OrganizationService {
     private IndustryMapper industryMapper;
 
     @Autowired
-    private StatisticAttributeService statisticAttributeService;
+    private StatisticAttributeServiceImpl statisticAttributeService;
 
     @Autowired
     private DimensionService dimensionService;

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

@@ -23,7 +23,6 @@ import pwc.taxtech.atms.entity.StatisticAttributeDimensionExample;
 import pwc.taxtech.atms.entity.StatisticAttributeExample;
 import pwc.taxtech.atms.exception.ApplicationException;
 import pwc.taxtech.atms.service.DimensionService;
-import pwc.taxtech.atms.service.StatisticAttributeService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,14 +39,13 @@ import static pwc.taxtech.atms.common.CommonUtils.copyProperties;
 /**
  */
 @Service
-public class StatisticAttributeServiceImpl extends AbstractService implements StatisticAttributeService {
+public class StatisticAttributeServiceImpl extends AbstractService {
 
     @Autowired
     private DimensionService dimensionService;
     @Autowired
     private DictionaryServiceImpl dictionaryService;
 
-    @Override
     public List<StatisticAttributeDisplayDto> getStatisticAttributeListByDimensionId(String parentDimensionId,
                                                                                      List<StatisticAttributeDisplayDto> rawAttrList) {
         // parentDimensionId = "c61a5bd6-a996-4952-9869-d053995237e5";
@@ -115,7 +113,6 @@ public class StatisticAttributeServiceImpl extends AbstractService implements St
         return result;
     }
 
-    @Override
     @SuppressWarnings("rawtypes")
     public OperationResultDto updateStatisticAttribute(List<StatisticAttributeDisplayDto> modelList) {
         if (!Lang.isEmpty(modelList)) {
@@ -190,7 +187,6 @@ public class StatisticAttributeServiceImpl extends AbstractService implements St
         operationLogService.addOperationLogList(logList);
     }
 
-    @Override
     public List<StatisticAttributeDto> getStatisticAttributeList(String dictionaryCode) {
         StatisticAttributeExample example = new StatisticAttributeExample();
         example.createCriteria().andIsActiveEqualTo(true);
@@ -213,7 +209,6 @@ public class StatisticAttributeServiceImpl extends AbstractService implements St
         return list;
     }
 
-    @Override
     public List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList(String parentDimensionId) {
         List<StatisticAttributeDisplayDto> query = myStatisticAttributeMapper
                 .selectByParentDimensionId(parentDimensionId);