merge

atms-api/etc/generator/generatorConfig.xml

@@ -357,5 +357,43 @@
       <columnOverride column="Name" javaType="java.lang.String" jdbcType="VARCHAR" />
       <columnOverride column="ShortName" javaType="java.lang.String" jdbcType="VARCHAR" />
     </table>
+      <table tableName="CellTemplate" domainObjectName="CellTemplate">
+          <property name="useActualColumnNames" value="true"/>
+          <property name="ignoreQualifiersAtRuntime" value="true"/>
+          <columnOverride column="RowName" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="ColumnName" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="Comment" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="IsReadOnly" javaType="Boolean"/>
+      </table>
+      <table tableName="CellTemplateConfig" domainObjectName="CellTemplateConfig">
+          <property name="useActualColumnNames" value="true"/>
+          <property name="ignoreQualifiersAtRuntime" value="true"/>
+          <columnOverride column="Formula" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="FormulaDescription" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="AccountCodes" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="ModelIDs" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="FormulaDataSource" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="Validation" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="ValidationDescription" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="VoucherKeyword" javaType="java.lang.String" jdbcType="VARCHAR"/>
+      </table>
+      <table tableName="Template" domainObjectName="Template">
+          <property name="useActualColumnNames" value="true"/>
+          <property name="ignoreQualifiersAtRuntime" value="true"/>
+          <columnOverride column="Name" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="Code" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="Path" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="ParentId" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="IsSystemType" javaType="Boolean"/>
+          <columnOverride column="IsActiveAssociation" javaType="Boolean"/>
+
+      </table>
+      <table tableName="TemplateFormula" domainObjectName="TemplateFormula">
+          <property name="useActualColumnNames" value="true"/>
+          <property name="ignoreQualifiersAtRuntime" value="true"/>
+          <columnOverride column="Formula" javaType="java.lang.String" jdbcType="VARCHAR"/>
+          <columnOverride column="IsManualChange" javaType="Boolean"/>
+          <columnOverride column="Instructions" javaType="java.lang.String" jdbcType="VARCHAR"/>
+      </table>
   </context>
 </generatorConfiguration>
\ No newline at end of file

atms-api/etc/generator/run.bat

 rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
 cd /d %~dp0
-call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite -verbose -tables Cache
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite -verbose -tables TemplateFormula
 echo @@@@@@@@@@@ DONE @@@@@@@@@@@
 pause

atms-api/src/main/java/pwc/taxtech/atms/constant/ActiveStatus.java

