diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java index 1b42bbd..ce26b0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java @@ -32,12 +32,6 @@ public interface BPlanEnterpriseMapper extends BaseMapper { void deleteByPlanId(@Param("planId") Long planId); - /** - * 根据planId获取计划企业 - * - * @param planId 计划id - */ - List getByPlanId(Long planId); List getZhifa(@Param("req") checkResultRequest req); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java index e2a8744..16d4bd7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java @@ -64,23 +64,12 @@ public interface IBAdministrativeService { public int deleteBAdministrativeById(Long id); - /** - * 行政获取县区 - * - * @return - */ - List selectBAdministrativeTreeRequestList(); + List selectBPlanEnterPriseTreeRequestRequestList(BPlanEnterprisePageRequest req); - /** - * 行政获取乡镇 - * - * @return - */ - List selectcascadingSelectDataList(); /** * 根据乡村,市区查询数据 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java index 223b870..427bb61 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java @@ -89,20 +89,14 @@ public class BAdministrativeServiceImpl implements IBAdministrativeService { return bAdministrativeMapper.deleteBAdministrativeById(id); } - @Override - public List selectBAdministrativeTreeRequestList() { - return bAdministrativeMapper.selectBAdministrativeTreeRequestList(); - } + @Override public List selectBPlanEnterPriseTreeRequestRequestList(BPlanEnterprisePageRequest req) { return bAdministrativeMapper.selectBPlanEnterPriseTreeRequestRequestList(req); } - @Override - public List selectcascadingSelectDataList() { - return bAdministrativeMapper.selectcascadingSelectDataList(); - } + @Override public List getBydistinct(String district, String paddedString) { diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml index 8adc042..caa3649 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml @@ -61,13 +61,20 @@ FROM ( SELECT - institution_name AS institutionName, + district_name AS institutionName, county, COUNT( enterprise_id ) AS plannedEnterpriseCount, SUM( checkStatus ) AS checkEnterpriseCount, SUM( checkStatus ) / COUNT( enterprise_id ) AS pt FROM - ( SELECT institution_name, county FROM b_administrative WHERE SUBDISTRICT = '' AND institution_name != '苏州市' + ( SELECT + district_name, + DISTRICT_CODE AS county + FROM + szs_administrative_division + WHERE + PARENT_CODE = '320500' + AND district_name != '苏州市' ) a LEFT JOIN ( SELECT @@ -96,7 +103,7 @@ ) t GROUP BY enterprise_id - ) p ON SUBSTRING( a.county, 1, 7 ) = p.district + ) p ON a.county = SUBSTRING(p.district, 1, 6) GROUP BY a.county ORDER BY diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index 147d5e0..8b2aa43 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -63,22 +63,7 @@ where plan_id = #{planId} - diff --git a/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml index ca83adb..3a0999e 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml @@ -74,67 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -302,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ZJ_ECON_KIND = #{zjEconKind}, CORP_STATUS = #{corpStatus}, CREATE_TIME = #{createTime}, + UUIT_NO = #{uuitNo}, SUPERVISION_SMALL = #{supervisionSmall}, RIGISTER_ADDRESS = #{rigisterAddress}, @@ -330,6 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LAST_PAGE_NUMBER = #{lastPageNumber}, FLOOR_SPACE = #{floorSpace}, ABOVE_DESIGNATED_TWO = #{aboveDesignatedTwo}, + SAFETY_PRODUCTION_INVESTMENT = #{safetyProductionInvestment}, LAST_YEAR_OPERATING_INCOME = #{lastYearOperatingIncome}, LAST_YEAT_ON_STREAM = #{lastYeatOnStream},