电站管理 页面拆分

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

@@ -20,5 +20,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
     List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
                                     @Param("ownersName")String ownersName,
                                     @Param("serviceAgent")String serviceAgent,
-                                    @Param("regionalCompaniesName")String regionalCompaniesName);
+                                    @Param("regionalCompaniesName")String regionalCompaniesName,
+                                    @Param("processStatus")String processStatus);
 }

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

@@ -28,6 +28,9 @@
     <if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
         and hygf_peasant_household.regional_companies_name like concat(concat("%",#{regionalCompaniesName}),"%")
     </if>
+    <if test="processStatus != null and processStatus != ''">
+        and hygf_power_station.process_status = #{processStatus}
+    </if>
     ORDER BY hygf_power_station.rec_date desc
     ) a
 </select>

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

@@ -102,12 +102,13 @@ public class PowerStationController extends BaseController {
                                                             @RequestParam(value = "powerStationCode",required = false)String powerStationCode,
                                                             @RequestParam(value = "ownersName",required = false)String ownersName,
                                                             @RequestParam(value = "serviceAgent",required = false)String serviceAgent,
+                                                            @RequestParam(value = "processStatus",required = false) String processStatus,
                                                             @RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName) {
 	    Page<PowerStationDto> page = new Page<PowerStationDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
-		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName));
+		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus));
 	}
 
 	/**

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

@@ -85,7 +85,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     WorkflowImpl workflow;
 
 	public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
-			String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName) {
+			String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus) {
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
 //        Collection<List<RoleModel>> roleModels = orgRoles.values();
 //        if(roleModels !=null){
@@ -110,15 +110,15 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 		// return
 		// this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
 		return this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
-				serviceAgent,regionalCompaniesName);
+				serviceAgent,regionalCompaniesName,processStatus);
 	}
 
 	// 查询电站审核记录
 	public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
-			String serviceAgent,String regionalCompaniesName) {
+			String serviceAgent,String regionalCompaniesName,String processStatus) {
 
 		PageHelper.startPage(current, size);
-		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName);
+		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus);
 
         PageInfo<PowerStationDto> pages = new PageInfo(list);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();