Commit e66d5cc3 authored by frank.xa.zhang's avatar frank.xa.zhang

fixed backend issue

parent 0c45a713
...@@ -41,7 +41,7 @@ public class TemplateController extends BaseController { ...@@ -41,7 +41,7 @@ public class TemplateController extends BaseController {
@RequestMapping(value = "get", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "get", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody 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)) { if (!isParamValid(templateGroupId)) {
return Collections.emptyList(); return Collections.emptyList();
} }
......
...@@ -2894,6 +2894,7 @@ public class OrganizationServiceImpl implements OrganizationService { ...@@ -2894,6 +2894,7 @@ public class OrganizationServiceImpl implements OrganizationService {
for (Organization subOrg : subOrgList) { for (Organization subOrg : subOrgList) {
children.add(generateIvhTreeDto(subOrg, orgList, serviceList, useType)); children.add(generateIvhTreeDto(subOrg, orgList, serviceList, useType));
} }
result.setId(parentOrg.getId());
result.setLabel(parentOrgDto.getName()); result.setLabel(parentOrgDto.getName());
result.setValue(parentOrgDto); result.setValue(parentOrgDto);
result.setChildren(children); result.setChildren(children);
......
...@@ -110,11 +110,11 @@ public interface KeyValueReferenceMapper extends MyMapper { ...@@ -110,11 +110,11 @@ public interface KeyValueReferenceMapper extends MyMapper {
*/ */
int updateByPrimaryKey(KeyValueReference record); 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
...@@ -111,7 +111,7 @@ public interface TaxRuleSettingMapper extends MyMapper { ...@@ -111,7 +111,7 @@ public interface TaxRuleSettingMapper extends MyMapper {
*/ */
int updateByPrimaryKey(TaxRuleSetting record); 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 " + " FROM TAX_RULE_SETTING TRS "
+ "LEFT JOIN TAX_RULE_SETTING_ORGANIZATION TRSO ON TRS.ID=TRSO.TAX_SETTING_ID") + "LEFT JOIN TAX_RULE_SETTING_ORGANIZATION TRSO ON TRS.ID=TRSO.TAX_SETTING_ID")
List<TaxRuleSettingDto> GetTaxRuleSetting(); List<TaxRuleSettingDto> GetTaxRuleSetting();
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
ON ON
org.INDUSTRY_ID = i.ID org.INDUSTRY_ID = i.ID
WHERE WHERE
org.INDUSTRY_ID_= #{industryID,jdbcType=VARCHAR} org.INDUSTRY_ID = #{industryID,jdbcType=VARCHAR}
AND ST.ID = #{serviceTypeID,jdbcType=VARCHAR} AND ST.ID = #{serviceTypeID,jdbcType=VARCHAR}
ORDER BY ORDER BY
m.CODE m.CODE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment