Merge branch 'dev_frank' into 'dev'

add new method for report configuration

See merge request root/atms!4

atms-api/etc/generator/generatorConfig.xml

@@ -352,5 +352,23 @@
 			<property name="useActualColumnNames" value="true" />
 			<property name="ignoreQualifiersAtRuntime" value="true" />
 		</table>
+		<table tableName="Model" domainObjectName="Model">
+			<property name="useActualColumnNames" value="true" />
+			<property name="ignoreQualifiersAtRuntime" value="true" />
+			<columnOverride column="Description" javaType="java.lang.String"
+				jdbcType="VARCHAR" />
+		</table>
+		<table tableName="ModelCategory" domainObjectName="ModelCategory">
+			<property name="useActualColumnNames" value="true" />
+			<property name="ignoreQualifiersAtRuntime" value="true" />
+		</table>
+		<table tableName="ModelConfig" domainObjectName="ModelConfig">
+			<property name="useActualColumnNames" value="true" />
+			<property name="ignoreQualifiersAtRuntime" value="true" />
+		</table>
+		<table tableName="ModelServiceConfig" domainObjectName="ModelServiceConfig">
+			<property name="useActualColumnNames" value="true" />
+			<property name="ignoreQualifiersAtRuntime" value="true" />
+		</table>
 	</context>
 </generatorConfiguration>
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/common/EnumHelper.java

+package pwc.taxtech.atms.common;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class EnumHelper {
+	private static Map<Class, List<IdKeyNameData>> enumMap;
+
+	static {
+		enumMap = new HashMap<Class, List<IdKeyNameData>>();
+	}
+
+	public static List<IdKeyNameData> ToIdkeyNameCollection(Class enumType) {
+		if (!enumMap.containsKey(enumType)) {
+			synchronized (enumMap) {
+				if (!enumMap.containsKey(enumType)) {
+					enumMap.put(enumType, EnumToIdKeyNameCollection(enumType));
+				}
+			}
+		}
+		return enumMap.get(enumType);
+	}
+
+	private static List<IdKeyNameData> EnumToIdKeyNameCollection(Class enumType) {
+
+		List<IdKeyNameData> enumKeyNames = new ArrayList<IdKeyNameData>();
+		try {
+			Method toName = enumType.getMethod("toName");
+			Method toCode = enumType.getMethod("toCode");
+			Method toDisplayName = enumType.getMethod("toDisplayName");
+			// 得到enum的所有实例
+			Object[] objs = enumType.getEnumConstants();
+			for (Object obj : objs) {
+				IdKeyNameData newData = new IdKeyNameData();
+				newData.setID((Integer) toCode.invoke(obj));
+				newData.setKey((String) toName.invoke(obj));
+				newData.setName((String) toDisplayName.invoke(obj));
+				enumKeyNames.add(newData);
+			}
+			return enumKeyNames;
+		} catch (NoSuchMethodException e) {
+			e.printStackTrace();
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+		}
+		return enumKeyNames;
+	}
+}

atms-api/src/main/java/pwc/taxtech/atms/common/IdKeyNameData.java

