添加发货省份

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java

@@ -99,4 +99,6 @@ public class PowerStationDto  extends BaseDto {
     private String scale;
     @ApiModelProperty(value = "电站实际规模")
     private String realScale;
+    @ApiModelProperty(value = "省份")
+    private String province;
 }

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

@@ -34,6 +34,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
                                                  @Param(value = "ownersName") String ownersName,
                                                  @Param(value = "regionalCompaniesSeq") String regionalCompaniesSeq,
                                                  @Param(value = "developerId") String developerId,
-                                                 @Param(value = "state") String state);
+                                                 @Param(value = "state") String state,
+                                                 @Param(value = "province") String province);
 
 }

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

@@ -51,6 +51,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         hygf_peasant_household.developer_name as developerName,
         hygf_peasant_household.developer_id as developeId,
         hygf_peasant_household.sequence_nbr  as sequenceNbr,
+        substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
         concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) as address,
         hygf_peasant_household.preparation_money_state preparationMoneyState,
         hygf_document_station.preparation_money_id as preparationMoneyId,
@@ -80,6 +81,9 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         <if test=" preparationMoneyState == 1 ">
             and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
+        <if test="province != null and province != ''">
+            and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
+        </if>
         </where>
 <!--        GROUP BY  hygf_peasant_household.sequence_nbr-->
         <if test=" preparationMoneyState == 1 ">

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

@@ -343,9 +343,10 @@ public class PreparationMoneyController extends BaseController {
 			@RequestParam(value = "regionalcompaniesSeq",required = false) String regionalcompaniesSeq,
 			@RequestParam(value = "developerId",required = false) String developerId,
 			@RequestParam(value = "state",required = false) String state,
-			@RequestParam(value = "preparationMoneyState") String preparationMoneyState){
+			@RequestParam(value = "preparationMoneyState") String preparationMoneyState,
+			@RequestParam(value = "province",required = false) String province){
 
-		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state)) ;
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province)) ;
 	}
 
 

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

@@ -1185,11 +1185,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
     }
 
-    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state){
+    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province){
 
 
          PageHelper.startPage(current,  size);
-         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state);
+         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province);
 
         if(resultPage != null && resultPage.size() > 0) {
             resultPage.forEach(e -> {