质押关系 省份变更

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/FinancingRegionalMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
 public interface FinancingRegionalMapper extends BaseMapper<FinancingRegional> {
 
     @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"regional_companies_code"}, fieldConditions ={"in","in"} ,relationship="and",specific=false)
-   List<FinancingRegional> queryDataForPage();
+   List<FinancingRegional> queryDataForPage(String regionalCompaniesName, String province);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoMapper.xml

@@ -17,7 +17,8 @@
         hygf_unit_info.head_phone  responsibleUserPhone,
         CONCAT(info.disbursement_money,'') as disbursementMoney,
         hph.regional_companies_code,
-        hph.developer_code
+        hph.developer_code,
+        info.financing_companies_name financingCompaniesName
         FROM
         `hygf_peasant_household` hph
         LEFT JOIN hygf_financing_info info ON info.peasant_household_id = hph.sequence_nbr

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingRegionalMapper.xml

@@ -4,6 +4,14 @@
 
     <select id="queryDataForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRegional">
         select * from  hygf_financing_regional
+        <where>
+            <if test="regionalCompaniesName != null and regionalCompaniesName != ''">
+            and hygf_financing_regional.regional_companies_name = #{regionalCompaniesName}
+            </if>
+            <if test="province != null and province != ''">
+                and hygf_financing_regional.province  = #{province}
+            </if>
+        </where>
 
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -258,7 +258,7 @@
             FROM
                 systemctl_region sr
             WHERE
-                sr.REGION_CODE = #{province}
+                sr.REGION_NAME = #{province}
             UNION ALL
             SELECT
                 h.SEQUENCE_NBR

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingRegionalController.java

@@ -107,10 +107,14 @@ public class FinancingRegionalController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "融资机构区域公司绑定表分页查询",  notes = "融资机构区域公司绑定表分页查询")
 	@UserLimits
-	public ResponseModel<Page<FinancingRegional>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-                    (value = "size") int size) {
+	public ResponseModel<Page<FinancingRegional>> queryForPage(@RequestParam(value = "current") int current,
+															   @RequestParam(value = "size") int size,
+															   @RequestParam(value = "regionalCompaniesName",required = false) String regionalCompaniesName,
+															   @RequestParam(value = "province",required = false) String province
 
-	    return ResponseHelper.buildResponse(financingRegionalServiceImpl.queryForFinancingRegionalPage(current,size));
+	) {
+
+	    return ResponseHelper.buildResponse(financingRegionalServiceImpl.queryForFinancingRegionalPage(current,size,regionalCompaniesName,province));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -12,6 +12,8 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DayGenerateServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpStationServiceImpl;
 import io.swagger.annotations.Api;
@@ -442,6 +444,9 @@ public class JpStationController extends BaseController {
     @GetMapping(value = "/getRegionByProvince")
     @UserLimits
     public ResponseModel<List<Map<String, String>>> getRegionByProvince(String province) {
+        if (StringUtils.isEmpty(province)){
+            return CommonResponseNewUtil.success();
+        }
 
         List<String> ids = jpStationMapper.getRegionNode(province);
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingRegionalServiceImpl.java

@@ -37,10 +37,10 @@ public class FinancingRegionalServiceImpl extends BaseService<FinancingRegionalD
     /**
      * 分页查询
      */
-    public Page<FinancingRegional> queryForFinancingRegionalPage(int current,int size)   {
+    public Page<FinancingRegional> queryForFinancingRegionalPage(int current,int size,String regionalCompaniesName, String province)   {
         Page<FinancingRegional> page = new Page<>();
         PageHelper.startPage(current,size);
-        List<FinancingRegional> list = this.getBaseMapper().queryDataForPage();
+        List<FinancingRegional> list = this.getBaseMapper().queryDataForPage(regionalCompaniesName,province);
 
         PageInfo<FinancingRegional> pageInfo = new PageInfo<>(list);
         page.setSize(pageInfo.getSize());