添加经销商查看指定状态的单子

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationRoleEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -129,6 +130,7 @@ public class HygfRectificationOrderController extends BaseController {
 
 		ReginParams reginParams = getSelectedOrgInfo();
 		List<String> workOrderPowerStationNodes = new ArrayList<>();
+		List<String> status = new ArrayList<>();
 //		workOrderPowerStationNodes.add(rectificationSource);
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
@@ -148,7 +150,7 @@ public class HygfRectificationOrderController extends BaseController {
 			}
 		}
 
-		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId);
+		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId,status);
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 				page.getRecords().forEach(e->{
@@ -185,6 +187,7 @@ public class HygfRectificationOrderController extends BaseController {
 
 		ReginParams reginParams = getSelectedOrgInfo();
 		List<String> workOrderPowerStationNodes = new ArrayList<>();
+		List<String> status = new ArrayList<>();
 //		workOrderPowerStationNodes.add(rectificationSource);
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
@@ -201,14 +204,20 @@ public class HygfRectificationOrderController extends BaseController {
 				workOrderPowerStationNodes.add("bw-design");
 				workOrderPowerStationNodes.add("bw-engineering");
 				workOrderPowerStationNodes.add("bw-area");
+				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.待审核.name());
+				status.add(WorkOrderEnum.已完成.name());
 			}if (longs.contains(delerKfId) ) {
 				workOrderPowerStationNodes.add("bw-design");
 				workOrderPowerStationNodes.add("bw-engineering");
 				workOrderPowerStationNodes.add("bw-area");
+				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.待审核.name());
+				status.add(WorkOrderEnum.已完成.name());
 			}
 		}
 
-		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId);
+		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId,status);
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{
@@ -246,6 +255,7 @@ public class HygfRectificationOrderController extends BaseController {
 
 		ReginParams reginParams = getSelectedOrgInfo();
 		List<String> workOrderPowerStationNodes = new ArrayList<>();
+		List<String> status = new ArrayList<>();
 //		workOrderPowerStationNodes.add(rectificationSource);
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
@@ -266,11 +276,17 @@ public class HygfRectificationOrderController extends BaseController {
 				workOrderPowerStationNodes.add("ys-tourong");
 				workOrderPowerStationNodes.add("ys-fawu");
 				workOrderPowerStationNodes.add("ys-area");
+				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.待审核.name());
+				status.add(WorkOrderEnum.已完成.name());
 			}if (longs.contains(deveEngineeringId) ) {
 				workOrderPowerStationNodes.add("ys-zichan");
 				workOrderPowerStationNodes.add("ys-tourong");
 				workOrderPowerStationNodes.add("ys-fawu");
 				workOrderPowerStationNodes.add("ys-area");
+				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.待审核.name());
+				status.add(WorkOrderEnum.已完成.name());
 			}
 //			if (longs.contains(delergcId) ) {
 //				workOrderPowerStationNodes.add("ys-design");
@@ -278,8 +294,7 @@ public class HygfRectificationOrderController extends BaseController {
 //				workOrderPowerStationNodes.add("ys-area");
 //			}
 		}
-
-		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId);
+		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId,status);
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{

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

@@ -33,7 +33,7 @@ public class HygfRectificationOrderServiceImpl extends BaseService<HygfRectifica
     /**
      * 分页查询
      */
-    public Page<HygfRectificationOrder> queryForHygfRectificationOrderPage(int current, int size, List<String> rectificationSource, String peasantHouseholeId) {
+    public Page<HygfRectificationOrder> queryForHygfRectificationOrderPage(int current, int size, List<String> rectificationSource, String peasantHouseholeId,List<String> status) {
 //        PageHelper.startPage(current, size);
 //        List<HygfRectificationOrder> list = this.getBaseMapper().selectOrderPage(rectificationSource,peasantHouseholeId);
 //        PageInfo<HygfRectificationOrder> infos = new PageInfo<>(list);
@@ -48,6 +48,9 @@ public class HygfRectificationOrderServiceImpl extends BaseService<HygfRectifica
         if (rectificationSource != null && !rectificationSource.isEmpty()) {
             wrapper.in(HygfRectificationOrder::getRectificationSource, rectificationSource);
         }
+        if (status != null && !status.isEmpty()) {
+            wrapper.in(HygfRectificationOrder::getRectificationStatus, status);
+        }
 
         // 创建 Page 对象并设置分页参数
         Page<HygfRectificationOrder> page = new Page<>(current, size);