2022年11月17 12:51

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

@@ -136,6 +136,7 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 		lambdaQueryWrapper.eq(StringUtil.isNotBlank(biding.getObjectiveHarbor()), Biding::getObjectiveHarbor, biding.getObjectiveHarbor());//目的港
 		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(biding.getCreateUser()), Biding::getCreateUser, biding.getCreateUser());//制单人
 		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(biding.getStatus()), Biding::getStatus, biding.getStatus());//状态
+		lambdaQueryWrapper.like(ObjectUtil.isNotEmpty(biding.getContractNo()), Biding::getContractNo, biding.getContractNo());//合同号
 
 		String role = AuthUtil.getUserRole();
 		if (!role.contains("admin")){//admin能看全部标书,其他用户浏览自己的标书

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -472,7 +472,7 @@
         order by bo.busines_date
     </select>
 
-    <select id="sumMoneyNumber" parameterType="com.trade.purchase.order.vo.OrderTotalDTO" resultType= "map">
+    <select id="sumMoneyNumber" resultType= "map">
         SELECT
             ifnull( sum(boi.balance_number), 0 ) as balanceNumber,
             ifnull( sum(boi.balance_money), 0 ) as balanceMoney
@@ -549,7 +549,7 @@
         <if test="Order.containerNo!=null and Order.containerNo != ''">
             and boi.container_no = #{Order.containerNo}
         </if>
-        <if test="Order.isIssue == null and Order.isIssue == ''">
+        <if test="Order.isIssue == null or Order.isIssue == ''">
             and (boi.is_Issue = '3' or boi.is_Issue = '4' or boi.is_Issue = '5' or boi.is_Issue = '6')
         </if>
     </select>