+package pwc.taxtech.atms.constant;
+
+public final class ActiveStatus {
+    public static final boolean Active = true;
+    public static final boolean Deactive = false;
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/Constant.java

+package pwc.taxtech.atms.constant;
+
+public final class Constant {
+    public static final String Comma = ",";
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/IsSystemType.java

+package pwc.taxtech.atms.constant;
+
+public final class IsSystemType {
+    public static final int YES =1;
+    public static final int No = 0;
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/StandAccountConstant.java

+package pwc.taxtech.atms.constant;
+
+public final class StandAccountConstant {
+    public static final short TWO=2;
+}

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

+package pwc.taxtech.atms.constant.enums;
+
+public enum CellDataSourceType {
+    /// <summary>
+    /// 公式（包含KeyValue）
+    /// </summary>
+    Formula (1),
+
+    /// <summary>
+    /// 凭证
+    /// </summary>
+    Voucher (2),
+
+    /// <summary>
+    /// 销项发票
+    /// </summary>
+    OutputInvoice (3),
+
+    /// <summary>
+    /// 进项发票
+    /// </summary>
+    InputInvoice (4),
+
+    /// <summary>
+    /// 海关发票
+    /// </summary>
+    CustomInvoice (5),
+
+    /// <summary>
+    /// 手工录入
+    /// </summary>
+    KeyIn (6),
+
+    /// <summary>
+    /// 关联模型
+    /// </summary>
+    RelatedModel (7),
+
+    /// <summary>
+    /// SAP日报
+    /// </summary>
+    SapDaily (8),
+
+    /// <summary>
+    /// 校验
+    /// </summary>
+    Validation (9);
+
+    private Integer code;
+
+    CellDataSourceType(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

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

+package pwc.taxtech.atms.constant.enums;
+
+public enum TemplateGroupType {
+
+    /// <summary>
+    /// 纳税申报表
+    /// </summary>
+    TaxReturn (1),
+
+    /// <summary>
+    /// 财务报表
+    /// </summary>
+    FinancialReturn(2);
+
+    private Integer code;
+
+    TemplateGroupType(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

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

+package pwc.taxtech.atms.controller;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.CellTemplateConfigDto;
+import pwc.taxtech.atms.service.CellTemplateService;
+
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "api/v1/celltemplate")
+public class CellTemplateController {
+    private static final Logger logger = LoggerFactory.getLogger(AccountController.class);
+    @Autowired
+    CellTemplateService cellTemplateService;
+
+    @RequestMapping(value = "configList/{templateID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    List<CellTemplateConfigDto> GetConfigList(@PathVariable String templateID) {
+        if(StringUtils.isEmpty(templateID)){
+            return Collections.emptyList();
+        }
+
+        try {
+            return cellTemplateService.GetCellConfigList(templateID);
+        } catch (Exception e) {
+            logger.error("GetCellConfigList",e);
+        }
+
+        return Collections.emptyList();
+    }
+}

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

@@ -4,11 +4,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import pwc.taxtech.atms.dto.ModelProfileDto;
 import pwc.taxtech.atms.service.ModelConfigurationService;
@@ -20,9 +16,9 @@ public class ModelConfigurationController {
 	@Autowired
 	ModelConfigurationService modelConfigurationService;
 
-	@RequestMapping(value = "/model/byIndustry", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public @ResponseBody List<ModelProfileDto> GetModelListByIndustry(@RequestParam String industryID,
-			@RequestParam String serviceTypeID) {
+	@RequestMapping(value = "/model/byIndustry/{serviceTypeID}/{industryID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public @ResponseBody List<ModelProfileDto> GetModelListByIndustry(@PathVariable String industryID,
+			@PathVariable String serviceTypeID) {
 		return modelConfigurationService.GetModelListByIndustry(serviceTypeID, industryID);
 	}
 }

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

@@ -3,6 +3,7 @@ package pwc.taxtech.atms.controller;
 import io.swagger.annotations.ApiOperation;
 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 pwc.taxtech.atms.dto.stdaccount.StandardAccountDto;
 import pwc.taxtech.atms.dto.stdaccount.StdAccountFancyTreeDto;
@@ -49,4 +50,20 @@ public class StdAccountController extends BaseController {
         }
         return Collections.emptyList();
     }
+
+    @ApiOperation(value = "根据行业查找科目")
+    @RequestMapping(value = "stdAccount/byIndustry/{industryID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    List<StandardAccountDto> GetStdAccountByIndustry(@PathVariable String industryID) {
+        if (StringUtils.isAnyBlank(industryID)) {
+            return Collections.emptyList();
+        }
+
+        try {
+            return stdAccountService.GetStdAccountByIndustry(industryID);
+        } catch (Exception e) {
+            logger.error("GetStdAccountByIndustry error.", e);
+        }
+        return  Collections.emptyList();
+    }
 }

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

+package pwc.taxtech.atms.controller;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.TemplateDto;
+import pwc.taxtech.atms.service.TemplateService;
+
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "api/v1/template")
+public class TemplateController {
+    private static final Logger logger = LoggerFactory.getLogger(AccountController.class);
+
+    @Autowired
+    TemplateService templateService;
+//todo:
+//[Route("getTemplateJson")]
+//    [HttpGet]
+//    public IHttpActionResult GetTemplateJson(string templateID)
+//    {
+//        return this.Ok(templateService.GetTemplateJson(templateID));
+//    }
+
+    @RequestMapping(value = "get", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    List<TemplateDto> get(@RequestParam String templateGroupID, @RequestParam Integer reportType) {
+        if (StringUtils.isEmpty(templateGroupID)) {
+            return Collections.emptyList();
+        }
+
+        try {
+            return templateService.get(templateGroupID, reportType);
+        } catch (Exception e) {
+            logger.error("GetCellConfigList", e);
+        }
+        return Collections.emptyList();
+    }
+}

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

 package pwc.taxtech.atms.controller;
 
-import java.util.List;
-
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.ApiOperation;
-import pwc.taxtech.atms.entitiy.TemplateGroup;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.TemplateGroupDto;
 import pwc.taxtech.atms.service.TemplateGroupService;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/v1/templateGroup/")
 public class TemplateGroupController {
-	private static final Logger logger = LoggerFactory.getLogger(TemplateGroupController.class);
+    private static final Logger logger = LoggerFactory.getLogger(TemplateGroupController.class);
+
+    @Autowired
+    TemplateGroupService templateGroupService;
+
+    @ApiOperation(value = "获取所有的模板分组")
+    @RequestMapping(value = "getall", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    List<TemplateGroupDto> Get() {
+        logger.debug("TemplateGroupController Get");
+        return templateGroupService.Get();
+    }
 
-	@Autowired
-	TemplateGroupService templateGroupService;
+    @ApiOperation(value = "根据服务类型和行业获取模板分组")
+    @RequestMapping(value = "getByIndustry/{serviceTypeID}/{industryID}",method=RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    List<TemplateGroupDto> getTemplateGroupByIndustry(@PathVariable int serviceTypeID, @RequestParam Integer taxPayType, @PathVariable String industryID) {
+        return templateGroupService.Get(serviceTypeID, taxPayType, industryID);
+    }
 
-	@ApiOperation(value = "")
-	@RequestMapping(value = "getall", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public @ResponseBody List<TemplateGroup> Get() {
-		logger.debug("TemplateGroupController Get");
-		return templateGroupService.Get();
-	}
 }

atms-api/src/main/java/pwc/taxtech/atms/dao/CellTemplateConfigMapper.java

+package pwc.taxtech.atms.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.MyMapper;
+import pwc.taxtech.atms.entitiy.CellTemplateConfig;
+import pwc.taxtech.atms.entitiy.CellTemplateConfigExample;
+
+@Mapper
+public interface CellTemplateConfigMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    long countByExample(CellTemplateConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CellTemplateConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int insert(CellTemplateConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CellTemplateConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    List<CellTemplateConfig> selectByExampleWithRowbounds(CellTemplateConfigExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    List<CellTemplateConfig> selectByExample(CellTemplateConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    CellTemplateConfig selectByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CellTemplateConfig record, @Param("example") CellTemplateConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CellTemplateConfig record, @Param("example") CellTemplateConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CellTemplateConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplateConfig
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CellTemplateConfig record);
+
+    List<CellTemplateConfig> getCellTemplateConfigByTemplateID(@Param("templateID") String templateID);
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/CellTemplateMapper.java

+package pwc.taxtech.atms.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.MyMapper;
+import pwc.taxtech.atms.entitiy.CellTemplate;
+import pwc.taxtech.atms.entitiy.CellTemplateExample;
+
+@Mapper
+public interface CellTemplateMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    long countByExample(CellTemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CellTemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int insert(CellTemplate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CellTemplate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    List<CellTemplate> selectByExampleWithRowbounds(CellTemplateExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    List<CellTemplate> selectByExample(CellTemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    CellTemplate selectByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CellTemplate record, @Param("example") CellTemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CellTemplate record, @Param("example") CellTemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CellTemplate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table CellTemplate
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CellTemplate record);
+
+
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TemplateFormulaMapper.java

+package pwc.taxtech.atms.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.MyMapper;
+import pwc.taxtech.atms.entitiy.TemplateFormula;
+import pwc.taxtech.atms.entitiy.TemplateFormulaExample;
+
+@Mapper
+public interface TemplateFormulaMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    long countByExample(TemplateFormulaExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(TemplateFormulaExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int insert(TemplateFormula record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int insertSelective(TemplateFormula record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    List<TemplateFormula> selectByExampleWithRowbounds(TemplateFormulaExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    List<TemplateFormula> selectByExample(TemplateFormulaExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    TemplateFormula selectByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") TemplateFormula record, @Param("example") TemplateFormulaExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") TemplateFormula record, @Param("example") TemplateFormulaExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(TemplateFormula record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateFormula
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(TemplateFormula record);
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TemplateMapper.java

+package pwc.taxtech.atms.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.MyMapper;
+import pwc.taxtech.atms.entitiy.Template;
+import pwc.taxtech.atms.entitiy.TemplateExample;
+
+@Mapper
+public interface TemplateMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    long countByExample(TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int insert(Template record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Template record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    List<Template> selectByExampleWithRowbounds(TemplateExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    List<Template> selectByExample(TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    Template selectByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Template record, @Param("example") TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Template record, @Param("example") TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Template record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table Template
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Template record);
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dto/CellTemplateConfigDto.java

+package pwc.taxtech.atms.dto;
+
+import java.util.List;
+
+public class CellTemplateConfigDto {
+
+    private String CellTemplateID;
+    private String TemplateID;
+    private int RowIndex;
+    private String RowName;
+    private int ColumnIndex;
+    private String ColumnName;
+    private Integer DataType;
+    private Integer IsReadOnly;
+    private boolean HasFormula;
+    private String Formula;
+    private String ParsedFormula;
+    private String FormulaDescription;
+    private boolean HasVoucher;
+    private List<String> AccountCodes;
+    private boolean HasInvoice;
+    private Integer InvoiceType;
+    private List<String> TaxRate;
+    private boolean HasKeyIn;
+    private String Creator;
+    private String Updater;
+    private Integer InvoiceAmountType;
+    private boolean HasModel;
+    private List<String> ModelIDs;
+    private List<Integer> InvoiceCategory;
+    private String FormulaDataSource;
+    private boolean HasValidation;
+    private String Validation;
+    private String ParsedValidation;
+    private String ValidationDescription;
+    private String VoucherKeyword;
+
+    public String getCellTemplateID() {
+        return CellTemplateID;
+    }
+
+    public void setCellTemplateID(String cellTemplateID) {
+        CellTemplateID = cellTemplateID;
+    }
+
+    public String getTemplateID() {
+        return TemplateID;
+    }
+
+    public void setTemplateID(String templateID) {
+        TemplateID = templateID;
+    }
+
+    public int getRowIndex() {
+        return RowIndex;
+    }
+
+    public void setRowIndex(int rowIndex) {
+        RowIndex = rowIndex;
+    }
+
+    public String getRowName() {
+        return RowName;
+    }
+
+    public void setRowName(String rowName) {
+        RowName = rowName;
+    }
+
+    public int getColumnIndex() {
+        return ColumnIndex;
+    }
+
+    public void setColumnIndex(int columnIndex) {
+        ColumnIndex = columnIndex;
+    }
+
+    public String getColumnName() {
+        return ColumnName;
+    }
+
+    public void setColumnName(String columnName) {
+        ColumnName = columnName;
+    }
+
+    public Integer getDataType() {
+        return DataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        DataType = dataType;
+    }
+
+    public Integer getIsReadOnly() {
+        return IsReadOnly;
+    }
+
+    public void setIsReadOnly(Integer isReadOnly) {
+        IsReadOnly = isReadOnly;
+    }
+
+    public boolean isHasFormula() {
+        return HasFormula;
+    }
+
+    public void setHasFormula(boolean hasFormula) {
+        HasFormula = hasFormula;
+    }
+
+    public String getFormula() {
+        return Formula;
+    }
+
+    public void setFormula(String formula) {
+        Formula = formula;
+    }
+
+    public String getParsedFormula() {
+        return ParsedFormula;
+    }
+
+    public void setParsedFormula(String parsedFormula) {
+        ParsedFormula = parsedFormula;
+    }
+
+    public String getFormulaDescription() {
+        return FormulaDescription;
+    }
+
+    public void setFormulaDescription(String formulaDescription) {
+        FormulaDescription = formulaDescription;
+    }
+
+    public boolean isHasVoucher() {
+        return HasVoucher;
+    }
+
+    public void setHasVoucher(boolean hasVoucher) {
+        HasVoucher = hasVoucher;
+    }
+
+    public List<String> getAccountCodes() {
+        return AccountCodes;
+    }
+
+    public void setAccountCodes(List<String> accountCodes) {
+        AccountCodes = accountCodes;
+    }
+
+    public boolean isHasInvoice() {
+        return HasInvoice;
+    }
+
+    public void setHasInvoice(boolean hasInvoice) {
+        HasInvoice = hasInvoice;
+    }
+
+    public Integer getInvoiceType() {
+        return InvoiceType;
+    }
+
+    public void setInvoiceType(Integer invoiceType) {
+        InvoiceType = invoiceType;
+    }
+
+    public List<String> getTaxRate() {
+        return TaxRate;
+    }
+
+    public void setTaxRate(List<String> taxRate) {
+        TaxRate = taxRate;
+    }
+
+    public boolean isHasKeyIn() {
+        return HasKeyIn;
+    }
+
+    public void setHasKeyIn(boolean hasKeyIn) {
+        HasKeyIn = hasKeyIn;
+    }
+
+    public String getCreator() {
+        return Creator;
+    }
+
+    public void setCreator(String creator) {
+        Creator = creator;
+    }
+
+    public String getUpdater() {
+        return Updater;
+    }
+
+    public void setUpdater(String updater) {
+        Updater = updater;
+    }
+
+    public Integer getInvoiceAmountType() {
+        return InvoiceAmountType;
+    }
+
+    public void setInvoiceAmountType(Integer invoiceAmountType) {
+        InvoiceAmountType = invoiceAmountType;
+    }
+
+    public boolean isHasModel() {
+        return HasModel;
+    }
+
+    public void setHasModel(boolean hasModel) {
+        HasModel = hasModel;
+    }
+
+    public List<String> getModelIDs() {
+        return ModelIDs;
+    }
+
+    public void setModelIDs(List<String> modelIDs) {
+        ModelIDs = modelIDs;
+    }
+
+    public List<Integer> getInvoiceCategory() {
+        return InvoiceCategory;
+    }
+
+    public void setInvoiceCategory(List<Integer> invoiceCategory) {
+        InvoiceCategory = invoiceCategory;
+    }
+
+    public String getFormulaDataSource() {
+        return FormulaDataSource;
+    }
+
+    public void setFormulaDataSource(String formulaDataSource) {
+        FormulaDataSource = formulaDataSource;
+    }
+
+    public boolean isHasValidation() {
+        return HasValidation;
+    }
+
+    public void setHasValidation(boolean hasValidation) {
+        HasValidation = hasValidation;
+    }
+
+    public String getValidation() {
+        return Validation;
+    }
+
+    public void setValidation(String validation) {
+        Validation = validation;
+    }
+
+    public String getParsedValidation() {
+        return ParsedValidation;
+    }
+
+    public void setParsedValidation(String parsedValidation) {
+        ParsedValidation = parsedValidation;
+    }
+
+    public String getValidationDescription() {
+        return ValidationDescription;
+    }
+
+    public void setValidationDescription(String validationDescription) {
+        ValidationDescription = validationDescription;
+    }
+
+    public String getVoucherKeyword() {
+        return VoucherKeyword;
+    }
+
+    public void setVoucherKeyword(String voucherKeyword) {
+        VoucherKeyword = voucherKeyword;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/CellTemplateDto.java

+package pwc.taxtech.atms.dto;
+
+public class CellTemplateDto {
+    private String ID;
+    private String reportTemplateID;
+    private int rowIndex;
+    private String rowName;
+    private int columnIndex;
+    private String columnName;
+    private String comment;
+    private String copyFromID;
+    private Integer dataType;
+    private Integer isReadOnly;
+
+    /**
+     * 单元格的值（从Excel导入的单元格数据)
+     */
+    private String CellValue;
+
+    public CellTemplateDto() {
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
+    public String getReportTemplateID() {
+        return reportTemplateID;
+    }
+
+    public void setReportTemplateID(String reportTemplateID) {
+        this.reportTemplateID = reportTemplateID;
+    }
+
+    public int getRowIndex() {
+        return rowIndex;
+    }
+
+    public void setRowIndex(int rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public String getRowName() {
+        return rowName;
+    }
+
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    public int getColumnIndex() {
+        return columnIndex;
+    }
+
+    public void setColumnIndex(int columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getCopyFromID() {
+        return copyFromID;
+    }
+
+    public void setCopyFromID(String copyFromID) {
+        this.copyFromID = copyFromID;
+    }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+
+    public Integer getIsReadOnly() {
+        return isReadOnly;
+    }
+
+    public void setIsReadOnly(Integer isReadOnly) {
+        this.isReadOnly = isReadOnly;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateDto.java

+package pwc.taxtech.atms.dto;
+
+import java.util.Date;
+import java.util.List;
+
+public final class TemplateDto {
+    private String ID;
+    private String name;
+    private String path;
+    private Integer reportType;
+    private String templateGroupID;
+    private Date createTime;
+    private Date updateTime;
+    private String parentID;
+    private String templateName;
+
+    private int orderIndex;
+
+    private String code;
+
+    private boolean isSystemType;
+
+    private boolean isActiveAssociation;
+
+    /**
+     * 单元格的配置信息
+     */
+    private List<CellTemplateDto> cellTemplateDtos;
+
+    /**
+     * validate msg
+     */
+    private String validateMsg;
+
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public Integer getReportType() {
+        return reportType;
+    }
+
+    public void setReportType(Integer reportType) {
+        this.reportType = reportType;
+    }
+
+    public String getTemplateGroupID() {
+        return templateGroupID;
+    }
+
+    public void setTemplateGroupID(String templateGroupID) {
+        this.templateGroupID = templateGroupID;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getParentID() {
+        return parentID;
+    }
+
+    public void setParentID(String parentID) {
+        this.parentID = parentID;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public int getOrderIndex() {
+        return orderIndex;
+    }
+
+    public void setOrderIndex(int orderIndex) {
+        this.orderIndex = orderIndex;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public boolean isSystemType() {
+        return isSystemType;
+    }
+
+    public void setSystemType(boolean systemType) {
+        isSystemType = systemType;
+    }
+
+    public boolean isActiveAssociation() {
+        return isActiveAssociation;
+    }
+
+    public void setActiveAssociation(boolean activeAssociation) {
+        isActiveAssociation = activeAssociation;
+    }
+
+    public List<CellTemplateDto> getCellTemplateDtos() {
+        return cellTemplateDtos;
+    }
+
+    public void setCellTemplateDtos(List<CellTemplateDto> cellTemplateDtos) {
+        this.cellTemplateDtos = cellTemplateDtos;
+    }
+
+    public String getValidateMsg() {
+        return validateMsg;
+    }
+
+    public void setValidateMsg(String validateMsg) {
+        this.validateMsg = validateMsg;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateGroupDto.java

@@ -91,11 +91,11 @@ public class TemplateGroupDto {
         this.groupType = groupType;
     }
 
-    public Boolean isSystemType() {
+    public Boolean getIsSystemType() {
         return isSystemType;
     }
 
-    public void setSystemType(Boolean isSystemType) {
+    public void setIsSystemType(Boolean isSystemType) {
         this.isSystemType = isSystemType;
     }
 

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

+package pwc.taxtech.atms.service;
+
+import pwc.taxtech.atms.dto.CellTemplateConfigDto;
+
+import java.util.List;
+
+public interface CellTemplateService {
+    List<CellTemplateConfigDto> GetCellConfigList(String templateID);
+}

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

@@ -10,4 +10,6 @@ public interface StdAccountService {
     List<StdAccountFancyTreeDto> getStdAccountHierarchy(String orgId) throws ServiceException;
 
     List<StandardAccountDto> GetStdAccountLinkEtsAccount(String orgID, String accountSetID);
+
+    List<StandardAccountDto> GetStdAccountByIndustry(String industryID);
 }

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

 package pwc.taxtech.atms.service;
 
-import java.util.List;
+import pwc.taxtech.atms.dto.TemplateGroupDto;
 
-import pwc.taxtech.atms.entitiy.TemplateGroup;
+import java.util.List;
 
 public interface TemplateGroupService {
-	List<TemplateGroup> Get();
+	List<TemplateGroupDto> Get();
+
+	List<TemplateGroupDto> Get(int serviceTypeID, Integer taxPayType, String industryID);
 }