bug修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java

@@ -68,14 +68,6 @@ public class BusPurchaseDocController extends BaseController {
     }
 
 
-    /**
-     * 查询物资-采购联系单列表
-     */
-    @SaCheckPermission("cailiaoshebei:purchaseDoc:list")
-    @GetMapping("/getList")
-    public R<List<BusPurchaseDocVo>> getList(BusPurchaseDocBo bo) {
-        return R.ok(busPurchaseDocService.queryList(bo));
-    }
 
     /**
      * 导出物资-采购联系单列表

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java

@@ -114,4 +114,10 @@ public class BusMaterialbatchdemandplanBo extends BaseEntity {
      * 主键集合
      */
     private List<Long> ids;
+
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java

@@ -22,6 +22,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.tender.domain.bo.BusBiddingPlanBo;
+import org.dromara.tender.domain.vo.BusBiddingPlanVo;
+import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
+import org.dromara.tender.service.IBusBiddingPlanService;
+import org.dromara.tender.service.ITenderSupplierInputService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -34,9 +39,7 @@ import org.dromara.cailiaoshebei.mapper.BusMaterialbatchdemandplanMapper;
 import org.dromara.cailiaoshebei.service.IBusMaterialbatchdemandplanService;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import java.util.*;
-import java.util.Map;
-import java.util.Collection;
 
 /**
  * 物资-批次需求计划Service业务层处理
@@ -60,6 +63,10 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
     @Autowired
     private  IBusMaterialsorderService busMaterialsorderService;
 
+    @Lazy
+    @Autowired
+    private IBusBiddingPlanService busBiddingPlanService;
+
     /**
      * 查询物资-批次需求计划
      *
@@ -81,7 +88,21 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
     @Override
     public TableDataInfo<BusMaterialbatchdemandplanVo> queryPageList(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<BusMaterialbatchdemandplan> lqw = buildQueryWrapper(bo);
+        BusBiddingPlanBo bo1 = new BusBiddingPlanBo();
+        bo1.setProjectId(bo.getProjectId());
+        bo1.setType("2");
+        bo1.setWinningBidderId(bo.getSupplierId());
+        List<BusBillofquantitiesLimitListVo> busBiddingPlanVos = busBiddingPlanService.getBillofquantitiesLimitListVo(bo1);
+        Set<String> hashSet = new HashSet<>();
+        busBiddingPlanVos.stream().forEach(vo -> {
+            hashSet.add(vo.getName()+"+"+vo.getSpecification());
+        });
         Page<BusMaterialbatchdemandplanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<BusMaterialbatchdemandplanVo> list = result.getRecords().stream().filter(vo -> {
+            String key = vo.getName() + "+" + vo.getSpecification(); // 拼接字符串（需与 Set 中格式一致）
+            return hashSet.contains(key); // 仅保留 Set 中存在的数据
+        }).toList();
+        result.setRecords(list);
         return TableDataInfo.build(result);
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java

@@ -164,7 +164,7 @@ public class GpsEquipmentController extends BaseController {
     /**
      * 查询施工人员列表
      */
