Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/AnalysisController.java

+package pwc.taxtech.atms;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import pwc.taxtech.atms.common.message.ErrorMessage;
+import pwc.taxtech.atms.controller.BaseController;
+import pwc.taxtech.atms.dto.ApiResultDto;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.dto.analysis.AnalysisDomesticlParam;
+import pwc.taxtech.atms.dto.analysis.AnalysisInternationlParam;
+import pwc.taxtech.atms.dto.vatdto.CertifiedInvoicesListParam;
+import pwc.taxtech.atms.exception.ServiceException;
+import pwc.taxtech.atms.service.impl.AnalysisServiceImpl;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:29
+ * @Description:
+ */
+@RestController
+@RequestMapping("/api/v1/Analysis/")
+public class AnalysisController extends BaseController {
+
+    @Autowired
+    private AnalysisServiceImpl analysisServiceImpl;
+
+    @ResponseBody
+    @RequestMapping(value = "displayAnalysisImportData", method = RequestMethod.GET)
+    public ApiResultDto displayAnalysisImportData(@RequestParam Integer type, @RequestParam String period) {
+        try{
+            return ApiResultDto.success(analysisServiceImpl.displayAnalysisImportData(type,period));
+        }catch (Exception e){
+            return ApiResultDto.fail();
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "displayAnalysisInternationalImportData", method = RequestMethod.POST)
+    public ApiResultDto displayAnalysisInternationalImportData(@RequestBody AnalysisInternationlParam param) {
+        try{
+            return ApiResultDto.success(analysisServiceImpl.displayAnalysisInternationalImportData(param));
+        }catch (Exception e){
+            return ApiResultDto.fail();
+        }
+    }
+
+    @RequestMapping(value = "downloadDomesticFile/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void downloadCILQueryData(@RequestBody AnalysisDomesticlParam param, HttpServletResponse response) {
+        logger.debug("enter downloadDomesticFile");
+        String fileName="testFile";
+        analysisServiceImpl.downloadDomesticFile(response, param, fileName);
+    }
+
+
+    @ResponseBody
+    @RequestMapping(value = "getAnalysisInternationalCompanyList", method = RequestMethod.GET)
+    public List<String> getAnalysisInternationalCompanyList(@RequestParam Integer type, @RequestParam String period) {
+        return analysisServiceImpl.getAnalysisInternationalCompanyList(type,period);
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "getAnalysisInternationalCountryList", method = RequestMethod.GET)
+    public List<String> getAnalysisInternationalCountryList(@RequestParam Integer type, @RequestParam String period) {
+        return analysisServiceImpl.getAnalysisInternationalCountryList(type,period);
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "DomesitcExcelFile", method = RequestMethod.POST)
+    public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file, @RequestParam String period, @RequestParam Integer type) {
+        try {
+            String valMsg = valParameter(file,period,type);
+            if(StringUtils.isNotEmpty(valMsg)){
+                return OperationResultDto.error(valMsg);
+            }
+            return analysisServiceImpl.importDomesitcExcelFile(file,period, type);
+        } catch (ServiceException e) {
+            return OperationResultDto.error(e.getMessage());
+        } catch (Exception e) {
+            logger.error("importDomesitcExcelFile error.", e);
+            return OperationResultDto.error(ErrorMessage.SystemError);
+        }
+    }
+
+    private String valParameter(MultipartFile file,String periodDate,Integer type){
+        if (null == file) {
+            return ErrorMessage.NoFile;
+        }
+        if(StringUtils.isEmpty(periodDate)){
+            return ErrorMessage.DidntSelectedPeriod;
+        }
+        if(null==type){
+            return ErrorMessage.DidntSelectedImportType;
+        }
+        return null;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessageCN.java

@@ -7,5 +7,7 @@ public class ErrorMessageCN {
     public static final String  InconsistentPeriod = "单表中期间不一致";
     public static final String  DoNotSelectPeriod = "未选择期间";
     public static final String  DoNotSelectCompany = "非选定主体";
+    public static final String  StrctureRepeat = "层级重复!";
+    public static final String  BusinssUnitRepeat = "事业部重复!";
 
 }

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumAnalysisImportType.java

 package pwc.taxtech.atms.constant.enums;
 
 public enum EnumAnalysisImportType {
-    DriverNum(4,"司機人數_所属期间_模版"),
+    TaxData(0,"各税种税额 _所属期间_模版"),
+    ReturnTaxData(1,"实际返还税额 _所属期间_模版"),
     GMVSubsidy(2,"業務線_所属期间_模版"),
     EmployeeNum(3,"职工人数_所属期间_模版"),
+    DriverNum(4,"司機人數_所属期间_模版"),
 
     InternationalBuData(100,"国际税业务数据_国家_公司_所属期间_模版"),
     InternationalTaxData(101,"国际税税务数据_国家_公司_所属期间_模版");

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

@@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.message.ErrorMessage;
 import pwc.taxtech.atms.dpo.PagingDto;
 import pwc.taxtech.atms.dto.*;
+import pwc.taxtech.atms.dto.analysis.AnalysisInternationlParam;
 import pwc.taxtech.atms.dto.dataimport.DataImportParam;
 import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
 import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
@@ -253,33 +254,6 @@ public class DataImportController extends BaseController {
         }
     }
 
-    @ResponseBody
-    @RequestMapping(value = "displayAnalysisImportData", method = RequestMethod.GET)
-    public ApiResultDto displayAnalysisImportData(@RequestParam Integer type,@RequestParam String period) {
-        try{
-            return ApiResultDto.success(dataImportService.displayAnalysisImportData(type,period));
-        }catch (Exception e){
-            return ApiResultDto.fail();
-        }
-    }
-
-    @ResponseBody
-    @RequestMapping(value = "Analysis/DomesitcExcelFile", method = RequestMethod.POST)
-    public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file,@RequestParam String period,@RequestParam Integer type) {
-        try {
-            String valMsg = valParameter(file,period,type);
-            if(StringUtils.isNotEmpty(valMsg)){
-                return OperationResultDto.error(valMsg);
-            }
-            return dataImportService.importDomesitcExcelFile(file,period, type);
-        } catch (ServiceException e) {
-            return OperationResultDto.error(e.getMessage());
-        } catch (Exception e) {
-            logger.error("importDomesitcExcelFile error.", e);
-            return OperationResultDto.error(ErrorMessage.SystemError);
-        }
-    }
-
     private String valParameter(MultipartFile file,List<String> orgList,String periodDate){
         if (null == file) {
             return ErrorMessage.NoFile;
@@ -293,16 +267,4 @@ public class DataImportController extends BaseController {
         return null;
     }
 
-    private String valParameter(MultipartFile file,String periodDate,Integer type){
-        if (null == file) {
-            return ErrorMessage.NoFile;
-        }
-        if(StringUtils.isEmpty(periodDate)){
-            return ErrorMessage.DidntSelectedPeriod;
-        }
-        if(null==type){
-            return ErrorMessage.DidntSelectedImportType;
-        }
-        return null;
-    }
 }

atms-api/src/main/java/pwc/taxtech/atms/data/RoleData.java

+/*
 package pwc.taxtech.atms.data;
 
 import org.apache.commons.lang3.StringUtils;
@@ -19,11 +20,13 @@ import pwc.taxtech.atms.entity.RoleExample;
 import javax.annotation.Resource;
 
 
+*/
 /**
  * @Auther: Gary J Li
  * @Date: 11/01/2019 14:53
  * @Description:将Role存入ehcache，提高查询效率
- */
+ *//*
+
 @Service
 public class RoleData {
 
@@ -32,13 +35,15 @@ public class RoleData {
     @Resource
     private RoleMapper roleMapper;
 
-    /**
+    */
+/**
      * 11/01/2019 16:15
      * 根据serviceTypeId查询，存入ehcache
      * [serviceTypeId]
      * @author Gary J Li
      * @return List<Role> roleList
-     */
+     *//*
+
     @Cacheable(value = "roleByServiceTypeIdCache", key = "#serviceTypeId")
     public List<Role> selectByServiceTypeId(String serviceTypeId){
         List<Role> roleList = new ArrayList<>();
@@ -54,13 +59,15 @@ public class RoleData {
         return roleList;
     }
 
-    /**
+    */
+/**
      * 11/01/2019 16:16
      * 根据id查询，存入ehcache
      * [id]
      * @author Gary J Li
      * @return Role role
-     */
+     *//*
+
     @Cacheable(value = "roleByIdCache", key = "#id")
     public Role selectByPrimaryKey(String id){
         Role role = new Role();
@@ -72,13 +79,15 @@ public class RoleData {
         return role;
     }
 
-    /**
+    */
+/**
      * 11/01/2019 16:17
      * 根据主键id删除，并把ehcache里的role都删掉
      * [roleDto]
      * @author Gary J Li
      * @return int res
-     */
+     *//*
+
     @Caching(evict= {@CacheEvict(value = "roleByServiceTypeIdCache", key = "#role.getServiceTypeId()"),@CacheEvict(value = "roleByIdCache", key = "#role.getId()")} )
     public int deleteByPrimaryKey(RoleDto roleDto){
         int res = 0;
@@ -90,13 +99,15 @@ public class RoleData {
         return res;
     }
 
-    /**
+    */
+/**
      * 11/01/2019 16:20
      * role写入，并在缓存里写入两个Hash(ServiceTypeId,Id)里
      * [role]
      * @author Gary J Li
      * @return Role role
-     */
+     *//*
+
     @Caching(put= {@CachePut(value = "roleByServiceTypeIdCache", key = "#role.getServiceTypeId()"),@CachePut(value = "roleByIdCache", key = "#role.getId()")} )
     public Role insert(Role role){
         try{
@@ -107,13 +118,15 @@ public class RoleData {
         return role;
     }
 
-    /**
+    */
+/**
      * 11/01/2019 16:22
      * role更新，并在缓存里更新两个Hash(ServiceTypeId,Id)里
      * [role]
      * @author Gary J Li
      * @return Role role
-     */
+     *//*
+
     @Caching(put= {@CachePut(value = "roleByServiceTypeIdCache", key = "#role.getServiceTypeId()"),@CachePut(value = "roleByIdCache", key = "#role.getId()")} )
     public Role updateByPrimaryKey(Role role){
         try{
@@ -124,3 +137,4 @@ public class RoleData {
         return role;
     }
 }
+*/

atms-api/src/main/java/pwc/taxtech/atms/data/RolePermissionData.java

+/*
 package pwc.taxtech.atms.data;
 
 import org.slf4j.Logger;
@@ -11,11 +12,13 @@ import pwc.taxtech.atms.entity.RolePermission;
 import javax.annotation.Resource;
 import java.util.List;
 
+*/
 /**
  * @Auther: Gary J Li
  * @Date: 11/01/2019 14:53
  * @Description:
- */
+ *//*
+
 @Service
 public class RolePermissionData {
 
@@ -30,3 +33,4 @@ public class RolePermissionData {
     }
 
 }
+*/

atms-api/src/main/java/pwc/taxtech/atms/data/UserData.java

+/*
 package pwc.taxtech.atms.data;
 
 import org.slf4j.Logger;
@@ -8,11 +9,13 @@ import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.dao.UserMapper;
 import pwc.taxtech.atms.entity.User;
 
+*/
 /**
  * @Auther: Gary J Li
  * @Date: 11/01/2019 14:32
  * @Description:
- */
+ *//*
+
 @Service
 public class UserData {
     private static final Logger logger = LoggerFactory.getLogger(UserData.class);
@@ -25,3 +28,4 @@ public class UserData {
         return userMapper.selectByUserNameIgnoreCase(inputLoginName);
     }
 }
+*/

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisActualTaxReturnDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 12:50
+ * @Description:
+ */
+public class AnalysisActualTaxReturnDto {
+
+    private String companyName;
+
+    private BigDecimal segment1;
+
+    private BigDecimal segment2;
+
+    private BigDecimal segment3;
+
+    private BigDecimal segment4;
+
+    private BigDecimal segment5;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public BigDecimal getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(BigDecimal segment1) {
+        this.segment1 = segment1;
+    }
+
+    public BigDecimal getSegment2() {
+        return segment2;
+    }
+
+    public void setSegment2(BigDecimal segment2) {
+        this.segment2 = segment2;
+    }
+
+    public BigDecimal getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(BigDecimal segment3) {
+        this.segment3 = segment3;
+    }
+
+    public BigDecimal getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(BigDecimal segment4) {
+        this.segment4 = segment4;
+    }
+
+    public BigDecimal getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(BigDecimal segment5) {
+        this.segment5 = segment5;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisDomesticlParam.java

+package pwc.taxtech.atms.dto.analysis;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:28
+ * @Description:
+ */
+public class AnalysisDomesticlParam {
+
+    private Integer type;
+
+    private String period;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(String period) {
+        this.period = period;
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisGMVSubsidyDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 15:37
+ * @Description:
+ */
+public class AnalysisGMVSubsidyDto {
+
+    private String businessLine;
+
+    private String segment1;
+
+    private String segment2;
+
+    private String segment3;
+
+    private String segment4;
+
+    private String segment5;
+
+    private String segment6;
+
+    public String getBusinessLine() {
+        return businessLine;
+    }
+
+    public void setBusinessLine(String businessLine) {
+        this.businessLine = businessLine;
+    }
+
+    public String getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(String segment1) {
+        this.segment1 = segment1;
+    }
+
+    public String getSegment2() {
+        return segment2;
+    }
+
+    public void setSegment2(String segment2) {
+        this.segment2 = segment2;
+    }
+
+    public String getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(String segment3) {
+        this.segment3 = segment3;
+    }
+
+    public String getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(String segment4) {
+        this.segment4 = segment4;
+    }
+
+    public String getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5;
+    }
+
+    public String getSegment6() {
+        return segment6;
+    }
+
+    public void setSegment6(String segment6) {
+        this.segment6 = segment6;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisInternationalBUDataDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:25
+ * @Description:
+ */
+public class AnalysisInternationalBUDataDto {
+
+    private String category;
+
+    private String name;
+
+    private BigDecimal amount;
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisInternationalTaxDataDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:25
+ * @Description:
+ */
+public class AnalysisInternationalTaxDataDto {
+
+    private String taxCategory;
+
+    private String taxType;
+
+    private BigDecimal taxAmount;
+
+    public String getTaxCategory() {
+        return taxCategory;
+    }
+
+    public void setTaxCategory(String taxCategory) {
+        this.taxCategory = taxCategory;
+    }
+
+    public String getTaxType() {
+        return taxType;
+    }
+
+    public void setTaxType(String taxType) {
+        this.taxType = taxType;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return taxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisInternationlParam.java

+package pwc.taxtech.atms.dto.analysis;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:28
+ * @Description:
+ */
+public class AnalysisInternationlParam {
+
+    private Integer type;
+
+    private String period;
+
+    private String country;
+
+    private String companyName;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(String period) {
+        this.period = period;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisTaxDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 12:48
+ * @Description:
+ */
+public class AnalysisTaxDto {
+
+    private String companyName;
+
+    private BigDecimal segment1;
+
+    private BigDecimal segment2;
+
+    private BigDecimal segment3;
+
+    private BigDecimal segment4;
+
+    private BigDecimal segment5;
+
+    private BigDecimal segment6;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public BigDecimal getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(BigDecimal segment1) {
+        this.segment1 = segment1;
+    }
+
+    public BigDecimal getSegment2() {
+        return segment2;
+    }
+
+    public void setSegment2(BigDecimal segment2) {
+        this.segment2 = segment2;
+    }
+
+    public BigDecimal getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(BigDecimal segment3) {
+        this.segment3 = segment3;
+    }
+
+    public BigDecimal getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(BigDecimal segment4) {
+        this.segment4 = segment4;
+    }
+
+    public BigDecimal getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(BigDecimal segment5) {
+        this.segment5 = segment5;
+    }
+
+    public BigDecimal getSegment6() {
+        return segment6;
+    }
+
+    public void setSegment6(BigDecimal segment6) {
+        this.segment6 = segment6;
+    }
+}

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

@@ -91,7 +91,7 @@ public class AreaRegionServiceImpl {
                 AreaRegion provinceRegion = new AreaRegion();
                 provinceRegion.setId(CommonUtils.getUUID());
                 provinceRegion.setAreaId(area.getId());
-                provinceRegion.setRegionId(null==provinceId?"":area.getId());
+                provinceRegion.setRegionId(null==provinceId?"":provinceId);
                 areaRegionMapper.insert(provinceRegion);
             }
             // city

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

@@ -12,6 +12,7 @@ import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.OperateLogType;
 import pwc.taxtech.atms.common.OperationAction;
 import pwc.taxtech.atms.common.OperationModule;
+import pwc.taxtech.atms.common.message.ErrorMessageCN;
 import pwc.taxtech.atms.dao.BusinessUnitMapper;
 import pwc.taxtech.atms.dto.BusinessUnitDto;
 import pwc.taxtech.atms.dto.BusinessUnitInputDto;
@@ -128,6 +129,9 @@ public class BusinessUnitServiceImpl {
             if (businessUnit == null) {
                 throw new ApplicationException("can't find business unit, id: " + businessUnitDto.getId());
             }
+            if(businessUnit.getName().equals(businessUnitDto.getName())){
+                throw new ApplicationException(ErrorMessageCN.BusinssUnitRepeat);
+            }
 
             // copy current businessUnit as tmp
             BusinessUnit originBusinessUnit = new BusinessUnit();

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

@@ -92,6 +92,8 @@ public class DataImportService extends BaseService {
     @Resource
     private AnalysisExpectedTaxReturnMapper analysisExpectedTaxReturnMapper;
     @Resource
+    private AnalysisActualTaxReturnMapper analysisActualTaxReturnMapper;
+    @Resource
     private AnalysisFeeMapper analysisFeeMapper;
     @Resource
     private AnalysisFileManagementMapper analysisFileManagementMapper;
@@ -1765,147 +1767,4 @@ public class DataImportService extends BaseService {
         return "";
     }
 
-    public List<Object>  displayAnalysisImportData(Integer type, String periodStr) {
-        List<Object> objects = new ArrayList<>();
-        Integer period = DateUtils.strToPeriod(periodStr);
-        switch (type){
-            case 0:
-                AnalysisTaxExample analysisTaxExample = new AnalysisTaxExample();
-                analysisTaxExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisTaxMapper.selectByExample(analysisTaxExample));
-                break;
-            case 1:
-                AnalysisExpectedTaxReturnExample analysisExpectedTaxReturnExample = new AnalysisExpectedTaxReturnExample();
-                analysisExpectedTaxReturnExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisExpectedTaxReturnMapper.selectByExample(analysisExpectedTaxReturnExample));
-                break;
-            case 2:
-                AnalysisGmvSubsidyExample analysisGmvSubsidyExample = new AnalysisGmvSubsidyExample();
-                analysisGmvSubsidyExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisGmvSubsidyMapper.selectByExample(analysisGmvSubsidyExample));
-                break;
-            case 3:
-                AnalysisEmployeeNumExample analysisEmployeeNumExample = new AnalysisEmployeeNumExample();
-                analysisEmployeeNumExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisEmployeeNumMapper.selectByExample(analysisEmployeeNumExample));
-                break;
-            case 4:
-                AnalysisDriverNumExample analysisDriverNumExample = new AnalysisDriverNumExample();
-                analysisDriverNumExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisDriverNumMapper.selectByExample(analysisDriverNumExample));
-                break;
-            case 100:
-                AnalysisInternationalBusinessDataExample analysisInternationalBusinessDataExample = new AnalysisInternationalBusinessDataExample();
-                analysisInternationalBusinessDataExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisInternationalBusinessDataMapper.selectByExample(analysisInternationalBusinessDataExample));
-                break;
-            case 101:
-                AnalysisInternationalTaxDataExample analysisInternationalTaxDataExample = new AnalysisInternationalTaxDataExample();
-                analysisInternationalTaxDataExample.createCriteria().andPeriodEqualTo(period);
-                objects.addAll(analysisInternationalTaxDataMapper.selectByExample(analysisInternationalTaxDataExample));
-                break;
-            default:
-                break;
-        }
-        return objects;
-    }
-
-    public OperationResultDto importDomesitcExcelFile(MultipartFile file, String periodDate, Integer type) {
-        switch (type){
-            case 0:
-//                importAnalysisTaxExcelFile(file,periodDate);
-                break;
-            case 1:
-                importAnalysisreturnTaxExcelFile(file,periodDate);
-                break;
-            case 2:
-                importAnalysisGMVSubsidyExcelFile(file,periodDate);
-                break;
-            case 3:
-                importAnalysisEmployeeNumExcelFile(file,periodDate);
-                break;
-            case 4:
-                importAnalysisDriverNumExcelFile(file,periodDate);
-                break;
-            case 100:
-                importAnalysisInterBuDataExcelFile(file,periodDate);
-                break;
-            case 101:
-                importAnalysisInterTaxDataExcelFile(file,periodDate);
-                break;
-            default:
-                break;
-        }
-        return OperationResultDto.success();
-    }
-
-    private void importAnalysisreturnTaxExcelFile(MultipartFile file, String periodDate) {
-
-    }
-
-    private void importAnalysisEmployeeNumExcelFile(MultipartFile file, String periodDate) {
-
-    }
-
-    private void importAnalysisGMVSubsidyExcelFile(MultipartFile file, String periodDate) {
-
-    }
-
-    private void importAnalysisDriverNumExcelFile(MultipartFile file, String periodDate) {
-        try{
-            InputStream inputStream = file.getInputStream();
-            Workbook workbook = WorkbookFactory.create(inputStream);
-            if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
-                throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
-            }
-            // 文件上的期间
-            String filePeriod = file.getOriginalFilename().split("_")[1];
-            Integer filePer = DateUtils.strToPeriod2(filePeriod);
-            Integer selectedPer = DateUtils.strToPeriod(periodDate);
-            if(!filePer.equals(selectedPer)){
-                throw new ServiceException(ErrorMessageCN.ExistDataPeriodsError);
-            }
-            for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
-                Sheet sheet = workbook.getSheetAt(i);
-                if (isSheetEmpty(sheet)) continue;
-                AnalysisDriverNum model = new AnalysisDriverNum();
-                model.setId(idService.nextId());
-                model.setPeriod(selectedPer);
-                for (int j = 1; j <= sheet.getLastRowNum(); j++) {
-                    Cell cell1 = sheet.getRow(j).getCell(0);
-                    if (null == cell1 || StringUtils.isEmpty(getCellStringValue(cell1))) {
-                        continue;
-                    }
-                    Cell cell2 = sheet.getRow(j).getCell(1);
-                    if("加盟".equals(getCellStringValue(cell1))){
-                        model.setJoinInAmount(getCellBigDecimalValue(cell2));
-                    }else if("自营".equals(getCellStringValue(cell1))){
-                        model.setSelfSupportAmount(getCellBigDecimalValue(cell2));
-                    }else if("直营".equals(getCellStringValue(cell1))){
-                        model.setDirectSaleAmount(getCellBigDecimalValue(cell2));
-                    }else if("对公".equals(getCellStringValue(cell1))){
-                        model.setRightPublicAmount(getCellBigDecimalValue(cell2));
-                    }
-                }
-                AnalysisDriverNumExample example = new AnalysisDriverNumExample();
-                example.createCriteria().andPeriodEqualTo(selectedPer);
-                analysisDriverNumMapper.deleteByExample(example);
-                analysisDriverNumMapper.insertSelective(model);
-            }
-        }catch (ServiceException se){
-            throw se;
-        }catch (Exception e){
-            String errMsg = "分析模块-导入司机人数异常";
-            logger.error(errMsg,e);
-            throw new ServiceException(errMsg);
-        }
-    }
-
-    private void importAnalysisInterTaxDataExcelFile(MultipartFile file, String periodDate) {
-
-    }
-
-    private void importAnalysisInterBuDataExcelFile(MultipartFile file, String periodDate) {
-
-    }
 }

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

@@ -6,7 +6,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import pwc.taxtech.atms.common.CommonConstants;
 import pwc.taxtech.atms.common.CommonUtils;
-import pwc.taxtech.atms.data.RoleData;
 import pwc.taxtech.atms.dto.datainit.DataCountDto;
 import pwc.taxtech.atms.dto.datainit.DataInitDto;
 import pwc.taxtech.atms.dto.user.UserTemp;
@@ -31,9 +30,6 @@ public class DataInitServiceImpl extends AbstractService {
     @Autowired
     private FileService fileService;
 
-    @Autowired
-    private RoleData roleData;
-
     /*
      * (non-Javadoc)
      *
@@ -646,7 +642,7 @@ public class DataInitServiceImpl extends AbstractService {
     /**
      * 导入机构层级数据
      *
-     * @param orgStructureList
+     * @param dataInitDto
      * @return
      */
     private void importOrgStructure(DataInitDto dataInitDto) {
@@ -717,7 +713,7 @@ public class DataInitServiceImpl extends AbstractService {
     /**
      * 导入区域数据
      *
-     * @param orgStructureList
+     * @param dataInitDto
      * @return
      */
     private void importArea(DataInitDto dataInitDto) {
@@ -774,7 +770,7 @@ public class DataInitServiceImpl extends AbstractService {
     /**
      * 导入企业科目数据
      *
-     * @param orgStructureList
+     * @param dataInitDto
      * @return
      */
     private void importEnterpriseAccount(DataInitDto dataInitDto) {
@@ -916,8 +912,8 @@ public class DataInitServiceImpl extends AbstractService {
                 RoleCategory newObject = queryList.stream().filter(a -> Objects.equals(a.getName(), oldId)).findFirst().orElse(null);
                 role.setRoleCategoryId(newObject == null ? null : newObject.getId());
                 try {
-//                    roleMapper.insert(role);
-                    roleData.insert(role);
+                    roleMapper.insert(role);
+//                    roleData.insert(role);
                 } catch (Exception e) {
                     logger.debug("Error inserting 角色: " + e.getMessage());
                     errorCount++;
@@ -950,8 +946,8 @@ public class DataInitServiceImpl extends AbstractService {
             // 插入User
             userTempList = dataInitDto.getImportUserTemp();
             List<Organization> orgList = organizationMapper.selectByExample(null);
-//            List<Role> roleList = roleMapper.selectByExample(null);
-            List<Role> roleList = roleData.selectByServiceTypeId("All");
+            List<Role> roleList = roleMapper.selectByExample(null);
+//            List<Role> roleList = roleData.selectByServiceTypeId("All");
             for (UserTemp item : userTempList) {
                 try {
                     User user = new User();

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

@@ -12,6 +12,7 @@ import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.OperateLogType;
 import pwc.taxtech.atms.common.OperationAction;
 import pwc.taxtech.atms.common.OperationModule;
+import pwc.taxtech.atms.common.message.ErrorMessageCN;
 import pwc.taxtech.atms.dao.OrganizationStructureMapper;
 import pwc.taxtech.atms.dto.IdModel;
 import pwc.taxtech.atms.dto.OperationLogDto;
@@ -66,6 +67,11 @@ public class OrganizationStructureServiceImpl {
     }
 
     public void addOrganizationStructure(OrganizationStructureInputDto organizationStructureDto) {
+        OrganizationStructureExample example = new OrganizationStructureExample();
+        example.createCriteria().andNameEqualTo(organizationStructureDto.getName());
+        if(organizationStructureMapper.countByExample(example)>0){
+            throw new ApplicationException(ErrorMessageCN.StrctureRepeat);
+        }
         OrganizationStructure organizationStructure = rotateOrganizationStructureDto(organizationStructureDto);
         organizationStructure.setId(CommonUtils.getUUID());
         organizationStructure.setCreateTime(new Date());
@@ -136,8 +142,8 @@ public class OrganizationStructureServiceImpl {
             OrganizationStructure originOrganizationStructure = new OrganizationStructure();
             CommonUtils.copyProperties(organizationStructure, originOrganizationStructure);
 
-            if (organizationStructureDto.getIsActive().equals(organizationStructure.getIsActive())  ||
-                    org.apache.commons.lang3.StringUtils.equals( organizationStructureDto.getName(),organizationStructure.getName())) {
+            if (!organizationStructureDto.getIsActive().equals(organizationStructure.getIsActive())  ||
+                    !org.apache.commons.lang3.StringUtils.equals( organizationStructureDto.getName(),organizationStructure.getName())) {
                 isStatusChangeOperation = true;
                 organizationStructure.setIsActive(organizationStructureDto.getIsActive());
                 organizationStructure.setName(organizationStructureDto.getName());

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

@@ -12,7 +12,6 @@ import pwc.taxtech.atms.common.*;
 import pwc.taxtech.atms.common.message.UserMessage;
 import pwc.taxtech.atms.dao.UserHistoricalPasswordMapper;
 import pwc.taxtech.atms.dao.UserMapper;
-import pwc.taxtech.atms.data.RoleData;
 import pwc.taxtech.atms.dto.ForgetPasswordDto;
 import pwc.taxtech.atms.dto.LoginOutputDto;
 import pwc.taxtech.atms.dto.MailMto;
@@ -20,13 +19,8 @@ import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.UpdateLogParams;
 import pwc.taxtech.atms.dto.user.UserAndUserRoleSaveDto;
 import pwc.taxtech.atms.dto.user.UserPasswordDto;
-import pwc.taxtech.atms.entity.Role;
-import pwc.taxtech.atms.entity.User;
-import pwc.taxtech.atms.entity.UserHistoricalPassword;
-import pwc.taxtech.atms.entity.UserHistoricalPasswordExample;
+import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.UserHistoricalPasswordExample.Criteria;
-import pwc.taxtech.atms.entity.UserOrganization;
-import pwc.taxtech.atms.entity.UserRole;
 import pwc.taxtech.atms.security.AtmsPasswordEncoder;
 
 import java.util.ArrayList;
@@ -58,8 +52,6 @@ public class UserAccountServiceImpl extends AbstractService {
     private AuthUserHelper authUserHelper;
     @Autowired
     private AtmsApiSettings atmsApiSettings;
-    @Autowired
-    private RoleData roleData;
 
     public OperationResultDto<LoginOutputDto> changeExternalUserPassword(UserPasswordDto userPasswordDto) {
         logger.debug("修改密码 Start");
@@ -318,8 +310,8 @@ public class UserAccountServiceImpl extends AbstractService {
         logger.debug("Start to insert new user [ {} ]", user.getId());
         userMapper.insert(user);
         List<String> arrRoles = userAndUserRoleSaveDto.getRoleIds();
-//        List<Role> roleQuery = roleMapper.selectByExample(new RoleExample());
-        List<Role> roleQuery = roleData.selectByServiceTypeId("All");
+        List<Role> roleQuery = roleMapper.selectByExample(new RoleExample());
+//        List<Role> roleQuery = roleData.selectByServiceTypeId("All");
         if (arrRoles != null && !arrRoles.isEmpty()) {
             for (String role : arrRoles) {
                 UserRole userRole = new UserRole();

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

@@ -17,7 +17,6 @@ import pwc.taxtech.atms.common.message.LogMessage;
 import pwc.taxtech.atms.common.message.UserMessage;
 import pwc.taxtech.atms.constant.DimensionConstant;
 import pwc.taxtech.atms.constant.UserConstant;
-import pwc.taxtech.atms.data.RoleData;
 import pwc.taxtech.atms.dpo.DimensionValueOrgDto;
 import pwc.taxtech.atms.dpo.OrganizationDto;
 import pwc.taxtech.atms.dpo.RoleInfo;
@@ -65,9 +64,6 @@ public class UserRoleServiceImpl extends AbstractService {
     @Autowired
     private UserServiceImpl userService;
 
-    @Autowired
-    private RoleData roleData;
-
     public OrgRoleDtoList getUserRoleByUserId(String userId) {
         logger.debug("UserRoleServiceImpl getUserRoleByUserId [ userId: {} ]", userId);
         OrgRoleDtoList result = new OrgRoleDtoList();
@@ -1245,8 +1241,8 @@ public class UserRoleServiceImpl extends AbstractService {
         }
         // 添加日志
         for (UserDimensionValueRole r : target) {
-//            Role role = roleMapper.selectByPrimaryKey(r.getRoleId());
-            Role role = roleData.selectByPrimaryKey(r.getRoleId());
+            Role role = roleMapper.selectByPrimaryKey(r.getRoleId());
+//            Role role = roleData.selectByPrimaryKey(r.getRoleId());
             String roleName = role == null ? "" : role.getName();
             addOrDeleteDataAddLog(
                     dimensionName + CommonConstants.DashSignSeparator + dimensionValueName
@@ -1296,8 +1292,8 @@ public class UserRoleServiceImpl extends AbstractService {
     }
 
     private RoleDto getRoleDtoById(String roleId) {
-//        Role query = roleMapper.selectByPrimaryKey(roleId);
-        Role query = roleData.selectByPrimaryKey(roleId);
+        Role query = roleMapper.selectByPrimaryKey(roleId);
+//        Role query = roleData.selectByPrimaryKey(roleId);
         return query == null ? new RoleDto() : CommonUtils.copyProperties(query, new RoleDto());
     }
 
@@ -1334,8 +1330,8 @@ public class UserRoleServiceImpl extends AbstractService {
                     userOrganizationRoleMapper.deleteByPrimaryKey(r.getId());
 
                     // 添加日志
-//                    Role role = roleMapper.selectByPrimaryKey(r.getRoleId());
-                    Role role = roleData.selectByPrimaryKey(r.getRoleId());
+                    Role role = roleMapper.selectByPrimaryKey(r.getRoleId());
+//                    Role role = roleData.selectByPrimaryKey(r.getRoleId());
                     String roleName = role == null ? "" : role.getName();
                     addOrDeleteDataAddLog(orgName + CommonConstants.DashSignSeparator + roleName, operateUserName,
                             OperationModule.UserOrganizationRole.value(), OperationAction.Delete.value(), "");
@@ -1380,8 +1376,8 @@ public class UserRoleServiceImpl extends AbstractService {
                         userRole.getRoleId());
                 userOrganizationRoleMapper.insert(userRole);
                 // 添加日志
-//                Role roleObject = roleMapper.selectByPrimaryKey(item.getRoleId());
-                Role roleObject = roleData.selectByPrimaryKey(item.getRoleId());
+                Role roleObject = roleMapper.selectByPrimaryKey(item.getRoleId());
+//                Role roleObject = roleData.selectByPrimaryKey(item.getRoleId());
                 String roleName = roleObject == null ? "" : roleObject.getName();
                 addOrDeleteDataAddLog(orgName + CommonConstants.DashSignSeparator + roleName, operateUserName,
                         OperationModule.UserOrganizationRole.value(), OperationAction.New.value(), "");

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

@@ -30,7 +30,6 @@ import pwc.taxtech.atms.dao.RolePermissionMapper;
 import pwc.taxtech.atms.dao.UserMapper;
 import pwc.taxtech.atms.dao.UserOrganizationMapper;
 import pwc.taxtech.atms.dao.UserRoleMapper;
-import pwc.taxtech.atms.data.RoleData;
 import pwc.taxtech.atms.dpo.RoleInfo;
 import pwc.taxtech.atms.dpo.UserDto;
 import pwc.taxtech.atms.dpo.UserRoleInfo;
@@ -99,8 +98,6 @@ public class UserServiceImpl extends AbstractService {
     @Autowired
     private UserRoleServiceImpl userRoleService;
     @Autowired
-    private RoleData roleData;
-    @Autowired
     private JwtAuthenticationService jwtAuthenticationService;
 
     @Value("${api.url}")
@@ -804,8 +801,8 @@ public class UserServiceImpl extends AbstractService {
             logger.debug("Start to delete userRole [ {} ]", userRole.getId());
             userRoleMapper.deleteByPrimaryKey(userRole.getId());
         }
-//        List<Role> roleQuery = roleMapper.selectByExample(new RoleExample());
-        List<Role> roleQuery = roleData.selectByServiceTypeId("All");
+        List<Role> roleQuery = roleMapper.selectByExample(new RoleExample());
+//        List<Role> roleQuery = roleData.selectByServiceTypeId("All");
         for (String role : userDto.getRoleIds()) {
             if (oldUserRoleList.stream().anyMatch(sa -> Objects.equals(sa.getRoleId(), role))) {
                 continue;
@@ -1001,8 +998,8 @@ public class UserServiceImpl extends AbstractService {
                         logger.debug("Start to delete UserOrganizationRole [ {} ]", oneTarget.getId());
                         userOrganizationRoleMapper.deleteByPrimaryKey(oneTarget.getId());
                         // 添加日志
-//                        Role role = roleMapper.selectByPrimaryKey(oneTarget.getRoleId());
-                        Role role = roleData.selectByPrimaryKey(oneTarget.getRoleId());
+                        Role role = roleMapper.selectByPrimaryKey(oneTarget.getRoleId());
+//                        Role role = roleData.selectByPrimaryKey(oneTarget.getRoleId());
                         String roleName = role == null ? "" : role.getName();
                         operationLogService
                                 .addOrDeleteDataAddLog(generateUpdateLogParams(OperateLogType.OperationLogUser.value(),

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisActualTaxReturnMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisActualTaxReturn;
+import pwc.taxtech.atms.analysis.entity.AnalysisActualTaxReturnExample;
+
+@Mapper
+public interface AnalysisActualTaxReturnMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisActualTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisActualTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    List<AnalysisActualTaxReturn> selectByExampleWithRowbounds(AnalysisActualTaxReturnExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    List<AnalysisActualTaxReturn> selectByExample(AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    AnalysisActualTaxReturn selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisActualTaxReturn record, @Param("example") AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisActualTaxReturn record, @Param("example") AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisActualTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisActualTaxReturn record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisInternationalBusinessDataMapper.java

@@ -105,4 +105,8 @@ public interface AnalysisInternationalBusinessDataMapper extends MyAnalysisMappe
      * @mbg.generated
      */
     int updateByPrimaryKey(AnalysisInternationalBusinessData record);
+
+    List<String> selectCompanyList(@Param("period") Integer period);
+
+    List<String> selectCountryList(@Param("period") Integer period);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisInternationalTaxDataMapper.java

@@ -105,4 +105,8 @@ public interface AnalysisInternationalTaxDataMapper extends MyAnalysisMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(AnalysisInternationalTaxData record);
+
+    List<String> selectCompanyList(@Param("period") Integer period);
+
+    List<String> selectCountryList(@Param("period") Integer period);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisEmployeeNum.java

@@ -68,6 +68,17 @@ public class AnalysisEmployeeNum extends BaseEntity implements Serializable {
      */
     private BigDecimal vendorAmount;
 
+    /**
+     * Database Column Remarks:
+     *   总计
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_employee_num.total_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal totalAmount;
+
     /**
      * Database Column Remarks:
      *   创建时间 
@@ -251,6 +262,30 @@ public class AnalysisEmployeeNum extends BaseEntity implements Serializable {
         this.vendorAmount = vendorAmount;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_employee_num.total_amount
+     *
+     * @return the value of analysis_employee_num.total_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_employee_num.total_amount
+     *
+     * @param totalAmount the value for analysis_employee_num.total_amount
+     *
+     * @mbg.generated
+     */
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column analysis_employee_num.create_time
@@ -388,6 +423,7 @@ public class AnalysisEmployeeNum extends BaseEntity implements Serializable {
         sb.append(", fullTimeAmount=").append(fullTimeAmount);
         sb.append(", internAmount=").append(internAmount);
         sb.append(", vendorAmount=").append(vendorAmount);
+        sb.append(", totalAmount=").append(totalAmount);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", organizationId=").append(organizationId);

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisEmployeeNumExample.java

@@ -506,6 +506,66 @@ public class AnalysisEmployeeNumExample {
             return (Criteria) this;
         }
 
+        public Criteria andTotalAmountIsNull() {
+            addCriterion("total_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountIsNotNull() {
+            addCriterion("total_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountEqualTo(BigDecimal value) {
+            addCriterion("total_amount =", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountNotEqualTo(BigDecimal value) {
+            addCriterion("total_amount <>", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountGreaterThan(BigDecimal value) {
+            addCriterion("total_amount >", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("total_amount >=", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountLessThan(BigDecimal value) {
+            addCriterion("total_amount <", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("total_amount <=", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountIn(List<BigDecimal> values) {
+            addCriterion("total_amount in", values, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountNotIn(List<BigDecimal> values) {
+            addCriterion("total_amount not in", values, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("total_amount between", value1, value2, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("total_amount not between", value1, value2, "totalAmount");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessData.java

@@ -101,6 +101,15 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
      */
     private BigDecimal profit;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal exchangeRate;
+
     /**
      * Database Column Remarks:
      *   创建时间 
@@ -156,6 +165,17 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
      */
     private Integer period;
 
+    /**
+     * Database Column Remarks:
+     *   国家
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.country
+     *
+     * @mbg.generated
+     */
+    private String country;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table analysis_international_business_data
@@ -356,6 +376,30 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         this.profit = profit;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.exchange_rate
+     *
+     * @return the value of analysis_international_business_data.exchange_rate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getExchangeRate() {
+        return exchangeRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.exchange_rate
+     *
+     * @param exchangeRate the value for analysis_international_business_data.exchange_rate
+     *
+     * @mbg.generated
+     */
+    public void setExchangeRate(BigDecimal exchangeRate) {
+        this.exchangeRate = exchangeRate;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column analysis_international_business_data.create_time
@@ -476,6 +520,30 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         this.period = period;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.country
+     *
+     * @return the value of analysis_international_business_data.country
+     *
+     * @mbg.generated
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.country
+     *
+     * @param country the value for analysis_international_business_data.country
+     *
+     * @mbg.generated
+     */
+    public void setCountry(String country) {
+        this.country = country == null ? null : country.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table analysis_international_business_data
@@ -496,11 +564,13 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         sb.append(", subsidyC=").append(subsidyC);
         sb.append(", revenue=").append(revenue);
         sb.append(", profit=").append(profit);
+        sb.append(", exchangeRate=").append(exchangeRate);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", companyName=").append(companyName);
         sb.append(", period=").append(period);
+        sb.append(", country=").append(country);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessDataExample.java

@@ -686,6 +686,66 @@ public class AnalysisInternationalBusinessDataExample {
             return (Criteria) this;
         }
 
+        public Criteria andExchangeRateIsNull() {
+            addCriterion("exchange_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateIsNotNull() {
+            addCriterion("exchange_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate =", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateNotEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate <>", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateGreaterThan(BigDecimal value) {
+            addCriterion("exchange_rate >", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate >=", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateLessThan(BigDecimal value) {
+            addCriterion("exchange_rate <", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate <=", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateIn(List<BigDecimal> values) {
+            addCriterion("exchange_rate in", values, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateNotIn(List<BigDecimal> values) {
+            addCriterion("exchange_rate not in", values, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("exchange_rate between", value1, value2, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("exchange_rate not between", value1, value2, "exchangeRate");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -1005,6 +1065,76 @@ public class AnalysisInternationalBusinessDataExample {
             addCriterion("period not between", value1, value2, "period");
             return (Criteria) this;
         }
+
+        public Criteria andCountryIsNull() {
+            addCriterion("country is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNotNull() {
+            addCriterion("country is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryEqualTo(String value) {
+            addCriterion("country =", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotEqualTo(String value) {
+            addCriterion("country <>", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThan(String value) {
+            addCriterion("country >", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("country >=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThan(String value) {
+            addCriterion("country <", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThanOrEqualTo(String value) {
+            addCriterion("country <=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLike(String value) {
+            addCriterion("country like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotLike(String value) {
+            addCriterion("country not like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIn(List<String> values) {
+            addCriterion("country in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotIn(List<String> values) {
+            addCriterion("country not in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryBetween(String value1, String value2) {
+            addCriterion("country between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotBetween(String value1, String value2) {
+            addCriterion("country not between", value1, value2, "country");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalTaxData.java

@@ -123,6 +123,17 @@ public class AnalysisInternationalTaxData extends BaseEntity implements Serializ
      */
     private Integer period;
 
+    /**
+     * Database Column Remarks:
+     *   国家
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_tax_data.country
+     *
+     * @mbg.generated
+     */
+    private String country;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table analysis_international_tax_data
@@ -371,6 +382,30 @@ public class AnalysisInternationalTaxData extends BaseEntity implements Serializ
         this.period = period;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_tax_data.country
+     *
+     * @return the value of analysis_international_tax_data.country
+     *
+     * @mbg.generated
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_tax_data.country
+     *
+     * @param country the value for analysis_international_tax_data.country
+     *
+     * @mbg.generated
+     */
+    public void setCountry(String country) {
+        this.country = country == null ? null : country.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table analysis_international_tax_data
@@ -393,6 +428,7 @@ public class AnalysisInternationalTaxData extends BaseEntity implements Serializ
         sb.append(", organizationId=").append(organizationId);
         sb.append(", companyName=").append(companyName);
         sb.append(", period=").append(period);
+        sb.append(", country=").append(country);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalTaxDataExample.java

@@ -845,6 +845,76 @@ public class AnalysisInternationalTaxDataExample {
             addCriterion("period not between", value1, value2, "period");
             return (Criteria) this;
         }
+
+        public Criteria andCountryIsNull() {
+            addCriterion("country is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNotNull() {
+            addCriterion("country is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryEqualTo(String value) {
+            addCriterion("country =", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotEqualTo(String value) {
+            addCriterion("country <>", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThan(String value) {
+            addCriterion("country >", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("country >=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThan(String value) {
+            addCriterion("country <", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThanOrEqualTo(String value) {
+            addCriterion("country <=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLike(String value) {
+            addCriterion("country like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotLike(String value) {
+            addCriterion("country not like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIn(List<String> values) {
+            addCriterion("country in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotIn(List<String> values) {
+            addCriterion("country not in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryBetween(String value1, String value2) {
+            addCriterion("country between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotBetween(String value1, String value2) {
+            addCriterion("country not between", value1, value2, "country");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserRoleInfo.java

@@ -39,10 +39,14 @@ public class UserRoleInfo {
     @JsonProperty("businessUnitID")
     private String businessUnitId;
 
+    private String businessUnitName;
+
     /// 区域Id
     @JsonProperty("areaID")
     private String areaId;
 
+    private String areaName;
+
     public Boolean isAccessible;
 
     /// 角色列表
@@ -203,4 +207,19 @@ public class UserRoleInfo {
         this.roleInfoList = roleInfoList;
     }
 
+    public String getBusinessUnitName() {
+        return businessUnitName;
+    }
+
+    public void setBusinessUnitName(String businessUnitName) {
+        this.businessUnitName = businessUnitName;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
 }

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisEmployeeNumMapper.xml

@@ -11,6 +11,7 @@
     <result column="full_time_amount" jdbcType="DECIMAL" property="fullTimeAmount" />
     <result column="intern_amount" jdbcType="DECIMAL" property="internAmount" />
     <result column="vendor_amount" jdbcType="DECIMAL" property="vendorAmount" />
+    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
@@ -88,8 +89,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, seq_no, full_time_amount, intern_amount, vendor_amount, create_time, update_time, 
-    organization_id, company_name, period
+    id, seq_no, full_time_amount, intern_amount, vendor_amount, total_amount, create_time, 
+    update_time, organization_id, company_name, period
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisEmployeeNumExample" resultMap="BaseResultMap">
     <!--
@@ -143,13 +144,13 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into analysis_employee_num (id, seq_no, full_time_amount, 
-      intern_amount, vendor_amount, create_time, 
-      update_time, organization_id, company_name, 
-      period)
+      intern_amount, vendor_amount, total_amount, 
+      create_time, update_time, organization_id, 
+      company_name, period)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{fullTimeAmount,jdbcType=DECIMAL}, 
-      #{internAmount,jdbcType=DECIMAL}, #{vendorAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER})
+      #{internAmount,jdbcType=DECIMAL}, #{vendorAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisEmployeeNum">
     <!--
@@ -173,6 +174,9 @@
       <if test="vendorAmount != null">
         vendor_amount,
       </if>
+      <if test="totalAmount != null">
+        total_amount,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -205,6 +209,9 @@
       <if test="vendorAmount != null">
         #{vendorAmount,jdbcType=DECIMAL},
       </if>
+      <if test="totalAmount != null">
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -254,6 +261,9 @@
       <if test="record.vendorAmount != null">
         vendor_amount = #{record.vendorAmount,jdbcType=DECIMAL},
       </if>
+      <if test="record.totalAmount != null">
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -285,6 +295,7 @@
       full_time_amount = #{record.fullTimeAmount,jdbcType=DECIMAL},
       intern_amount = #{record.internAmount,jdbcType=DECIMAL},
       vendor_amount = #{record.vendorAmount,jdbcType=DECIMAL},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
@@ -313,6 +324,9 @@
       <if test="vendorAmount != null">
         vendor_amount = #{vendorAmount,jdbcType=DECIMAL},
       </if>
+      <if test="totalAmount != null">
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -341,6 +355,7 @@
       full_time_amount = #{fullTimeAmount,jdbcType=DECIMAL},
       intern_amount = #{internAmount,jdbcType=DECIMAL},
       vendor_amount = #{vendorAmount,jdbcType=DECIMAL},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisInternationalBusinessDataMapper.xml

@@ -14,11 +14,13 @@
     <result column="subsidy_c" jdbcType="DECIMAL" property="subsidyC" />
     <result column="revenue" jdbcType="DECIMAL" property="revenue" />
     <result column="profit" jdbcType="DECIMAL" property="profit" />
+    <result column="exchange_rate" jdbcType="DECIMAL" property="exchangeRate" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -91,8 +93,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, create_time, update_time, 
-    organization_id, company_name, period
+    id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, exchange_rate, create_time, 
+    update_time, organization_id, company_name, period, country
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultMap="BaseResultMap">
     <!--
@@ -147,14 +149,16 @@
     -->
     insert into analysis_international_business_data (id, seq_no, gmv, 
       trips, subsidy_b, subsidy_c, 
-      revenue, profit, create_time, 
-      update_time, organization_id, company_name, 
-      period)
+      revenue, profit, exchange_rate, 
+      create_time, update_time, organization_id, 
+      company_name, period, country
+      )
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{gmv,jdbcType=DECIMAL}, 
       #{trips,jdbcType=DECIMAL}, #{subsidyB,jdbcType=DECIMAL}, #{subsidyC,jdbcType=DECIMAL}, 
-      #{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER})
+      #{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=DECIMAL}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessData">
     <!--
@@ -187,6 +191,9 @@
       <if test="profit != null">
         profit,
       </if>
+      <if test="exchangeRate != null">
+        exchange_rate,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -202,6 +209,9 @@
       <if test="period != null">
         period,
       </if>
+      <if test="country != null">
+        country,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -228,6 +238,9 @@
       <if test="profit != null">
         #{profit,jdbcType=DECIMAL},
       </if>
+      <if test="exchangeRate != null">
+        #{exchangeRate,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -243,6 +256,9 @@
       <if test="period != null">
         #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultType="java.lang.Long">
@@ -286,6 +302,9 @@
       <if test="record.profit != null">
         profit = #{record.profit,jdbcType=DECIMAL},
       </if>
+      <if test="record.exchangeRate != null">
+        exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -301,6 +320,9 @@
       <if test="record.period != null">
         period = #{record.period,jdbcType=INTEGER},
       </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -320,11 +342,13 @@
       subsidy_c = #{record.subsidyC,jdbcType=DECIMAL},
       revenue = #{record.revenue,jdbcType=DECIMAL},
       profit = #{record.profit,jdbcType=DECIMAL},
+      exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       company_name = #{record.companyName,jdbcType=VARCHAR},
-      period = #{record.period,jdbcType=INTEGER}
+      period = #{record.period,jdbcType=INTEGER},
+      country = #{record.country,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -357,6 +381,9 @@
       <if test="profit != null">
         profit = #{profit,jdbcType=DECIMAL},
       </if>
+      <if test="exchangeRate != null">
+        exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -372,6 +399,9 @@
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -388,11 +418,13 @@
       subsidy_c = #{subsidyC,jdbcType=DECIMAL},
       revenue = #{revenue,jdbcType=DECIMAL},
       profit = #{profit,jdbcType=DECIMAL},
+      exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},
       company_name = #{companyName,jdbcType=VARCHAR},
-      period = #{period,jdbcType=INTEGER}
+      period = #{period,jdbcType=INTEGER},
+      country = #{country,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisInternationalTaxDataMapper.xml

@@ -16,6 +16,7 @@
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -89,7 +90,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, seq_no, tax_category, tax_type, tax_amount, create_time, update_time, organization_id, 
-    company_name, period
+    company_name, period, country
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample" resultMap="BaseResultMap">
     <!--
@@ -145,11 +146,11 @@
     insert into analysis_international_tax_data (id, seq_no, tax_category, 
       tax_type, tax_amount, create_time, 
       update_time, organization_id, company_name, 
-      period)
+      period, country)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{taxCategory,jdbcType=VARCHAR}, 
       #{taxType,jdbcType=VARCHAR}, #{taxAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER})
+      #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxData">
     <!--
@@ -188,6 +189,9 @@
       <if test="period != null">
         period,
       </if>
+      <if test="country != null">
+        country,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -220,6 +224,9 @@
       <if test="period != null">
         #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample" resultType="java.lang.Long">
@@ -269,6 +276,9 @@
       <if test="record.period != null">
         period = #{record.period,jdbcType=INTEGER},
       </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -289,7 +299,8 @@
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       company_name = #{record.companyName,jdbcType=VARCHAR},
-      period = #{record.period,jdbcType=INTEGER}
+      period = #{record.period,jdbcType=INTEGER},
+      country = #{record.country,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -328,6 +339,9 @@
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -345,7 +359,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},
       company_name = #{companyName,jdbcType=VARCHAR},
-      period = #{period,jdbcType=INTEGER}
+      period = #{period,jdbcType=INTEGER},
+      country = #{country,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/extends/AnalysisInternationalBusinessDataMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pwc.taxtech.atms.analysis.dao.AnalysisInternationalBusinessDataMapper">
+
+    <select id="selectCompanyList" parameterType="java.lang.Integer" resultType="java.lang.String">
+      select DISTINCT company_name
+      FROM analysis_international_business_data aibd
+      WHERE
+      period = #{period,jdbcType=INTEGER}
+  </select>
+
+    <select id="selectCountryList" parameterType="java.lang.Integer" resultType="java.lang.String">
+       select DISTINCT country
+       FROM analysis_international_business_data aibd
+       WHERE
+       period = #{period,jdbcType=INTEGER}
+  </select>
+</mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/extends/AnalysisInternationalTaxDataMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pwc.taxtech.atms.analysis.dao.AnalysisInternationalTaxDataMapper">
+
+  <select id="selectCompanyList" parameterType="java.lang.Integer" resultType="java.lang.String">
+      select DISTINCT company_name
+      FROM analysis_international_tax_data aitd
+      WHERE
+      aitd.period = #{period,jdbcType=INTEGER}
+  </select>
+
+  <select id="selectCountryList" parameterType="java.lang.Integer" resultType="java.lang.String">
+       select DISTINCT country
+       FROM analysis_international_tax_data aitd
+       WHERE
+       aitd.period = #{period,jdbcType=INTEGER}
+  </select>
+
+</mapper>
\ No newline at end of file

atms-web/src/main/webapp/WEB-INF/templates/logon.htmldd

@@ -38,9 +38,9 @@
                             <!--<a href="javascript:void(0)" id="btnShowForgotPwd" rel="forgot_password" class="form-forget-password">忘记密码?</a>-->
                         <!--</div>-->
                     </div>
-                    <div class="button-wrapper">
+                    <!--<div class="button-wrapper">
                         <button id="btnFullLogin" class="btn-customer btn-customer-lg login-button" type="button" tabindex="0">登录</button>
-                    </div>
+                    </div>-->
                 </div> -->
             </form>
            

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -893,5 +893,8 @@
     "TBEBITForm":"TB EBIT 表格",
     "ClickEnsureTip": "请点击确定按钮!",
 
+    "true": "是",
+    "false": "否",
+
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -60,8 +60,6 @@
     "TaxData": "税务数据",
     "AccountTotalepreciationAmount": "累计折旧额",
     "SetAssetGroup": "资产分类",
-    "AssetStatus": "状态",
-    "AssetStatus": "状态",
     "LevelOneGroup": "一级分类",
     "LevelTwoGroup": "二级分类",
     "LevelOneGroupValidation": "请选择一级分类",
@@ -386,7 +384,6 @@
     "CoverImportOutputInvoice": "覆盖导入销项发票",
     "CoverImportTrialBalance": "覆盖导入试算平衡表",
     "CreateTask": "新建税务事项",
-    "CreditAmount": "贷方发生",
     "CreditAmountConfirmCol": "最终确认数（贷方）",
     "CreditBal": "贷方发生额",
     "CreditBalDiff": "贷方差额",
@@ -455,7 +452,6 @@
     "DataSourceNotFound": "数据源不存在",
     "DataValidation": "数据验证",
     "DateWarningSearch": "前日期不能大于后日期",
-    "DebitAmount": "借方发生",
     "DebitAmountConfirmCol": "最终确认数（借方）",
     "DebitBal": "借方发生额",
     "DebitBalDiff": "借方差额",
@@ -838,7 +834,6 @@
     "PleaseSelectAtLeastOneItem": "请选择至少一项!",
     "PleaseSelectColumn": "请选择列名",
     "PleaseSelectFileFirst": "请先选择文件！",
-    "PleaseSelectPeriod": "请选择一个期间",
     "PleaseSelectTB": "请选择更新标准科目余额表",
     "ProductName": "商品名称",
     "ProductStandar": "规格",
@@ -1117,13 +1112,10 @@
     "bsGenerateVer": "试算平衡生成版",
     "bsMappingVer": "试算平衡Mapping版",
     "salaryAdvance": "预提重分类",
-    "eamDisposal": "EAM资产处置金额记录表",
-    "createTime": "创建时间",
     "importWay": "导入方式",
     "TrialBalanceGeneVer": "试算平衡表生成版",
     "TrialBalanceMappingVer": "试算平衡表Mapping版",
     "AccountDescription": "科目说明",
-    "AccountPeriod": "期间",
     "DebitAmount": "借方发生额",
     "CreditAmount": "贷方发生额",
     "BeginningBalance": "期初余额",
@@ -1138,7 +1130,6 @@
     "createBy": "创建人",
     "createTime" : "创建时间",
     "citSalaryAdvance" : "预提重分类数据源",
-    "assetLabelNumber" : "资产标签号",
     "compensationSaleAmount" : "赔偿/变卖金额",
     "EAMDisposal" : "EAM资产处理金额",
     "MainBodyCode": "主体代码",
@@ -1179,7 +1170,6 @@
     "scrapReason" : "报废原因",
     "assetNumber" : "资产编号",
     "assetLabelNumber" : "资产标签号",
-    "compensationSaleAmount" : "赔偿/变卖金额",
     "liableEmployeeNum" : "员工工号",
     "liableEmployeeName" : "员工姓名",
     "remitEmployeeNum" : "员工工号",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -2237,6 +2237,39 @@
     "GMVSubsidy": "业务线GMV及补贴统计",
     "EmployeeNum": "职工人数",
     "DriverNum": "司机人数",
+    "BUData": "业务数据",
+    "TaxData": "税务数据",
+
+    "FullTimeAmount": "正式员工",
+    "InternAmount": "实习生",
+    "VendorAmount": "外包",
+    "EmployeeTotalAmount": "合计",
+
+    "BusinessLine": "业务线",
+    "OrderChainRatio": "订单环比",
+    "GmvChainRatio": "GMV环比",
+    "BSubsidyRate": "B端补贴率",
+    "BEndLinkRatio": "B端环比",
+    "CSubsidyRate": "C端补贴率",
+    "CEndLinkRatio": "C端环比",
+
+    "BuildingTax": "城建税",
+    "EducationSurcharge": "教育费附加",
+    "UrbanEducationSurcharge": "城市教育费附加",
+    "EmployeeTax": "员工个税",
+    "DriverTax": "司机个税",
+    "StampDuty": "印花税",
+
+    "VATRefund": "增值税返还",
+    "UrbanConstructionTaxRefund": "城建税返还",
+    "EducationFeeSurcharge": "教育费附加返还",
+    "LocalEducationFeeSurcharge": "地方教育费附加返还",
+    "PersonalIncomeTaxReturn": "个人所得税返还",
+
+    "Country": "国家",
+    "Company": "公司",
+    "CompanySimpleName": "公司简称",
+
 
     "~MustBeEndOneApp": "我必须是最后一个！"
 }

atms-web/src/main/webapp/app/admin/basicData/masterData/businessUnit/business-unit.ctrl.js

@@ -240,7 +240,7 @@
                             required: $translate.instant('BusinessUnitEmptyNode'),
                             minlength: $translate.instant('BusinessUnitEmptyNode'),
                             maxlength: $translate.instant('BusinessUnitOutOfLengthNode'),
-                            BURepeated: $translate.instant('BusinessUnitDuplicateNode')
+                            BURepeated: $translate.instant('TaxData')
                         },
                         IsActive: $translate.instant('BusinessUnitStatusUnsureness')
                     },

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.less

@@ -10,6 +10,10 @@
         color: #333333;
     }
 
+    .dx-datagrid-rowsview .dx-datagrid-table .dx-freespace-row{
+        height: 31.11px !important;
+    }
+
     .content-container {
         background-color: #ffffff;
 
@@ -103,6 +107,8 @@
                 /*height: 600px;*/
                 margin-bottom: 15px;
             }
+
+
         }
     }
     .page-footer {

atms-web/src/main/webapp/app/admin/infrastructure/userList/user-list.html

@@ -11,7 +11,7 @@
 
             <div class="align-right" style="margin-top:5px;">
                 <!--<button class="btn btn-export" type="button" ng-click="" translate="Export"></button>-->
-                <export-button style="float: right; margin-left: 0px; margin-top: 7px"><export-button>
+                <!--<export-button style="float: right; margin-left: 0px; margin-top: 7px"><export-button>-->
             </div>
 
             <div class="right-operate ">

atms-web/src/main/webapp/app/admin/infrastructure/userManageList/user-manage-list.ctrl.js

@@ -584,8 +584,27 @@
                         // 转换大小写
                         var userName = user.userName ? user.userName.toLowerCase() : '';
                         var email = user.email ? user.email.toLowerCase() : '';
+                        var businessUnit = user.businessUnitName ? user.businessUnitName.toLowerCase() : '';
+                        var area = user.areaName ? user.areaName.toLowerCase() : '';
+                        var org = user.organizationName ? user.organizationName.toLowerCase() : '';
+
+                        var userNameExist = !(userName.indexOf($scope.queryUser.toLowerCase()) === -1);
+                        var emailExist = !(email.indexOf($scope.queryUser.toLowerCase()) === -1);
+                        var businessUnitExist = !(businessUnit.indexOf($scope.queryUser.toLowerCase()) === -1);
+                        var areaExist = !(area.indexOf($scope.queryUser.toLowerCase()) === -1);
+                        var orgExist = !(org.indexOf($scope.queryUser.toLowerCase()) === -1);
+
+                        var userRoleExist = false;
+
+                        user.roleInfoList.forEach(function (m) {
+                            if (!(m.name.indexOf($scope.queryUser.toLowerCase()) === -1)) {
+                               userRoleExist = true;
+                           }
+                        });
+
+                        var isExist = userNameExist || emailExist || businessUnitExist || userRoleExist || areaExist || orgExist;
 
-                        if (userName.indexOf($scope.queryUser.toLowerCase()) === -1 && email.indexOf($scope.queryUser.toLowerCase()) === -1) {
+                        if (!isExist) {
                             continue;
                         }
 
@@ -593,6 +612,7 @@
                         if (!$scope.showActiveUser && user.status != enums.userStatus.disabled) {
                             continue;
                         }
+
                     } else {
                         // 用户状态筛选
                         // 只显示启用的

atms-web/src/main/webapp/app/admin/infrastructure/userManageList/user-manage-list.html

@@ -166,6 +166,7 @@
 
                                 <span class="more-icon">...</span>
                             </div>
+                            <!--<p ng-show="isNotHundred" class="has-error label"> {{'isNotHundred'|translate}}</p>-->
                         </div>
                         <div class="line-1 " ng-click="goToUserDetail(x.id)"></div>
                         <div class="user-info " ng-click="goToUserDetail(x.id)">

atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.html

@@ -27,7 +27,7 @@
                             </li>
                         </ul>
                     </div>
-                    <span class="text-bold" translate="InvoiceQJ"></span>:
+                    <span class="text-bold" translate="Period"></span>:
                     <div class="period-picker" style="margin-left:10px">
                         <input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
                                readonly="readonly" ng-model="UploadPeriodTime"/>