添加并网 验收 身份

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

@@ -7,10 +7,10 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
+
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.ArrayList;
@@ -205,7 +205,8 @@ public class AcceptanceCheckController extends BaseController {
 																@RequestParam(required = false,value = "ownersName") String ownersName,
 																@RequestParam(required = false,value = "acceptanceCheckStatus") String acceptanceCheckStatus,
 																@RequestParam(required = false,value = "type") String type,
-																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime) throws Exception {
+																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime,
+																@RequestParam(required = false, value = "province") String province) throws Exception {
 		//当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -234,7 +235,7 @@ public class AcceptanceCheckController extends BaseController {
 				basicGridNodes.add("ys-zichan");
 			}
 		}
-		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type);
+		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province);
 		//根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null){
 			for (AcceptanceCheckDto e : page.getRecords()) {

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

@@ -73,7 +73,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
                                                String projectAddress, String powerStationCode, String ownersName, String acceptanceCheckStatus,
-                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type) throws Exception {
+                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
         Date date = null;
@@ -90,6 +90,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("amosDealerId", amosDealerId);
         map.put("basicGridNodes",basicGridNodes);
         map.put("type",type);
+        map.put("province",province);
         List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
 
         if(list != null && list.size() > 0) {