姐姐后台补单页面数据查询功能

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/OrderProductMapper.java

@@ -7,6 +7,7 @@ import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -26,6 +27,6 @@ public interface OrderProductMapper extends SuperMapper<OrderProduct> {
 
     List<OrderProduct> getList(OrderProduct bean);
 
-    IPage<OrderProduct> pageList(IPage page,@Param("orderNo")String orderNo,@Param("bomName")String bomName,@Param("produceStatus")String produceStatus, @Param(Constants.WRAPPER) Wrapper<OrderProduct> queryWrapper);
+    IPage<OrderProduct> pageList(IPage page, @Param("produceStatus")String produceStatus, @Param(Constants.WRAPPER) Wrapper<OrderProduct> queryWrapper, DataScope dataScope);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/OrderProductService.java

@@ -21,6 +21,6 @@ public interface OrderProductService extends SuperService<OrderProduct> {
 
     List<OrderProduct> getlist(OrderProduct bean);
 
-    IPage<OrderProduct> pageList(IPage page,String orderNo,String bomName,String produceStatus, LbqWrapper<OrderProduct> wrapper);
+    IPage<OrderProduct> pageList(IPage page, String produceStatus, LbqWrapper<OrderProduct> wrapper);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderProductServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 import com.github.zuihou.business.operationManagementCenter.service.OrderProductService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -34,7 +35,7 @@ public class OrderProductServiceImpl extends SuperServiceImpl<OrderProductMapper
 
 
     @Override
-    public IPage<OrderProduct> pageList(IPage page,String orderNo,String bomName,String produceStatus, LbqWrapper<OrderProduct> wrapper) {
-        return baseMapper.pageList(page, orderNo, bomName, produceStatus, wrapper);
+    public IPage<OrderProduct> pageList(IPage page, String produceStatus, LbqWrapper<OrderProduct> wrapper) {
+        return baseMapper.pageList(page, produceStatus, wrapper, new DataScope());
     }
 }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderProductMapper.xml

@@ -19,38 +19,31 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,order_no,unqualifiedCount,addOrderCount,
-        order_id, bom_id, bom_num, delivery_time, remark, create_user, update_user, prority,produceStatus
+        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,
+        order_id, bom_id, bom_num, delivery_time, remark, create_user, update_user, prority, produce_status
     </sql>
 
     <!-- 分页 -->
     <select id="pageList" parameterType="String" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select a.*,b.name bomName,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime,d.order_no orderNo,unqualifiedCount,addOrderCount,d.produce_status produceStatus
+        from (select a.*,b.name as bomName,b.no as bomNo,b.specifications ,b.model,b.brand,ifnull(c.planNum,0) as planNum,
+        (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime, unqualifiedCount,addOrderCount,d.produce_status
         from imcs_o_order_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join (
           select order_product_id,count(1) as planNum from imcs_p_plan_product where 1=1 group by order_product_id
         )c on a.id= c.order_product_id
         left join imcs_o_order d on a.order_id = d.id
-
         LEFT JOIN
-        (select order_product_id,count(1) unqualifiedCount,count(u.add_order_id)addOrderCount from
+        (select order_product_id,count(1) as unqualifiedCount,count(u.add_order_id) as addOrderCount from
         imcs_t_task_test_unqualified_bom u
         GROUP BY u.order_product_id
         )e on a.id = e.order_product_id
         where 1=1
-        <if test="orderNo != null and orderNo != ''">
-            and d.order_no like concat('%', #{orderNo}, '%')
-        </if>
         <if test="produceStatus != null and produceStatus != ''">
             and d.produce_Status = #{produceStatus}
         </if>
-        <if test="bomName != null and bomName != ''">
-            and b.name like concat('%', #{bomName}, '%')
-        </if>
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderProductController.java

@@ -2,7 +2,9 @@ package com.github.zuihou.business.controller.operationManagementCenter;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.operationManagementCenter.dto.PlanPageDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
@@ -28,6 +30,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,16 +63,12 @@ public class OrderProductController extends SuperController<OrderProductService,
         LbqWrapper<OrderProduct> wrapper = wrap.lambda();
         OrderProduct orderProduct = BeanUtil.toBean(data, OrderProduct.class);
 
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), OrderProduct.class);
         //构建查询参数
-//        eq(OrderProduct::,plan.getAuditStatus())
-                /*.eq(Plan::getSource,plan.getSource())
-                .eq(Plan::getCustId,plan.getCustId())*/
-//                .eq(Plan::getOrderId,plan.getOrderId())
-//                .eq(Plan::getDraftFlag,plan.getDraftFlag())
-//        .geHeader(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null: LocalDateTime.parse(order.getDeliveryTime_st()))
-//                .leFooter(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_ed())?null:LocalDateTime.parse(order.getDeliveryTime_ed()))
-        wrapper.  orderByDesc(OrderProduct::getCreateTime);
-        baseService.pageList(page,orderProduct.getOrderNo(),orderProduct.getBomName(),orderProduct.getProduceStatus(),wrapper);
+        wrapper.like(StringUtil.isNotEmpty(orderProduct.getOrderNo()),OrderProduct::getOrderNo, orderProduct.getOrderNo())
+                .like(StringUtil.isNotEmpty(orderProduct.getBomName()),OrderProduct::getBomName, orderProduct.getBomName()).orderByDesc(OrderProduct::getCreateTime);
+
+        baseService.pageList(page,orderProduct.getProduceStatus(), wrapper);
 
     }