fixed backend issue

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

@@ -41,7 +41,7 @@ public class TemplateController extends BaseController {
 
     @RequestMapping(value = "get", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
-    List<TemplateDto> get(@RequestParam Long templateGroupId, @RequestParam String reportType) {
+    List<TemplateDto> get(@RequestParam(name="templateGroupID") Long templateGroupId, @RequestParam(name="reportType") String reportType) {
         if (!isParamValid(templateGroupId)) {
             return Collections.emptyList();
         }

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

@@ -2894,6 +2894,7 @@ public class OrganizationServiceImpl implements OrganizationService {
         for (Organization subOrg : subOrgList) {
             children.add(generateIvhTreeDto(subOrg, orgList, serviceList, useType));
         }
+        result.setId(parentOrg.getId());
         result.setLabel(parentOrgDto.getName());
         result.setValue(parentOrgDto);
         result.setChildren(children);

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

@@ -110,11 +110,11 @@ public interface KeyValueReferenceMapper extends MyMapper {
      */
     int updateByPrimaryKey(KeyValueReference record);
 
-    int deleteKeyValueReferenceByCellTemplate(@Param("templateDbId") Long templateDbId);
+    int deleteKeyValueReferenceByCellTemplate(@Param("templateDbID") Long templateDbId);
 
-    List<FinancialStatementDetail> getFinancialStatementDetails(@Param("configurationId") String configurationId);
+    List<FinancialStatementDetail> getFinancialStatementDetails(@Param("configurationID") String configurationId);
 
-    List<TaxReturnDetail> getTaxReturnDetails(@Param("configurationId") String configurationId);
+    List<TaxReturnDetail> getTaxReturnDetails(@Param("configurationID") String configurationId);
 
-    List<AnalyticsModelDetail> getAnalyticsModelDetails(@Param("configurationId") String configurationId);
+    List<AnalyticsModelDetail> getAnalyticsModelDetails(@Param("configurationID") String configurationId);
 }
\ No newline at end of file

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

@@ -111,7 +111,7 @@ public interface TaxRuleSettingMapper extends MyMapper {
      */
     int updateByPrimaryKey(TaxRuleSetting record);
 
-    @Select("SELECT TRS.GROUP_NAME,TRS.ID,TRS.IS_DEFAULT,TRS.NAME,TRS.TAX_BASE,TRS.TAX_RATE*100 AS TAX_RATE,TRSO.ORGANIZATION_ID"
+    @Select("SELECT TRS.GROUP_NAME as groupName,TRS.ID as id,TRS.IS_DEFAULT as isDefault,TRS.NAME as name,TRS.TAX_BASE as taxBase,TRS.TAX_RATE*100 AS taxRate,TRSO.ORGANIZATION_ID as organizationId"
             + " FROM TAX_RULE_SETTING TRS "
             + "LEFT JOIN TAX_RULE_SETTING_ORGANIZATION TRSO ON TRS.ID=TRSO.TAX_SETTING_ID")
     List<TaxRuleSettingDto> GetTaxRuleSetting();

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

@@ -68,7 +68,7 @@
         ON
         org.INDUSTRY_ID = i.ID
         WHERE
-        org.INDUSTRY_ID_= #{industryID,jdbcType=VARCHAR}
+        org.INDUSTRY_ID = #{industryID,jdbcType=VARCHAR}
         AND ST.ID = #{serviceTypeID,jdbcType=VARCHAR}
         ORDER BY
         m.CODE