2023年5月29日19:42:24

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingItemsMapper.java

@@ -28,4 +28,6 @@ public interface BidingItemsMapper extends BaseMapper<BidingItems> {
 	 * 获得明细详情
 	 */
 	List<BidingItems> selectPcList(@Param("biding") Biding biding);
+
+	List<BidingItems> selectListByPid(@Param("pid")Long pid);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingItemsMapper.xml

@@ -26,12 +26,25 @@
 
 
     <update id="updateByPid" parameterType="long">
-        UPDATE business_biding_items SET is_deleted = '1' WHERE pid = #{id}
+        UPDATE business_biding_items
+        SET is_deleted = '1'
+        WHERE pid = #{id}
     </update>
 
     <select id="selectPcList" resultMap="bidingItemsResultMap">
-        select * from business_biding_items where is_deleted = 0 and pid = #{biding.id}
-        and distinguish = #{biding.distinguish}
+        select *
+        from business_biding_items
+        where is_deleted = 0
+          and pid = #{biding.id}
+          and distinguish = #{biding.distinguish}
+        order by ranking asc
+    </select>
+    <select id="selectListByPid" resultType="org.springblade.purchase.sales.entity.BidingItems">
+        select *
+        from business_biding_items
+        where is_deleted = 0
+          and pid = #{pid}
+          and distinguish = '1'
         order by ranking asc
     </select>
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingItemsServiceImpl.java

@@ -104,22 +104,19 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 
 		if (1 == distinguish) {
 			//获得标书明细
-			LambdaQueryWrapper<BidingItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(BidingItems::getTenantId, AuthUtil.getTenantId());
-			lambdaQueryWrapper.eq(BidingItems::getIsDeleted, 0);
-			lambdaQueryWrapper.eq(BidingItems::getPid, pid);
-			lambdaQueryWrapper.eq(BidingItems::getDistinguish, distinguish);
-			List<BidingItems> bidingItemsList = baseMapper.selectList(lambdaQueryWrapper);
+			List<BidingItems> bidingItemsList = baseMapper.selectListByPid(pid);
 			list.addAll(bidingItemsList);
 			List<BidingItems> sortedList = list.stream().filter(e -> ObjectUtils.isNotNull(e.getSeaFreight()))
 				.sorted(Comparator.comparing(BidingItems::getSeaFreight))
 				.collect(Collectors.toList());
 			int sort = 1;
 			List<BidingItems> list1 = new ArrayList<>();
+			BigDecimal seaFreight = new BigDecimal("0.00");
+			int ranking = 1;
 			for (int i = 0; i < sortedList.size(); i++) {
 				if (i > 0) {
-					if (sortedList.get(i).getSeaFreight().equals(sortedList.get(i - 1).getSeaFreight())) {
-						sortedList.get(i).setRanking(sortedList.get(i - 1).getRanking());
+					if (sortedList.get(i).getSeaFreight().equals(seaFreight)) {
+						sortedList.get(i).setRanking(ranking);
 					} else {
 						sort = sort + 1;
 						sortedList.get(i).setRanking(sort);