1、fixbug

atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnylysisJob.java

+package pwc.taxtech.atms.common.schedule;
+
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import pwc.taxtech.atms.common.util.DateUtils;
+import pwc.taxtech.atms.constant.enums.EnumTbImportType;
+import pwc.taxtech.atms.dao.OrganizationMapper;
+import pwc.taxtech.atms.entity.Organization;
+import pwc.taxtech.atms.entity.OrganizationExample;
+import pwc.taxtech.atms.service.impl.AnalysisJobServiceImpl;
+import pwc.taxtech.atms.service.impl.AnalysisServiceImpl;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+public class AnylysisJob extends QuartzJobBean {
+    private static final Logger logger = LoggerFactory.getLogger(AnylysisJob.class);
+
+    @Resource
+    private OrganizationMapper organizationMapper;
+
+    @Value("${org_sync_url}")
+    private String orgSyncUrl;
+
+    @Value("${org_sync_token}")
+    private String token;
+
+    @Autowired
+    private AnalysisJobServiceImpl analysisJobService;
+
+    @Override
+    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        Integer period = DateUtils.getPeriodNow();
+        OrganizationExample e = new OrganizationExample();
+        e.createCriteria().andIsActiveEqualTo(true);
+        List<Organization> orgs = organizationMapper.selectByExample(e);
+
+        logger.info(String.format("开始分析%s预期返还税数据",period));
+        analysisJobService.analysisExpectedTax(orgs,period, EnumTbImportType.CoverImport.getCode());
+
+        logger.info(String.format("开始分析%s预期返还税数据",period));
+        analysisJobService.analysisFee(orgs,period, EnumTbImportType.CoverImport.getCode());
+
+        logger.info(String.format("开始分析%s预期返还税数据",period));
+        analysisJobService.analysisFileManagement(orgs,period, EnumTbImportType.CoverImport.getCode());
+
+        logger.info(String.format("开始分析%s预期返还税数据",period));
+        analysisJobService.analysisMaster(orgs,period, EnumTbImportType.CoverImport.getCode());
+
+        logger.info(String.format("开始分析%s预期返还税数据",period));
+        analysisJobService.analysisSales(orgs,period, EnumTbImportType.CoverImport.getCode());
+
+        logger.info(String.format("开始分析%s预期返还税数据",period));
+        analysisJobService.analysisTaxReturnEnd(orgs,period, EnumTbImportType.CoverImport.getCode());
+
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java

@@ -604,6 +604,17 @@ public class DateUtils {
         return newday;
     }
 
+    public static Integer getNowMonth(){
+        Calendar cale = Calendar.getInstance();
+        return cale.get(Calendar.MONTH) + 1;
+    }
+
+    public static Integer getNowYear(){
+        Calendar cale = Calendar.getInstance();
+        return cale.get(Calendar.YEAR);
+    }
+
+
     /**
      * 取得数据库主键 生成格式为yyyymmddhhmmss+k位随机数
      *

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

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

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

-package pwc.taxtech.atms;
+package pwc.taxtech.atms.controller;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +31,10 @@ public class AnalysisController extends BaseController {
     private AnalysisServiceImpl analysisServiceImpl;
 
     @ResponseBody
-    @RequestMapping(value = "displayAnalysisImportData", method = RequestMethod.GET)
-    public ApiResultDto displayAnalysisImportData(@RequestParam Integer type, @RequestParam String period) {
+    @RequestMapping(value = "displayAnalysisImportData", method = RequestMethod.POST)
+    public ApiResultDto displayAnalysisImportData(@RequestBody AnalysisDomesticlParam param) {
         try{
-            return ApiResultDto.success(analysisServiceImpl.displayAnalysisImportData(type,period));
+            return ApiResultDto.success(analysisServiceImpl.displayAnalysisImportData(param));
         }catch (Exception e){
             return ApiResultDto.fail();
         }
@@ -79,13 +79,13 @@ public class AnalysisController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "DomesitcExcelFile", method = RequestMethod.POST)
-    public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file, @RequestParam String period, @RequestParam Integer type) {
+    public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file, @RequestParam String period, @RequestParam Integer type,@RequestParam String companyName) {
         try {
             String valMsg = valParameter(file,period,type);
             if(StringUtils.isNotEmpty(valMsg)){
                 return OperationResultDto.error(valMsg);
             }
-            return analysisServiceImpl.importDomesitcExcelFile(file,period, type);
+            return analysisServiceImpl.importDomesitcExcelFile(file,period, type,companyName);
         } catch (ServiceException e) {
             return OperationResultDto.error(e.getMessage());
         } catch (Exception e) {

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

@@ -6,6 +6,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.constant.enums.EnumApiCodeMsg;
 import pwc.taxtech.atms.dto.ApiResultDto;
+import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.ebsdto.*;
 import pwc.taxtech.atms.service.EbsApiService;
 
@@ -236,6 +237,12 @@ public class EbsApiController {
         }
     }
 
+    @RequestMapping(value = "syncOrg", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto syncOrg() {
+        return ebsApiService.syncOrg();
+    }
+
     private void setApiResult(ApiResultDto apiResultDto, EnumApiCodeMsg error) {
         apiResultDto.setCode(error.getCode());
         apiResultDto.setMessage(error.getMsg());

atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationExtraDto.java

@@ -620,6 +620,8 @@ public class OrganizationExtraDto implements Serializable {
      */
     private String auditRequirements;
 
+    private String architectureType;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table organization_extra
@@ -1948,6 +1950,14 @@ public class OrganizationExtraDto implements Serializable {
         this.auditRequirements = auditRequirements == null ? null : auditRequirements.trim();
     }
 
+    public String getArchitectureType() {
+        return architectureType;
+    }
+
+    public void setArchitectureType(String architectureType) {
+        this.architectureType = architectureType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table organization_extra

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

 package pwc.taxtech.atms.service;
 
+import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.ebsdto.*;
 
 import java.util.List;
@@ -74,4 +75,10 @@ public interface EbsApiService {
      * @param ebsCallBackDto
      */
     void changeCallBackStatus(EbsCallBackDto ebsCallBackDto);
+
+    /**
+     * ebs 触发同步机构信息
+     * @param
+     */
+    OperationResultDto syncOrg();
 }

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

 package pwc.taxtech.atms.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.util.BeanUtil;
+import pwc.taxtech.atms.common.util.HttpUtil;
 import pwc.taxtech.atms.dao.*;
+import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.ebsdto.*;
+import pwc.taxtech.atms.dto.organization.DDSyncOrgInfo;
+import pwc.taxtech.atms.dto.organization.OrgSyncData;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.service.EbsApiService;
 import pwc.taxtech.atms.vat.dao.*;
@@ -20,10 +27,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class EbsApiServiceImpl implements EbsApiService {
@@ -64,12 +68,19 @@ public class EbsApiServiceImpl implements EbsApiService {
     private OrganizationExtraMapper organizationExtraMapper;
     @Resource
     private DataImportLogMapper dataImportLogMapper;
-
+    @Resource
+    private RegionMapper regionMapper;
     @Resource
     private DistributedIdService distributedIdService;
     @Resource
     private BeanUtil beanUtil;
 
+    @Value("${org_sync_url}")
+    private String orgSyncUrl;
+
+    @Value("${org_sync_token}")
+    private String token;
+
     private static final Logger logger = LoggerFactory.getLogger(EbsApiServiceImpl.class);
 
     @Override
@@ -870,6 +881,59 @@ public class EbsApiServiceImpl implements EbsApiService {
         }
     }
 
+    @Override
+    public OperationResultDto syncOrg() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("token", token);
+        headers.put("Content-Type", "application/x-www-form-urlencoded");
+        headers.put("Idap", "eddie.wu_v");
+        int pageSize = 1;
+        List<OrgSyncData> failObjs = Lists.newArrayList();
+        int totalCount = 0;
+        int success = 0;
+        try {
+            for (int i = 1; i <= pageSize; i++) {
+                String response = HttpUtil.get(orgSyncUrl + "?currentPage=" + i, headers);
+                logger.info("机构信息同步记录:" + response);
+                DDSyncOrgInfo ddSyncOrgInfo = JSONObject.parseObject(response, DDSyncOrgInfo.class);
+                pageSize = ddSyncOrgInfo.getTotalPage();
+                totalCount = ddSyncOrgInfo.getTotalCount();
+                List<OrgSyncData> orgSyncDatas = ddSyncOrgInfo.getData();
+                for (OrgSyncData osd : orgSyncDatas) {
+                    OrganizationExample example = new OrganizationExample();
+                    example.createCriteria().andNameEqualTo(osd.getNameCN());
+                    Organization o = new Organization();
+                    o.setClientCode(osd.getCode());
+                    o.setCode(osd.getCode());
+                    o.setEnterpriseAccountCode(String.valueOf(osd.getSobId()));
+                    o.setEnterpriseAccountName(osd.getSobName());
+                    o.setCurrencyCode(osd.getCurrencyCode());
+                    o.setLegalEntity(osd.getLegalEntity());
+                    o.setLegalPersonName(osd.getLegalRepresentative());
+                    o.setAddress(osd.getAddress());
+                    o.setCreateTime(osd.getGmtCreate());
+                    o.setUpdateTime(osd.getGmtModified());
+                    o.setPsCode(osd.getPsCode());
+                    RegionExample regionExample = new RegionExample();
+                    regionExample.createCriteria().andShortNameEqualTo(osd.getCompanyLocation());
+                    List<Region> regions = regionMapper.selectByExample(regionExample);
+                    if (regions.size() > 0) {
+                        o.setRegionId(regions.get(0).getId());
+                    }
+                    if (organizationMapper.countByExample(example) < 1) {
+                        failObjs.add(osd);
+                    }
+                    success += organizationMapper.updateByExampleSelective(o, example);
+                }
+            }
+            logger.info("同步未匹配的机构记录:"+ JSON.toJSONString(failObjs));
+        } catch (Exception e) {
+            logger.error(String.format("机构信息同步异常:[%s]", e.getMessage()), e);
+        }
+        String msg = String.format("主数据中共[%s]条记录;成功匹配[%s]条;未匹配内容为[%s]",totalCount,success,JSON.toJSONString(failObjs));
+        return OperationResultDto.success(msg);
+    }
+
     /**
      * 获取操作人信息
      * @param id

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

 package pwc.taxtech.atms.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException;
 import org.apache.commons.collections.CollectionUtils;
@@ -13,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -28,6 +30,7 @@ import pwc.taxtech.atms.common.message.EnterpriseAccountSetOrgMessage;
 import pwc.taxtech.atms.common.message.LogMessage;
 import pwc.taxtech.atms.common.message.OrganizationMessage;
 import pwc.taxtech.atms.common.util.BeanUtil;
+import pwc.taxtech.atms.common.util.HttpUtil;
 import pwc.taxtech.atms.constant.*;
 import pwc.taxtech.atms.dao.*;
 import pwc.taxtech.atms.dpo.*;

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

@@ -144,13 +144,13 @@ public class OrganizationStructureServiceImpl {
 
 
             OrganizationStructureExample example = new OrganizationStructureExample();
-            example.createCriteria().andIdNotEqualTo(organizationStructureDto.getId());
-            boolean nameNotExist = organizationStructureMapper.countByExample(example) < 1;
+            example.createCriteria().andIdNotEqualTo(organizationStructureDto.getId()).andNameEqualTo(organizationStructureDto.getName());
+            boolean nameExist = organizationStructureMapper.countByExample(example) > 0;
 
             if (notChange) {
                 return ApiResultDto.fail(ErrorMessageCN.OrgStructureFailed);
             }
-            if (!nameNotExist) {
+            if (nameExist) {
                 return ApiResultDto.fail(ErrorMessageCN.OrgStructureNameExist);
             }
 

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

@@ -314,7 +314,7 @@ public class UserRoleServiceImpl extends AbstractService {
     }
 
     public List<UserRoleDisplayInfo> getAllUserRoleList(String serviceTypeId) {
-        List<UserRoleQuery> query = userRoleMapper.selectUserRoleQueryByServiceTypeId(serviceTypeId);
+        List<UserRoleQuery> query = userRoleMapper.selectUserRoleQueryByServiceTypeIdAll(serviceTypeId);
         List<UserRoleDisplayInfo> userRoleDtoList = new ArrayList<>();
         List<UserRoleQueryDto> userList = query.stream().map(u -> CommonUtils.copyProperties(u, new UserRoleQueryDto()))
                 .distinct().collect(Collectors.toList());

atms-api/src/test/java/pwc/taxtech/atms/CommonIT.java

@@ -79,6 +79,8 @@ public abstract class CommonIT {
     @Autowired
     protected OrganizationMapper organizationMapper;
     @Autowired
+    protected OrganizationExtraMapper organizationExtraMapper;
+    @Autowired
     protected CustomerMapper customerMapper;
     @Autowired
     protected UserMapper userMapper;

atms-api/src/test/java/pwc/taxtech/atms/service/impl/GaryTest.java

@@ -3,7 +3,14 @@ package pwc.taxtech.atms.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
+import pwc.taxtech.atms.CommonIT;
+import pwc.taxtech.atms.common.util.StringUtil;
+import pwc.taxtech.atms.entity.Organization;
+import pwc.taxtech.atms.entity.OrganizationExample;
+import pwc.taxtech.atms.entity.OrganizationExtra;
+import pwc.taxtech.atms.entity.OrganizationExtraExample;
 
 import java.util.List;
 
@@ -12,7 +19,7 @@ import java.util.List;
  * @Date: 15/03/2019 20:42
  * @Description:
  */
-public class GaryTest {
+public class GaryTest extends CommonIT {
 
     @Test
     public void gagaga(){
@@ -223,4 +230,20 @@ public class GaryTest {
         System.out.println("enNameList"+enNameList);
 
     }
+
+    @Test
+    public void syncArc(){
+        List<Organization> orgs = organizationMapper.selectByExample(new OrganizationExample());
+        orgs.forEach(o->{
+            if(StringUtils.isNotEmpty(o.getArchitectureType())){
+                OrganizationExtra oe = new OrganizationExtra();
+                oe.setArchitectureType(o.getArchitectureType());
+                OrganizationExtraExample e1 = new OrganizationExtraExample();
+                e1.createCriteria().andOrganizationIdEqualTo(o.getId());
+                if(organizationExtraMapper.updateByExampleSelective(oe,e1)>0){
+                    System.out.println("更新"+o.getName()+"架构类型"+o.getArchitectureType()+"成功");
+                }
+            }
+        });
+    }
 }

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

 package pwc.taxtech.atms.analysis.entity;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 import pwc.taxtech.atms.entity.BaseEntity;
 
@@ -55,7 +54,7 @@ public class AnalysisFileManagement extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal reportingFrequency;
+    private String reportingFrequency;
 
     /**
      * Database Column Remarks:
@@ -66,7 +65,7 @@ public class AnalysisFileManagement extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal archivingStatus;
+    private String archivingStatus;
 
     /**
      * Database Column Remarks:
@@ -211,7 +210,7 @@ public class AnalysisFileManagement extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getReportingFrequency() {
+    public String getReportingFrequency() {
         return reportingFrequency;
     }
 
@@ -223,8 +222,8 @@ public class AnalysisFileManagement extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setReportingFrequency(BigDecimal reportingFrequency) {
-        this.reportingFrequency = reportingFrequency;
+    public void setReportingFrequency(String reportingFrequency) {
+        this.reportingFrequency = reportingFrequency == null ? null : reportingFrequency.trim();
     }
 
     /**
@@ -235,7 +234,7 @@ public class AnalysisFileManagement extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getArchivingStatus() {
+    public String getArchivingStatus() {
         return archivingStatus;
     }
 
@@ -247,8 +246,8 @@ public class AnalysisFileManagement extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setArchivingStatus(BigDecimal archivingStatus) {
-        this.archivingStatus = archivingStatus;
+    public void setArchivingStatus(String archivingStatus) {
+        this.archivingStatus = archivingStatus == null ? null : archivingStatus.trim();
     }
 
     /**

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

 package pwc.taxtech.atms.analysis.entity;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -406,52 +405,62 @@ public class AnalysisFileManagementExample {
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyEqualTo(BigDecimal value) {
+        public Criteria andReportingFrequencyEqualTo(String value) {
             addCriterion("reporting_frequency =", value, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyNotEqualTo(BigDecimal value) {
+        public Criteria andReportingFrequencyNotEqualTo(String value) {
             addCriterion("reporting_frequency <>", value, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyGreaterThan(BigDecimal value) {
+        public Criteria andReportingFrequencyGreaterThan(String value) {
             addCriterion("reporting_frequency >", value, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andReportingFrequencyGreaterThanOrEqualTo(String value) {
             addCriterion("reporting_frequency >=", value, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyLessThan(BigDecimal value) {
+        public Criteria andReportingFrequencyLessThan(String value) {
             addCriterion("reporting_frequency <", value, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andReportingFrequencyLessThanOrEqualTo(String value) {
             addCriterion("reporting_frequency <=", value, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyIn(List<BigDecimal> values) {
+        public Criteria andReportingFrequencyLike(String value) {
+            addCriterion("reporting_frequency like", value, "reportingFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportingFrequencyNotLike(String value) {
+            addCriterion("reporting_frequency not like", value, "reportingFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportingFrequencyIn(List<String> values) {
             addCriterion("reporting_frequency in", values, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyNotIn(List<BigDecimal> values) {
+        public Criteria andReportingFrequencyNotIn(List<String> values) {
             addCriterion("reporting_frequency not in", values, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andReportingFrequencyBetween(String value1, String value2) {
             addCriterion("reporting_frequency between", value1, value2, "reportingFrequency");
             return (Criteria) this;
         }
 
-        public Criteria andReportingFrequencyNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andReportingFrequencyNotBetween(String value1, String value2) {
             addCriterion("reporting_frequency not between", value1, value2, "reportingFrequency");
             return (Criteria) this;
         }
@@ -466,52 +475,62 @@ public class AnalysisFileManagementExample {
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusEqualTo(BigDecimal value) {
+        public Criteria andArchivingStatusEqualTo(String value) {
             addCriterion("archiving_status =", value, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusNotEqualTo(BigDecimal value) {
+        public Criteria andArchivingStatusNotEqualTo(String value) {
             addCriterion("archiving_status <>", value, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusGreaterThan(BigDecimal value) {
+        public Criteria andArchivingStatusGreaterThan(String value) {
             addCriterion("archiving_status >", value, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andArchivingStatusGreaterThanOrEqualTo(String value) {
             addCriterion("archiving_status >=", value, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusLessThan(BigDecimal value) {
+        public Criteria andArchivingStatusLessThan(String value) {
             addCriterion("archiving_status <", value, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andArchivingStatusLessThanOrEqualTo(String value) {
             addCriterion("archiving_status <=", value, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusIn(List<BigDecimal> values) {
+        public Criteria andArchivingStatusLike(String value) {
+            addCriterion("archiving_status like", value, "archivingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchivingStatusNotLike(String value) {
+            addCriterion("archiving_status not like", value, "archivingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchivingStatusIn(List<String> values) {
             addCriterion("archiving_status in", values, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusNotIn(List<BigDecimal> values) {
+        public Criteria andArchivingStatusNotIn(List<String> values) {
             addCriterion("archiving_status not in", values, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andArchivingStatusBetween(String value1, String value2) {
             addCriterion("archiving_status between", value1, value2, "archivingStatus");
             return (Criteria) this;
         }
 
-        public Criteria andArchivingStatusNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andArchivingStatusNotBetween(String value1, String value2) {
             addCriterion("archiving_status not between", value1, value2, "archivingStatus");
             return (Criteria) this;
         }

atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.dpo.ProjectAnaylsisDto;
 import pwc.taxtech.atms.dpo.ProjectDisplayDto;
 import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.entity.ProjectExample;
@@ -244,4 +245,8 @@ public interface ProjectMapper extends MyMapper {
             "WHERE a.id = #{projectId} " +
             "    AND b.service_type_id = #{serviceType}")
     Long getTemplateGroupIdByProject(@Param("projectId") String projectId, @Param("serviceType") Integer serviceType);
+
+    List<ProjectAnaylsisDto> getTemlateWithServiceType(@Param("orgIds") List<String> orgIds, @Param("year") Integer year, @Param("month") Integer month,@Param("reportName")String reportName);
+
+    List<ProjectAnaylsisDto> getTemlateWithServiceType2(@Param("orgId")String orgId, @Param("year") Integer year, @Param("month") Integer month,@Param("code")String code);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/UserRoleMapper.java

@@ -112,5 +112,7 @@ public interface UserRoleMapper extends MyMapper {
 
     List<UserRoleQuery> selectUserRoleQueryByServiceTypeId(String serviceTypeId);
 
+    List<UserRoleQuery> selectUserRoleQueryByServiceTypeIdAll(String serviceTypeId);
+
     List<UserOrgRoleDto> getOriginalRoleList();
 }
\ No newline at end of file

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

+package pwc.taxtech.atms.dpo;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 20/03/2019 11:17
+ * @Description:
+ */
+public class AnalysisSalesValueDto {
+
+    private String data;
+
+    private Integer rowIndex;
+
+    private Integer columnIndex;
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getRowIndex() {
+        return rowIndex;
+    }
+
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public Integer getColumnIndex() {
+        return columnIndex;
+    }
+
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+}

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

@@ -618,6 +618,8 @@ public class OrganizationExtraDto implements Serializable {
      */
     private String auditRequirements;
 
+    private String architectureType;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table organization_extra
@@ -1946,6 +1948,14 @@ public class OrganizationExtraDto implements Serializable {
         this.auditRequirements = auditRequirements == null ? null : auditRequirements.trim();
     }
 
+    public String getArchitectureType() {
+        return architectureType;
+    }
+
+    public void setArchitectureType(String architectureType) {
+        this.architectureType = architectureType;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table organization_extra

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

+package pwc.taxtech.atms.dpo;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 20/03/2019 11:17
+ * @Description:
+ */
+public class ProjectAnaylsisDto {
+
+    private String reportId;
+
+    private String projectId;
+
+    private String orgId;
+
+    private String templateName;
+
+    private String serviceTypeId;
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getServiceTypeId() {
+        return serviceTypeId;
+    }
+
+    public void setServiceTypeId(String serviceTypeId) {
+        this.serviceTypeId = serviceTypeId;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationExtra.java

@@ -616,6 +616,35 @@ public class OrganizationExtra extends BaseEntity implements Serializable {
      */
     private String auditRequirements;
 
+    /**
+     * Database Column Remarks:
+     *   架构类型
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_extra.architecture_type
+     *
+     * @mbg.generated
+     */
+    private String architectureType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_extra.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_extra.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table organization_extra
@@ -1944,6 +1973,78 @@ public class OrganizationExtra extends BaseEntity implements Serializable {
         this.auditRequirements = auditRequirements == null ? null : auditRequirements.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_extra.architecture_type
+     *
+     * @return the value of organization_extra.architecture_type
+     *
+     * @mbg.generated
+     */
+    public String getArchitectureType() {
+        return architectureType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_extra.architecture_type
+     *
+     * @param architectureType the value for organization_extra.architecture_type
+     *
+     * @mbg.generated
+     */
+    public void setArchitectureType(String architectureType) {
+        this.architectureType = architectureType == null ? null : architectureType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_extra.create_time
+     *
+     * @return the value of organization_extra.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_extra.create_time
+     *
+     * @param createTime the value for organization_extra.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_extra.update_time
+     *
+     * @return the value of organization_extra.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_extra.update_time
+     *
+     * @param updateTime the value for organization_extra.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table organization_extra
@@ -2011,6 +2112,9 @@ public class OrganizationExtra extends BaseEntity implements Serializable {
         sb.append(", actualBusinessAddress=").append(actualBusinessAddress);
         sb.append(", taxRuleIntroduction=").append(taxRuleIntroduction);
         sb.append(", auditRequirements=").append(auditRequirements);
+        sb.append(", architectureType=").append(architectureType);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationExtraExample.java

@@ -3914,6 +3914,196 @@ public class OrganizationExtraExample {
             addCriterion("audit_requirements not between", value1, value2, "auditRequirements");
             return (Criteria) this;
         }
+
+        public Criteria andArchitectureTypeIsNull() {
+            addCriterion("architecture_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeIsNotNull() {
+            addCriterion("architecture_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeEqualTo(String value) {
+            addCriterion("architecture_type =", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeNotEqualTo(String value) {
+            addCriterion("architecture_type <>", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeGreaterThan(String value) {
+            addCriterion("architecture_type >", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("architecture_type >=", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeLessThan(String value) {
+            addCriterion("architecture_type <", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeLessThanOrEqualTo(String value) {
+            addCriterion("architecture_type <=", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeLike(String value) {
+            addCriterion("architecture_type like", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeNotLike(String value) {
+            addCriterion("architecture_type not like", value, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeIn(List<String> values) {
+            addCriterion("architecture_type in", values, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeNotIn(List<String> values) {
+            addCriterion("architecture_type not in", values, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeBetween(String value1, String value2) {
+            addCriterion("architecture_type between", value1, value2, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andArchitectureTypeNotBetween(String value1, String value2) {
+            addCriterion("architecture_type not between", value1, value2, "architectureType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodCellDataMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.dpo.AnalysisSalesValueDto;
 import pwc.taxtech.atms.vat.entity.PeriodCellData;
 import pwc.taxtech.atms.vat.entity.PeriodCellDataExample;
 
@@ -109,4 +110,6 @@ public interface PeriodCellDataMapper extends MyVatMapper {
     int batchInsert(List<PeriodCellData> list);
 
     List<PeriodCellData> selectDataByCellTemplateIdAround(@Param("bufferString") String bufferString);
+
+    List<AnalysisSalesValueDto> selectAnalysisSalesValueDto(@Param("reportId")String reportId, @Param("projectId")String projectId);
 }
\ No newline at end of file

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

@@ -9,8 +9,8 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="seq_no" jdbcType="VARCHAR" property="seqNo" />
     <result column="file_type" jdbcType="VARCHAR" property="fileType" />
-    <result column="reporting_frequency" jdbcType="DECIMAL" property="reportingFrequency" />
-    <result column="archiving_status" jdbcType="DECIMAL" property="archivingStatus" />
+    <result column="reporting_frequency" jdbcType="VARCHAR" property="reportingFrequency" />
+    <result column="archiving_status" jdbcType="VARCHAR" property="archivingStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
@@ -147,7 +147,7 @@
       update_time, organization_id, company_name, 
       period)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
-      #{reportingFrequency,jdbcType=DECIMAL}, #{archivingStatus,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{reportingFrequency,jdbcType=VARCHAR}, #{archivingStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{period,jdbcType=INTEGER})
   </insert>
@@ -200,10 +200,10 @@
         #{fileType,jdbcType=VARCHAR},
       </if>
       <if test="reportingFrequency != null">
-        #{reportingFrequency,jdbcType=DECIMAL},
+        #{reportingFrequency,jdbcType=VARCHAR},
       </if>
       <if test="archivingStatus != null">
-        #{archivingStatus,jdbcType=DECIMAL},
+        #{archivingStatus,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -249,10 +249,10 @@
         file_type = #{record.fileType,jdbcType=VARCHAR},
       </if>
       <if test="record.reportingFrequency != null">
-        reporting_frequency = #{record.reportingFrequency,jdbcType=DECIMAL},
+        reporting_frequency = #{record.reportingFrequency,jdbcType=VARCHAR},
       </if>
       <if test="record.archivingStatus != null">
-        archiving_status = #{record.archivingStatus,jdbcType=DECIMAL},
+        archiving_status = #{record.archivingStatus,jdbcType=VARCHAR},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -283,8 +283,8 @@
     set id = #{record.id,jdbcType=BIGINT},
       seq_no = #{record.seqNo,jdbcType=VARCHAR},
       file_type = #{record.fileType,jdbcType=VARCHAR},
-      reporting_frequency = #{record.reportingFrequency,jdbcType=DECIMAL},
-      archiving_status = #{record.archivingStatus,jdbcType=DECIMAL},
+      reporting_frequency = #{record.reportingFrequency,jdbcType=VARCHAR},
+      archiving_status = #{record.archivingStatus,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
@@ -308,10 +308,10 @@
         file_type = #{fileType,jdbcType=VARCHAR},
       </if>
       <if test="reportingFrequency != null">
-        reporting_frequency = #{reportingFrequency,jdbcType=DECIMAL},
+        reporting_frequency = #{reportingFrequency,jdbcType=VARCHAR},
       </if>
       <if test="archivingStatus != null">
-        archiving_status = #{archivingStatus,jdbcType=DECIMAL},
+        archiving_status = #{archivingStatus,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -339,8 +339,8 @@
     update analysis_file_management
     set seq_no = #{seqNo,jdbcType=VARCHAR},
       file_type = #{fileType,jdbcType=VARCHAR},
-      reporting_frequency = #{reportingFrequency,jdbcType=DECIMAL},
-      archiving_status = #{archivingStatus,jdbcType=DECIMAL},
+      reporting_frequency = #{reportingFrequency,jdbcType=VARCHAR},
+      archiving_status = #{archivingStatus,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/ProjectExtendsMapper.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.dao.ProjectMapper">
+
+  <select id="getTemlateWithServiceType" resultType="pwc.taxtech.atms.dpo.ProjectAnaylsisDto">
+    select pp.id as reportId,p.id as projectId,p.organization_id as orgId,pst.service_type_id,t.name as templateName
+    from period_report pp
+    left join project p on
+    pp.project_id = p.id
+    left join project_service_type pst
+    on p.id = pst.project_id
+    left join template t
+    on pp.template_id = t.id
+    where p.organization_id in
+    <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+    and p.year = #{year}
+    and p.stat_period &lt; #{month}
+    and p.end_period &gt; #{month}
+    and t.name = #{reportName}
+  </select>
+
+  <select id="getTemlateWithServiceType2" resultType="pwc.taxtech.atms.dpo.ProjectAnaylsisDto">
+    select pp.id as reportId,p.id as projectId,p.organization_id as orgId,pst.service_type_id,t.name as templateName
+    from period_report pp
+    left join project p on
+    pp.project_id = p.id
+    left join project_service_type pst
+    on p.id = pst.project_id
+    left join template t
+    on pp.template_id = t.id
+    where p.organization_id = #{orgId}
+    and p.year = #{year}
+    and p.stat_period &lt; #{month}
+    and p.end_period &gt; #{month}
+    and t.code = #{code}
+  </select>
+
+
+</mapper>
\ No newline at end of file

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

@@ -64,6 +64,51 @@
         user_name
     </select>
 
+    <select id="selectUserRoleQueryByServiceTypeIdAll" parameterType="java.lang.String" resultMap="UserRoleQuery">
+        SELECT
+        UR.id AS ID,
+        U.id AS USER_ID,
+        U.user_name AS USER_NAME,
+        UR.role_id AS ROLE_ID,
+        R.name AS ROLE_NAME,
+        S.name AS SERVICE_TYPE_NAME,
+        S.id AS SERVICE_TYPE_ID,
+        RC.id AS ROLE_CATEGORY_ID,
+        RC.name AS ROLE_CATETORY_NAME,
+        ORG.id AS ORG_ID,
+        ORG.name AS ORG_NAME,
+        U.email AS EMAIL,
+        U.status AS STATUS
+        FROM
+        user U
+        LEFT JOIN
+        user_role UR
+        ON
+        U.id = UR.user_id
+        LEFT JOIN
+        role R
+        ON UR.role_id = R.id
+        LEFT JOIN
+        service_type S
+        ON
+        S.id = R.service_type_id
+        AND S.is_active = 1
+        AND S.id = #{serviceTypeID}
+        LEFT JOIN
+        role_category RC
+        ON
+        RC.id = R.role_category_id
+        AND RC.is_active = 1
+        LEFT JOIN
+        organization ORG
+        ON
+        U.organization_id = ORG.id
+        WHERE
+        U.is_super_admin = 0
+        ORDER BY
+        user_name
+    </select>
+
     <resultMap id="UserOrgRoleDto" type="pwc.taxtech.atms.dpo.UserOrgRoleDto">
         <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="USER_ID" jdbcType="VARCHAR" property="userId"/>

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellDataExtendsMapper.xml

@@ -99,4 +99,15 @@
             and t.cell_template_id in #{bufferString}
         </if>
     </select>
+
+    <select id = "selectAnalysisSalesValueDto" resultType="pwc.taxtech.atms.dpo.AnalysisSalesValueDto">
+        select pcd.data as data,pct.column_index as columnIndex,pct.row_index as rowIndex,
+        from
+        period_cell_data pcd
+        left join period_cell_template pct
+        on pcd.cell_template_id = pct.id
+        where
+        pcd.report_id = #{reportId} and
+        pcd.project_id = #{projectId}
+    </select>
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json

@@ -910,6 +910,7 @@
     "StartRowNum": "Start Row：",
     "StartRowNumberCheckMsg": "The Starting Line Cannot be Greater Than The Total Number of Currently Imported Data！",
     "StartingDate": "Start Date",
+    "EndDate": "End Date",
     "StdAccountMappingResult": "Standard Account Mapping Result",
     "StdCodeDirection": "Standard Account Direction",
     "StdGoodsName": "Standard Goods Name",

atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json

@@ -1156,6 +1156,7 @@
   "StartRowNum": "Beginning Row: ",
   "StartRowNumberCheckMsg": "Starting Rows Should Not be Greater Than the Total Number of Currently Imported Data!",
   "StartingDate": "Start Date",
+  "EndDate": "End Date",
   "StatesColon": "States:",
   "Status": "Status",
   "StdAccountMappingResult": "Standard Account Mapping Result...",

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

@@ -918,6 +918,7 @@
     "StartRowNum": "起始行：",
     "StartRowNumberCheckMsg": "起始行不能大于当前导入数据总数！",
     "StartingDate": "开始日期",
+    "EndDate": "结束日期",
     "StdAccountMappingResult": "标准科目对应结果",
     "StdCodeDirection": "标准科目借贷方向",
     "StdGoodsName": "标准货物名称",

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

@@ -304,12 +304,12 @@
     "phoneNumber": "电话号码",
     "EtaWebsite": "电子税局网址",
     "IsApprovedLevy": "是否有核定征收",
-    "ApprovedLevyProject": "核定征收项目",
+    "ApprovedLevyProject": "税种核定-征收项目",
     "ApprovedLevyItems": "核定征收品目",
-    "ApprovedValidityPeriodStartTime": "核定有效期起",
-    "ApprovedValidityPeriodEndTime": "核定有效期止",
-    "ApprovedRate": "核定税率",
-    "ApprovedTaxTerm": "核定纳税期限",
+    "ApprovedValidityPeriodStartTime": "认定有效期起",
+    "ApprovedValidityPeriodEndTime": "认定有效期止",
+    "ApprovedRate": "税率或单位税率",
+    "ApprovedTaxTerm": "纳税期限(申报频率)",
     "SignTripartiteAgreement": "三方协议是否签订",
     "BankAccountName": "签订银行名称",
     "BankAccountNumber": "签订银行账户",
@@ -387,7 +387,7 @@
     "ReturnRateInformation": "返还率信息",
     "AccountingRateInformation": "入账汇率信息",
     "InvoiceInformation": "发票核定信息",
-    "ApprovedLevyInformation": "核定征收信息",
+    "ApprovedLevyInformation": "税(费)种认定信息",
     "EmployeeInformation": "雇员信息",
     "TaxpayerQualificationInformation": "资格信息",
     "TaxOfficerList": "专管员列表",

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

@@ -1512,6 +1512,7 @@
     "StartRowNum": "起始行：",
     "StartRowNumberCheckMsg": "起始行不能大于当前导入数据总数！",
     "StartingDate": "开始日期",
+    "EndDate": "结束日期",
     "StatusColon": "状态:",
     "StdAccountMappingResult": "标准科目对应结果",
     "StdAccountNotLeaf": "请选择叶子节点",

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -859,10 +859,6 @@
                                 displayExpr: "type",
                                 valueExpr: "type"
                             }
-                        },{
-                            dataField: "singleInvoiceMaxInvoiceAmount",
-                            allowHeaderFiltering: true,
-                            caption: $translate.instant('SingleInvoiceMaxInvoiceAmount')
                         },{
                             dataField: "monthlyMaxTicketsPurchased",
                             allowHeaderFiltering: true,
@@ -3201,6 +3197,7 @@
                 $scope.lowValueConsumablesAmortizationMethodList = constant.LowValueConsumablesAmortizationMethodList;
                 $scope.depreciationMethodList = constant.DepreciationMethodList;
                 $scope.taxCreditRatingList = constant.TaxCreditRatingList;
+                $scope.architectureTypeList = constant.ArchitectureTypeList;
             };
 
             (function initialize() {

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less

@@ -325,6 +325,7 @@
                       float: left;
                       padding: 30px 10px 10px 10px;
                       .form-group{
+                        padding-top: 7px;
                         padding-left: 0;
                         line-height: 2em;
                         margin-left: -15px;
@@ -461,10 +462,12 @@
 
                   input {
                     width: 70% !important;
+                    height: 30px;
                   }
 
                   select {
                     width: 70% !important;
+                    height: 30px;
                   }
 
                   .divider {
@@ -474,7 +477,6 @@
                     border-bottom: 1px solid #fff;
                   }
 
-
                   .row {
                     padding-left: 0;
                     line-height: 2em;
@@ -501,12 +503,20 @@
                   }
                   .tax-reg-info-table{
                     .tax-reg-info-content {
+
+                      .col-sm-4 span{
+                        float: left;
+                        margin-top: 7px;
+                      }
+
                       .row input {
                         width: 70%;
+                        height: 30px;
                       }
 
                       .row select {
                         width: 70%;
+                        height: 30px;
                       }
                     }
                   }
@@ -524,6 +534,16 @@
                           line-height: 2em;
                           margin-left: -15px;
                           margin-right: -15px;
+                          .col-sm-4 {
+                            float: left;
+                            text-align: right;
+                            margin-top: 7px;
+                          }
+                          .col-sm-8 span{
+                            float: left;
+                            margin-top: 7px;
+                          }
+
                         }
                       }
 

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

@@ -42,6 +42,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.selectCompany = '';
 
 
         $scope.showTaxGrid = false;
@@ -113,6 +114,13 @@
             projectId: $scope.projectID
         };
 
+
+        var param = {
+            companyName : $scope.selectCountry,
+            type: $scope.importType,
+            period: $scope.UploadPeriodTime
+        };
+
         //分页获取数据
         $scope.eventService = {
             refreshInvoiceDataGrid: function () {
@@ -163,11 +171,10 @@
                     fileName = m.name + $scope.UploadPeriodTime+"_" +localDate;
                 }
             });
-            var downloadParam = {
-                type: $scope.importType,
-                period: $scope.UploadPeriodTime
-            };
-            vatImportService.downloadDomesticFile(downloadParam,fileName).then(function (data) {
+            param.companyName = $scope.selectCompany;
+            param.type = $scope.importType;
+            param.period = $scope.UploadPeriodTime;
+            vatImportService.downloadDomesticFile(param,fileName).then(function (data) {
                 if (data) {
                     ackMessageBox.success(translate('FileExportSuccess'));
                 }
@@ -193,6 +200,7 @@
             Upload.upload({
                 url: url,
                 data: {
+                    companyName:$scope.selectCompany,
                     period: period,
                     type: $scope.importType
                 },
@@ -381,7 +389,10 @@
         };
 
         var getImportTax = function () {
-            vatImportService.displayAnalysisImportData($scope.importType,$scope.UploadPeriodTime).success(function (data) {
+            param.companyName = $scope.selectCompany;
+            param.type = $scope.importType;
+            param.period = $scope.UploadPeriodTime;
+            vatImportService.displayAnalysisImportData(param).success(function (data) {
                 if (data.data) {
                     $scope.taxGridSource = data.data;
                 }else {
@@ -473,7 +484,10 @@
         };
 
         var getImportReturnTax = function () {
-            vatImportService.displayAnalysisImportData($scope.importType,$scope.UploadPeriodTime).success(function (data) {
+            param.companyName = $scope.selectCompany;
+            param.type = $scope.importType;
+            param.period = $scope.UploadPeriodTime;
+            vatImportService.displayAnalysisImportData(param).success(function (data) {
                 if (data.data) {
                     $scope.returnTaxGridSource = data.data;
                 }else {
@@ -570,7 +584,10 @@
         };
 
         var getImportGMVSubsidy = function () {
-            vatImportService.displayAnalysisImportData($scope.importType,$scope.UploadPeriodTime).success(function (data) {
+            param.companyName = $scope.selectCompany;
+            param.type = $scope.importType;
+            param.period = $scope.UploadPeriodTime;
+            vatImportService.displayAnalysisImportData(param).success(function (data) {
                 if (data.data) {
                     $scope.GMVSubsidyGridSource = data.data;
                 }else {
@@ -662,7 +679,10 @@
         };
 
         var getImportEmployeeNum = function () {
-            vatImportService.displayAnalysisImportData($scope.importType,$scope.UploadPeriodTime).success(function (data) {
+            param.companyName = $scope.selectCompany;
+            param.type = $scope.importType;
+            param.period = $scope.UploadPeriodTime;
+            vatImportService.displayAnalysisImportData(param).success(function (data) {
                 if (data.data) {
                     $scope.employeeNumGridSource = data.data;
                 }else {
@@ -739,7 +759,10 @@
         };
 
         var getImportDriverNum = function () {
-            vatImportService.displayAnalysisImportData($scope.importType,$scope.UploadPeriodTime).success(function (data) {
+            param.companyName = $scope.selectCompany;
+            param.type = $scope.importType;
+            param.period = $scope.UploadPeriodTime;
+            vatImportService.displayAnalysisImportData(param).success(function (data) {
                 if (data.data) {
                     $scope.driverNumGridSource = data.data;
                 }else {
@@ -849,6 +872,10 @@
             });
         };
 
+        $scope.selectCompanyEvent = function(i){
+            $scope.selectCompany=i.name;
+            refreshGrid();
+        };
 
         $scope.selectOne = function () {
             $scope.checkedCompanyList = [];
@@ -936,6 +963,7 @@
             initParam();
             checkUserOrganizationPermissionList();
             getUserPermission();
+            initCompanyList();
             initDatePicker();
 
             $scope.$watch('importExcelFile', function (newValue, oldValue) {

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

@@ -33,6 +33,21 @@
                                readonly="readonly" ng-model="UploadPeriodTime"/>
                         <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                     </div>
+                    <span class="text-bold" translate="Company"></span>:
+                    <div class="dropdown" style="margin-left:10px">
+                        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4"
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 320px;">
+                            {{selectCompany ? ((selectCompany)|translate):('PleaseSelect' | translate)}}
+                            <span class="caret" style="float: right "></span>
+                        </button>
+                        <ul class="dropdown-menu" style="width: 320px;max-height: 300px;overflow-y: auto;" aria-labelledby="dropdownMenu4">
+                            <li ng-repeat="i in companyList" ng-click="selectCompanyEvent(i)">
+                                <div class="checkbox-custom checkbox-default">
+                                    <span style="margin-left:15px; float: left;">{{i.name}}</span>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
                     <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:10px">

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js

@@ -53,7 +53,6 @@
 
         $scope.internationalDataList = constant.internationalDataList;
         $scope.countryList = constant.countryCNList;
-        $scope.companyList = [];
 
         var date = new Date();
         var year = date.getFullYear();

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1599,13 +1599,13 @@ constant.exportExcelFileName = {
 };
 
 constant.anlTemplateNameList = [
-    {code:0,name:"各税种税额_所属期间_模版"},
-    {code:1,name:"实际返还税额_所属期间_模版"},
-    {code:2,name:"業務線_所属期间_模版"},
-    {code:3,name:"职工人数_所属期间_模版"},
-    {code:4,name:"司機人數_所属期间_模版"},
-    {code:100,name:"国际税业务数据_国家_公司_所属期间_模版"},
-    {code:101,name:"国际税税务数据_国家_公司_所属期间_模版"}
+    {code:0,name:"各税种税额"},
+    {code:1,name:"实际返还税额"},
+    {code:2,name:"业务线"},
+    {code:3,name:"职工人数"},
+    {code:4,name:"司机人数"},
+    {code:100,name:"国际税业务数据"},
+    {code:101,name:"国际税税务数据"}
 ];
 
 constant.anlDownLoadFileNameList = [

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

@@ -406,8 +406,8 @@
         displayProcessLog: function (queryParams) {
             return $http.post('/DataImport/displayProcessLog', queryParams, apiConfig.create());
         },
-        displayAnalysisImportData: function (type, period) {
-            return $http.get('/Analysis/displayAnalysisImportData?type=' + type + '&period=' + period, apiConfig.create());
+        displayAnalysisImportData: function (param) {
+            return $http.post('/Analysis/displayAnalysisImportData' , param ,apiConfig.create());
         },
         displayAnalysisInternationalImportData: function (param) {
             return $http.post('/Analysis/displayAnalysisInternationalImportData',param,apiConfig.create());

atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.html

@@ -24,7 +24,7 @@
             <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
         </div>
         <div class="pagination-container">
-            <span>本页{{curPageItemCount}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.total}}条记录</span>
+            <span>本页{{curPageItemCount}}条记录，共{{queryRedLetterInfoTabItemResult.pageInfo.total}}条记录</span>
             <div id="totalInvoicePage" class="common-pagination" style="display:none;">
             </div>
         </div>