-    @SaCheckPermission("gps:equipment:bindManmachine")
+    @SaCheckPermission("gps:equipment:userList")
     @GetMapping("/userList")
     public R<List<ConstructionUser>> list(SubConstructionUserQueryReq req) {
         List<SubConstructionUser> list = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentSonController.java

@@ -48,7 +48,7 @@ public class GpsEquipmentSonController extends BaseController {
     /**
      * 查询GPS设备定位信息列表
      */
-    @SaCheckPermission("gps:equipmentSon:list")
+    @SaCheckPermission("gps:equipmentSon:getList")
     @GetMapping("/getList")
     public R<List<GpsEquipmentSonVo>> getList(GpsEquipmentSonBo bo) {
         return R.ok(gpsEquipmentSonService.queryList(bo));

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/domain/vo/GpsUserVo.java

@@ -39,6 +39,15 @@ public class GpsUserVo implements Serializable {
      * 用户名
      */
     private String userName;
+    /**
+     *
+     */
+//    @ExcelProperty(value = "")
+    private Long projectId;
+    /**
+     * 用户名
+     */
+    private String projectName;
 
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java

@@ -21,12 +21,15 @@ public interface GpsEquipmentMapper extends BaseMapperPlus<GpsEquipment, GpsEqui
 
     @Select("SELECT\n" +
         "  gm.user_id AS userId,\n" +
-        "  su.user_name AS userName \n" +
+        "  su.user_name AS userName, \n" +
+        "  gm.project_id AS projectId,\n" +
+        "  bp.project_name AS projectName \n" +
         "FROM\n" +
         "  gps_equipment_son gm\n" +
         "  LEFT JOIN sys_user su ON gm.user_id = su.user_id \n" +
+        "LEFT JOIN bus_project bp ON gm.project_id = bp.id  \n" +
         "WHERE\n" +
         "  gm.client_id =  #{clientId}" +
-        " GROUP BY gm.user_id")
+        " GROUP BY gm.user_id,gm.project_id")
     List<GpsUserVo> getUserList(@Param("clientId") String clientId);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/BusSegmentedIndicatorPlanning.java

@@ -86,4 +86,6 @@ public class BusSegmentedIndicatorPlanning extends BaseEntity {
 
     private String tenderFile;
 
+    private Integer status;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/BusSegmentedIndicatorPlanningBo.java

@@ -103,4 +103,6 @@ public class BusSegmentedIndicatorPlanningBo extends BaseEntity {
 
     private String tenderFile;
 
+    private Integer status;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/BusSegmentedIndicatorPlanningVo.java

@@ -106,4 +106,6 @@ BusSegmentedIndicatorPlanningVo implements Serializable {
 
     private String tenderFile;
 
+    private Integer status;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/mapper/BusBiddingPlanMapper.java

@@ -1,9 +1,13 @@
 package org.dromara.tender.mapper;
 
+import jakarta.validation.constraints.NotNull;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.tender.domain.BusBiddingPlan;
 import org.dromara.tender.domain.vo.BusBiddingPlanVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 招标计划Mapper接口
  *
@@ -12,4 +16,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface BusBiddingPlanMapper extends BaseMapperPlus<BusBiddingPlan, BusBiddingPlanVo> {
 
+    List<Long> getBillofquantitiesId(@Param("type") String type, @Param("winningBidderId") Long winningBidderId, @Param("projectId") Long projectId);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBiddingPlanService.java

@@ -99,4 +99,11 @@ public interface IBusBiddingPlanService extends IService<BusBiddingPlan>{
     List<BusBiddingPlanAnnexVo> getAnnex(BusBiddingPlanBo bo);
 
     BusBiddingPlanDetailVo queryDetailById(Long id);
+
+    /**
+     * 获取到供应商下所有材料
+     * @param bo1
+     * @return
+     */
+    List<BusBillofquantitiesLimitListVo> getBillofquantitiesLimitListVo(BusBiddingPlanBo bo1);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/IBusBillofquantitiesLimitListService.java

@@ -107,4 +107,6 @@ public interface IBusBillofquantitiesLimitListService extends IService<BusBillof
     BusBLimitListVersionsVo getVersionDetail(Long versions);
 
     BusBillofquantitiesLimitListVo queryBySId(String pid);
+
+    List<BusBillofquantitiesLimitListVo> queryVoByIds(List<Long> ids);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java

@@ -359,6 +359,13 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
         return detailVo;
     }
 
+    @Override
+    public List<BusBillofquantitiesLimitListVo> getBillofquantitiesLimitListVo(BusBiddingPlanBo bo1) {
+        List<Long> ids = baseMapper.getBillofquantitiesId(bo1.getType(),bo1.getWinningBidderId(),bo1.getProjectId());
+
+        return busBillofquantitiesLimitListService.queryVoByIds(ids);
+    }
+
     /**
      * 递归构建树形结构
      * @param parentId 父节点ID（顶级节点为0）

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBillofquantitiesLimitListServiceImpl.java

@@ -285,6 +285,11 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl<BusBill
         return baseMapper.selectVoOne(new LambdaQueryWrapper<BusBillofquantitiesLimitList>().eq(BusBillofquantitiesLimitList::getSid, pid));
     }
 
+    @Override
+    public List<BusBillofquantitiesLimitListVo> queryVoByIds(List<Long> ids) {
+        return baseMapper.selectVoByIds(ids);
+    }
+
     /**
      * 递归构建树形结构
      *

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusSegmentedIndicatorPlanningServiceImpl.java

@@ -151,6 +151,9 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl<BusSeg
     @Override
     public Boolean updateByBo(BusSegmentedIndicatorPlanningBo bo) {
         BusSegmentedIndicatorPlanning update = MapstructUtils.convert(bo, BusSegmentedIndicatorPlanning.class);
+        if (update != null) {
+            update.setStatus(0);
+        }
 //        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBiddingPlanMapper.xml

@@ -4,4 +4,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.tender.mapper.BusBiddingPlanMapper">
 
+    <select id="getBillofquantitiesId" resultType="java.lang.Long">
+        SELECT
+            btpll.limit_list_id
+        FROM
+            bus_bidding_plan bbp
+                LEFT JOIN bus_tender_planning_limit_list btpll ON bbp.id = btpll.bidding_plan_id
+        WHERE
+            bbp.project_id = #{projectId}
+          AND bbp.type = #{type}
+          AND bbp.winning_bidder_id = #{winningBidderId}
+          AND btpll.num IS NOT NULL
+        GROUP BY btpll.limit_list_id
+    </select>
 </mapper>