。。。

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.java

@@ -33,4 +33,12 @@ public interface StockJournalMapper extends BaseMapper<StockJournal> {
 
     Page<Map<String, Object>> inOutDocument(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
 
+    /**
+     * 到货质检列表
+     *
+     * @param page    分页信息
+     * @param wrapper 查询条件
+     * @return
+     */
+    Page<StockJournal> getArrivalQualityPage(@Param("page") Page<StockJournal> page, @Param("ew") IWrapper<StockJournal> wrapper);
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.xml

@@ -66,6 +66,28 @@
         ${ew.customSqlSegment}
     </select>
 
+    <!-- 到货质检列表 -->
+    <select id="getArrivalQualityPage" resultType="com.fjhx.entity.stock.StockJournal">
+        SELECT
+            t1.`code`,
+            t1.warehouse_id,
+	        t1.quality_status,
+            t1.create_user,
+            t1.create_time,
+            t2.purchase_id,
+            t3.`code` purchaseCode,
+            t3.supplier_id,
+            t4.`name` supplierName,
+            t5.`name` warehouseName
+        FROM
+            stock_journal t1
+            LEFT JOIN logistics_details t2 ON t1.business_id = t2.id
+            LEFT JOIN purchase t3 ON t2.purchase_id = t3.id
+            LEFT JOIN supplier t4 ON t3.supplier_id = t4.id
+            LEFT JOIN warehouse t5 ON t1.warehouse_id = t5.id
+        ${ew.customSqlSegment}
+    </select>
+
     <select id="inOutDocument" resultType="java.util.Map">
         select sj.code,
                w.name         warehouseName,

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/StockJournalService.java

@@ -43,6 +43,14 @@ public interface StockJournalService extends BaseService<StockJournal> {
     Page<StockJournal> getManualInStockPage(Condition condition);
 
     /**
+     * 到货质检列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    Page<StockJournal> getArrivalQualityPage(Map<String, Object> condition);
+
+    /**
      * 出入库单据
      */
     Page<Map<String, Object>> inOutDocument(Condition condition);

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockJournalServiceImpl.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.Condition;
 import com.fjhx.constants.StockJournalTypeConstant;
+import com.fjhx.entity.apply.ApplyPurchase;
+import com.fjhx.entity.purchase.Purchase;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.entity.stock.StockJournal;
+import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.enums.stock.QualityStatusEnum;
@@ -233,6 +236,37 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         return page;
     }
 
+    /**
+     * 到货质检列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @Override
+    public Page<StockJournal> getArrivalQualityPage(Map<String, Object> condition) {
+        IWrapper<StockJournal> wrapper = IWrapper.getWrapper(condition);
+        wrapper.eq("t1", StockJournal::getType, StockJournalTypeConstant.IN)
+                .eq("t1", StockJournal::getDetailsType, InTypeEnum.PURCHASE.getKey())
+                .ge("t3", Purchase::getStatus, PurchaseStatusEnum.STATUS_30.getKey())
+                .le("t3", Purchase::getStatus, PurchaseStatusEnum.STATUS_40.getKey())
+                .eq("t1", StockJournal::getQualityStatus)
+                .and(Func.isNotEmpty(condition.get("keyword")), o -> o.apply("instr(t3.`code`, '" + condition.get("keyword") + "') > 0").or().apply("instr(t4.`name`, '" + condition.get("keyword") + "') > 0").or().apply("instr(t5.`name`, '" + condition.get("keyword") + "') > 0"))
+                .groupBy("t1.`code`")
+                .orderByDesc("t1", ApplyPurchase::getCode);
+
+        Page<StockJournal> page = baseMapper.getArrivalQualityPage(createPage(condition), wrapper);
+        if (Func.isNotEmpty(page.getRecords())) {
+            Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(page.getRecords(), StockJournal::getCreateUser);
+            for (StockJournal entity : page.getRecords()) {
+                if (Func.isNotEmpty(userNameMap) && Func.isNotEmpty(userNameMap.get(entity.getCreateUser()))) {
+                    entity.setCreateName(userNameMap.get(entity.getCreateUser()));
+                }
+            }
+        }
+
+        return page;
+    }
+
     @Override
     public Page<Map<String, Object>> inOutDocument(Condition condition) {