xiugaibug

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

@@ -201,9 +201,9 @@ public class AcceptanceCheckController extends BaseController {
 																@RequestParam(required = false,value = "projectAddress") String projectAddress,
 																@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
 																@RequestParam(required = false,value = "ownersName") String ownersName,
-																@RequestParam(required = false,value = "gridStatus") String gridStatus,
+																@RequestParam(required = false,value = "acceptanceCheckStatus") String acceptanceCheckStatus,
 																@RequestParam(required = false,value = "type") String type,
-																@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
+																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime) throws Exception {
 		//当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -232,7 +232,7 @@ public class AcceptanceCheckController extends BaseController {
 				basicGridNodes.add("ys-zichan");
 			}
 		}
-		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "",basicGridNodes,type);
+		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type);
 		//根据角色及当前节点判断是否有操作权限
 		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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
@@ -56,7 +59,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 gridStatus,
+                                               String projectAddress, String powerStationCode, String ownersName, String acceptanceCheckStatus,
                                                String gridConnectionTime, String formType, List<String> basicGridNodes, String type) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
@@ -67,7 +70,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("projectAddress", projectAddress);
         map.put("powerStationCode", powerStationCode);
         map.put("ownersName", ownersName);
-        map.put("gridStatus", gridStatus);
+        map.put("acceptanceCheckStatus", acceptanceCheckStatus);
         map.put("gridConnectionTime", gridConnectionTime);
         map.put("formType", formType);
         map.put("regionCompanyId", regionCompanyId);