+package pwc.taxtech.atms.common;
+
+public class IdKeyNameData {
+    private String key;
+
+    private Object ID ;
+
+    private String name;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Object getID() {
+		return ID;
+	}
+
+	public void setID(Object ID) {
+		this.ID = ID;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+    
+    
+}

atms-api/src/main/java/pwc/taxtech/atms/common/ModelTypeEnum.java

+package pwc.taxtech.atms.common;
+
+public enum ModelTypeEnum {
+	
+	SystemCommon(1,"SystemCommon","系统公共模型"),
+	OrganizationCommon(2,"OrganizationCommon","机构公共模型"),
+	OrganizationCustomize(3,"OrganizationCustomize","机构自定义模型");
+	
+    private Integer code; 
+    private String name; 
+    private String displayName;
+    
+    ModelTypeEnum(Integer code,String name,String displayName){ 
+        this.code= code; 
+        this.name= name; 
+        this.displayName = displayName;
+   } 
+    
+    public String toName() { 
+        return this.name == null ? this.name() : this.name; 
+    } 
+    public Integer toCode() { 
+        return this.code == null ? this.ordinal() : this.code; 
+    }
+    
+    public String toDisplayName() {
+        return this.displayName == null ? this.name() : this.displayName; 
+    }
+}

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

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

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

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

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

+package pwc.taxtech.atms.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class EntriesCheckDetailDto {
+	private String ID;
+	private String modelID;
+	private int guideLine;
+	private String acctJudge;
+	private String standardCode;
+	private Integer acctDirection;
+	private String entriesComparison;
+	private BigDecimal thresholdValue;
+	private String summary;
+	private int isRelevantAmt;
+	private Date CreateTime;
+	private Date UpdateTime;
+	private int indexShow;
+	private boolean isRelevantAmtShow;
+	private String summaryShow;
+	private String stdCodeAndName;
+
+	public String getID() {
+		return ID;
+	}
+
+	public void setID(String ID) {
+		this.ID = ID;
+	}
+
+	public String getModelID() {
+		return modelID;
+	}
+
+	public void setModelID(String modelID) {
+		this.modelID = modelID;
+	}
+
+	public int getGuideLine() {
+		return guideLine;
+	}
+
+	public void setGuideLine(int guideLine) {
+		this.guideLine = guideLine;
+	}
+
+	public String getAcctJudge() {
+		return acctJudge;
+	}
+
+	public void setAcctJudge(String acctJudge) {
+		this.acctJudge = acctJudge;
+	}
+
+	public String getStandardCode() {
+		return standardCode;
+	}
+
+	public void setStandardCode(String standardCode) {
+		this.standardCode = standardCode;
+	}
+
+	public Integer getAcctDirection() {
+		return acctDirection;
+	}
+
+	public void setAcctDirection(Integer acctDirection) {
+		this.acctDirection = acctDirection;
+	}
+
+	public String getEntriesComparison() {
+		return entriesComparison;
+	}
+
+	public void setEntriesComparison(String entriesComparison) {
+		this.entriesComparison = entriesComparison;
+	}
+
+	public BigDecimal getThresholdValue() {
+		return thresholdValue;
+	}
+
+	public void setThresholdValue(BigDecimal thresholdValue) {
+		this.thresholdValue = thresholdValue;
+	}
+
+	public String getSummary() {
+		return summary;
+	}
+
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+
+	public int getIsRelevantAmt() {
+		return isRelevantAmt;
+	}
+
+	public void setIsRelevantAmt(int isRelevantAmt) {
+		this.isRelevantAmt = isRelevantAmt;
+	}
+
+	public Date getCreateTime() {
+		return CreateTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		CreateTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return UpdateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		UpdateTime = updateTime;
+	}
+
+	public int getIndexShow() {
+		return indexShow;
+	}
+
+	public void setIndexShow(int indexShow) {
+		this.indexShow = indexShow;
+	}
+
+	public boolean isRelevantAmtShow() {
+		return isRelevantAmtShow;
+	}
+
+	public void setRelevantAmtShow(boolean isRelevantAmtShow) {
+		this.isRelevantAmtShow = isRelevantAmtShow;
+	}
+
+	public String getSummaryShow() {
+		return summaryShow;
+	}
+
+	public void setSummaryShow(String summaryShow) {
+		this.summaryShow = summaryShow;
+	}
+
+	public String getStdCodeAndName() {
+		return stdCodeAndName;
+	}
+
+	public void setStdCodeAndName(String stdCodeAndName) {
+		this.stdCodeAndName = stdCodeAndName;
+	}
+}

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

+package pwc.taxtech.atms.dto;
+
+import java.util.Date;
+
+public class IndexAnalysisDetailDto {
+	private String ID;
+	private String modelID;
+	private String indexName;
+	private String indexFormula;
+	private int sequence;
+	private int displayType;
+	private int isVisible;
+	private int isMainValue;
+	private int isYearValue;
+	private Date createTime;
+	private Date updateTime;
+
+	private boolean isVisibleShow;
+	private boolean isMainValueShow;
+	private boolean isYearValueShow;
+	private String formulaNamae;
+	private String formulaDescribe;
+	public String getID() {
+		return ID;
+	}
+	public void setID(String ID) {
+		this.ID = ID;
+	}
+	public String getModelID() {
+		return modelID;
+	}
+	public void setModelID(String modelID) {
+		this.modelID = modelID;
+	}
+	public String getIndexName() {
+		return indexName;
+	}
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+	public String getIndexFormula() {
+		return indexFormula;
+	}
+	public void setIndexFormula(String indexFormula) {
+		this.indexFormula = indexFormula;
+	}
+	public int getSequence() {
+		return sequence;
+	}
+	public void setSequence(int sequence) {
+		this.sequence = sequence;
+	}
+	public int getDisplayType() {
+		return displayType;
+	}
+	public void setDisplayType(int displayType) {
+		this.displayType = displayType;
+	}
+	public int getIsVisible() {
+		return isVisible;
+	}
+	public void setIsVisible(int isVisible) {
+		this.isVisible = isVisible;
+	}
+	public int getIsMainValue() {
+		return isMainValue;
+	}
+	public void setIsMainValue(int isMainValue) {
+		this.isMainValue = isMainValue;
+	}
+	public int getIsYearValue() {
+		return isYearValue;
+	}
+	public void setIsYearValue(int isYearValue) {
+		this.isYearValue = isYearValue;
+	}
+	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 boolean isVisibleShow() {
+		return isVisibleShow;
+	}
+	public void setVisibleShow(boolean isVisibleShow) {
+		this.isVisibleShow = isVisibleShow;
+	}
+	public boolean isMainValueShow() {
+		return isMainValueShow;
+	}
+	public void setMainValueShow(boolean isMainValueShow) {
+		this.isMainValueShow = isMainValueShow;
+	}
+	public boolean isYearValueShow() {
+		return isYearValueShow;
+	}
+	public void setYearValueShow(boolean isYearValueShow) {
+		this.isYearValueShow = isYearValueShow;
+	}
+	public String getFormulaNamae() {
+		return formulaNamae;
+	}
+	public void setFormulaNamae(String formulaNamae) {
+		this.formulaNamae = formulaNamae;
+	}
+	public String getFormulaDescribe() {
+		return formulaDescribe;
+	}
+	public void setFormulaDescribe(String formulaDescribe) {
+		this.formulaDescribe = formulaDescribe;
+	}
+}

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

+package pwc.taxtech.atms.dto;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import pwc.taxtech.atms.common.EnumHelper;
+import pwc.taxtech.atms.common.IdKeyNameData;
+import pwc.taxtech.atms.common.ModelTypeEnum;
+
+public class ModelProfileDto {
+	private String ID;
+
+	private int ruleType;
+
+	private String code;
+
+	private String name;
+
+	private int type;
+
+	private String modelTypeName;
+
+	private int isStatus;
+
+	private String description;
+
+	private int feature;
+
+	private int isFilter;
+
+	private String monthJudge;
+
+	private String yearJudge;
+
+	private String yearExplain;
+
+	private Date createTime;
+
+	private Date upDateTime;
+
+	private String industryID;
+
+	private String industryName;
+
+	private String organizationName;
+
+	private String serviceTypeID;
+
+	private String serviceTypeName;
+
+	private String categoryID;
+
+	private String categoryString;
+
+	private boolean isFilterShow;
+
+	private String orgID;
+
+	private List<IndexAnalysisDetailDto> indexAnalysisDetaileList;
+
+	private List<EntriesCheckDetailDto> entriesCheckDetailList;
+
+	public String getID() {
+		return ID;
+	}
+
+	public void setID(String ID) {
+		this.ID = ID;
+	}
+
+	public int getRuleType() {
+		return ruleType;
+	}
+
+	public void setRuleType(int ruleType) {
+		this.ruleType = ruleType;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	public String getModelTypeName() {
+
+		List<IdKeyNameData> typeNames = EnumHelper.ToIdkeyNameCollection(ModelTypeEnum.class);
+		Optional<IdKeyNameData> typeName = typeNames.stream().filter(a -> (int) a.getID() == this.getType())
+				.findFirst();
+		if (typeName != null) {
+			this.setModelTypeName(typeName.get().getName());
+		} else {
+			this.setModelTypeName("");
+		}
+		return modelTypeName;
+	}
+
+	public void setModelTypeName(String modelTypeName) {
+		this.modelTypeName = modelTypeName;
+	}
+
+	public int getIsStatus() {
+		return isStatus;
+	}
+
+	public void setIsStatus(int isStatus) {
+		this.isStatus = isStatus;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public int getFeature() {
+		return feature;
+	}
+
+	public void setFeature(int feature) {
+		this.feature = feature;
+	}
+
+	public int getIsFilter() {
+		return isFilter;
+	}
+
+	public void setIsFilter(int isFilter) {
+		this.isFilter = isFilter;
+	}
+
+	public String getMonthJudge() {
+		return monthJudge;
+	}
+
+	public void setMonthJudge(String monthJudge) {
+		this.monthJudge = monthJudge;
+	}
+
+	public String getYearJudge() {
+		return yearJudge;
+	}
+
+	public void setYearJudge(String yearJudge) {
+		this.yearJudge = yearJudge;
+	}
+
+	public String getYearExplain() {
+		return yearExplain;
+	}
+
+	public void setYearExplain(String yearExplain) {
+		this.yearExplain = yearExplain;
+	}
+
+	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 getIndustryID() {
+		return industryID;
+	}
+
+	public void setIndustryID(String industryID) {
+		this.industryID = industryID;
+	}
+
+	public String getIndustryName() {
+		return industryName;
+	}
+
+	public void setIndustryName(String industryName) {
+		this.industryName = industryName;
+	}
+
+	public String getOrganizationName() {
+		return organizationName;
+	}
+
+	public void setOrganizationName(String organizationName) {
+		this.organizationName = organizationName;
+	}
+
+	public String getServiceTypeID() {
+		return serviceTypeID;
+	}
+
+	public void setServiceTypeID(String serviceTypeID) {
+		this.serviceTypeID = serviceTypeID;
+	}
+
+	public String getServiceTypeName() {
+		return serviceTypeName;
+	}
+
+	public void setServiceTypeName(String serviceTypeName) {
+		this.serviceTypeName = serviceTypeName;
+	}
+
+	public String getCategoryID() {
+		return categoryID;
+	}
+
+	public void setCategoryID(String categoryID) {
+		this.categoryID = categoryID;
+	}
+
+	public String getCategoryString() {
+		return categoryString;
+	}
+
+	public void setCategoryString(String categoryString) {
+		this.categoryString = categoryString;
+	}
+
+	public boolean isFilterShow() {
+		return isFilterShow;
+	}
+
+	public void setFilterShow(boolean isFilterShow) {
+		this.isFilterShow = isFilterShow;
+	}
+
+	public String getOrgID() {
+		return orgID;
+	}
+
+	public void setOrgID(String orgID) {
+		this.orgID = orgID;
+	}
+
+	public List<IndexAnalysisDetailDto> getIndexAnalysisDetaileList() {
+		return indexAnalysisDetaileList;
+	}
+
+	public void setIndexAnalysisDetaileList(List<IndexAnalysisDetailDto> indexAnalysisDetaileList) {
+		this.indexAnalysisDetaileList = indexAnalysisDetaileList;
+	}
+
+	public List<EntriesCheckDetailDto> getEntriesCheckDetailList() {
+		return entriesCheckDetailList;
+	}
+
+	public void setEntriesCheckDetailList(List<EntriesCheckDetailDto> entriesCheckDetailList) {
+		this.entriesCheckDetailList = entriesCheckDetailList;
+	}
+
+}

atms-api/src/main/java/pwc/taxtech/atms/entitiy/ModelConfig.java

+package pwc.taxtech.atms.entitiy;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table ModelConfig
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class ModelConfig implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelConfig.ID
+     *
+     * @mbg.generated
+     */
+    private String ID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelConfig.CategoryID
+     *
+     * @mbg.generated
+     */
+    private String categoryID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelConfig.ModelID
+     *
+     * @mbg.generated
+     */
+    private String modelID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelConfig.CreateTime
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelConfig.UpdateTime
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ModelConfig
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelConfig.ID
+     *
+     * @return the value of ModelConfig.ID
+     *
+     * @mbg.generated
+     */
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelConfig.ID
+     *
+     * @param ID the value for ModelConfig.ID
+     *
+     * @mbg.generated
+     */
+    public void setID(String ID) {
+        this.ID = ID == null ? null : ID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelConfig.CategoryID
+     *
+     * @return the value of ModelConfig.CategoryID
+     *
+     * @mbg.generated
+     */
+    public String getCategoryID() {
+        return categoryID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelConfig.CategoryID
+     *
+     * @param categoryID the value for ModelConfig.CategoryID
+     *
+     * @mbg.generated
+     */
+    public void setCategoryID(String categoryID) {
+        this.categoryID = categoryID == null ? null : categoryID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelConfig.ModelID
+     *
+     * @return the value of ModelConfig.ModelID
+     *
+     * @mbg.generated
+     */
+    public String getModelID() {
+        return modelID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelConfig.ModelID
+     *
+     * @param modelID the value for ModelConfig.ModelID
+     *
+     * @mbg.generated
+     */
+    public void setModelID(String modelID) {
+        this.modelID = modelID == null ? null : modelID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelConfig.CreateTime
+     *
+     * @return the value of ModelConfig.CreateTime
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelConfig.CreateTime
+     *
+     * @param createTime the value for ModelConfig.CreateTime
+     *
+     * @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 ModelConfig.UpdateTime
+     *
+     * @return the value of ModelConfig.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelConfig.UpdateTime
+     *
+     * @param updateTime the value for ModelConfig.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ModelConfig
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", ID=").append(ID);
+        sb.append(", categoryID=").append(categoryID);
+        sb.append(", modelID=").append(modelID);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/entitiy/ModelServiceConfig.java

+package pwc.taxtech.atms.entitiy;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table ModelServiceConfig
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class ModelServiceConfig implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelServiceConfig.ID
+     *
+     * @mbg.generated
+     */
+    private String ID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelServiceConfig.ModelID
+     *
+     * @mbg.generated
+     */
+    private String modelID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelServiceConfig.ServiceTypeID
+     *
+     * @mbg.generated
+     */
+    private String serviceTypeID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelServiceConfig.CreateTime
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ModelServiceConfig.UpdateTime
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ModelServiceConfig
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelServiceConfig.ID
+     *
+     * @return the value of ModelServiceConfig.ID
+     *
+     * @mbg.generated
+     */
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelServiceConfig.ID
+     *
+     * @param ID the value for ModelServiceConfig.ID
+     *
+     * @mbg.generated
+     */
+    public void setID(String ID) {
+        this.ID = ID == null ? null : ID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelServiceConfig.ModelID
+     *
+     * @return the value of ModelServiceConfig.ModelID
+     *
+     * @mbg.generated
+     */
+    public String getModelID() {
+        return modelID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelServiceConfig.ModelID
+     *
+     * @param modelID the value for ModelServiceConfig.ModelID
+     *
+     * @mbg.generated
+     */
+    public void setModelID(String modelID) {
+        this.modelID = modelID == null ? null : modelID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelServiceConfig.ServiceTypeID
+     *
+     * @return the value of ModelServiceConfig.ServiceTypeID
+     *
+     * @mbg.generated
+     */
+    public String getServiceTypeID() {
+        return serviceTypeID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelServiceConfig.ServiceTypeID
+     *
+     * @param serviceTypeID the value for ModelServiceConfig.ServiceTypeID
+     *
+     * @mbg.generated
+     */
+    public void setServiceTypeID(String serviceTypeID) {
+        this.serviceTypeID = serviceTypeID == null ? null : serviceTypeID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ModelServiceConfig.CreateTime
+     *
+     * @return the value of ModelServiceConfig.CreateTime
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelServiceConfig.CreateTime
+     *
+     * @param createTime the value for ModelServiceConfig.CreateTime
+     *
+     * @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 ModelServiceConfig.UpdateTime
+     *
+     * @return the value of ModelServiceConfig.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ModelServiceConfig.UpdateTime
+     *
+     * @param updateTime the value for ModelServiceConfig.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ModelServiceConfig
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", ID=").append(ID);
+        sb.append(", modelID=").append(modelID);
+        sb.append(", serviceTypeID=").append(serviceTypeID);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file