[bugfix] fixed dto used in xml not the same dop in mapper

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

-package pwc.taxtech.atms.dto;
-
-public class OrganizationServiceTemplateGroupDto {
-
-    private String ID;
-    private String organizationID;
-    private String serviceTypeID;
-    private String serviceTypeName;
-    private Long templateGroupID;
-    private String templateGroupName;
-    /**
-     * @return the iD
-     */
-    public String getID() {
-        return ID;
-    }
-    /**
-     * @param iD the iD to set
-     */
-    public void setID(String iD) {
-        ID = iD;
-    }
-    /**
-     * @return the organizationID
-     */
-    public String getOrganizationID() {
-        return organizationID;
-    }
-    /**
-     * @param organizationID the organizationID to set
-     */
-    public void setOrganizationID(String organizationID) {
-        this.organizationID = organizationID;
-    }
-    /**
-     * @return the serviceTypeID
-     */
-    public String getServiceTypeID() {
-        return serviceTypeID;
-    }
-    /**
-     * @param serviceTypeID the serviceTypeID to set
-     */
-    public void setServiceTypeID(String serviceTypeID) {
-        this.serviceTypeID = serviceTypeID;
-    }
-    /**
-     * @return the serviceTypeName
-     */
-    public String getServiceTypeName() {
-        return serviceTypeName;
-    }
-    /**
-     * @param serviceTypeName the serviceTypeName to set
-     */
-    public void setServiceTypeName(String serviceTypeName) {
-        this.serviceTypeName = serviceTypeName;
-    }
-    /**
-     * @return the templateGroupID
-     */
-    public Long getTemplateGroupID() {
-        return templateGroupID;
-    }
-    /**
-     * @param templateGroupID the templateGroupID to set
-     */
-    public void setTemplateGroupID(Long templateGroupID) {
-        this.templateGroupID = templateGroupID;
-    }
-    /**
-     * @return the templateGroupName
-     */
-    public String getTemplateGroupName() {
-        return templateGroupName;
-    }
-    /**
-     * @param templateGroupName the templateGroupName to set
-     */
-    public void setTemplateGroupName(String templateGroupName) {
-        this.templateGroupName = templateGroupName;
-    }
-    
-    
-}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/PeriodCellTemplateConfigExtendDto.java

-package pwc.taxtech.atms.dto.vatdto;
-
-import lombok.Getter;
-import lombok.Setter;
-import pwc.taxtech.atms.common.CommonUtils;
-import pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig;
-
-@Setter
-@Getter
-public class PeriodCellTemplateConfigExtendDto extends PeriodCellTemplateConfig {
-    Integer columnIndex;
-    Integer rowIndex;
-    String columnName;
-    String rowName;
-    Integer dataType;
-    Boolean isReadOnly;
-    Long cellTemplateID;
-    Long reportTemplateID;
-    String comment;
-    PeriodCellTemplateConfig periodCellTemplateConfig;
-
-    public PeriodCellTemplateConfig getPeriodCellTemplateConfig() {
-        periodCellTemplateConfig = new PeriodCellTemplateConfig();
-        CommonUtils.copyProperties(this, periodCellTemplateConfig);
-        return periodCellTemplateConfig;
-    }
-}

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationServiceTemplateGroupExtendsMapper.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.OrganizationServiceTemplateGroupMapper">
-    <resultMap id="OrganizationServiceTemplateGroupDto" type="pwc.taxtech.atms.dto.OrganizationServiceTemplateGroupDto">
+    <resultMap id="OrganizationServiceTemplateGroupDto" type="pwc.taxtech.atms.dpo.OrganizationServiceTemplateGroupDto">
         <id column="ID" jdbcType="VARCHAR" property="ID"/>
         <result column="ServiceTypeID" jdbcType="VARCHAR" property="serviceTypeID"/>
         <result column="OrganizationID" jdbcType="VARCHAR" property="organizationID"/>

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

@@ -59,7 +59,7 @@
         </foreach>
     </insert>
     <resultMap extends="BaseResultMap" id="periodCellTemplateConfigExtendDtoMap"
-               type="pwc.taxtech.atms.dto.vatdto.PeriodCellTemplateConfigExtendDto">
+               type="pwc.taxtech.atms.vat.dpo.PeriodCellTemplateConfigExtendDto">
         <result column="column_index" jdbcType="INTEGER" property="columnIndex"/>
         <result column="row_index" jdbcType="INTEGER" property="rowIndex"/>
         <result column="column_name" jdbcType="VARCHAR" property="columnName"/>