站内信修改

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/stationletter/mapper/StationLetterMapper.java

@@ -39,6 +39,8 @@ public interface StationLetterMapper {
      */
     int selectPendingDriverCount();
 
+    int selectPendingKlyOrderCount(@Param("ew") QueryWrapper<OrderPagingResult> ew);
+
     /**
      * 查询待审核的订单数量
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/stationletter/service/impl/StationLetterServiceImpl.java

@@ -6,10 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.njzscloud.common.security.support.UserDetail;
 import com.njzscloud.common.security.util.SecurityUtil;
 import com.njzscloud.supervisory.biz.constant.AuditStatus;
+import com.njzscloud.supervisory.biz.constant.BizObj;
 import com.njzscloud.supervisory.biz.pojo.entity.BizAuditConfigEntity;
 import com.njzscloud.supervisory.biz.service.BizAuditConfigService;
+import com.njzscloud.supervisory.order.contant.CheckStatus;
 import com.njzscloud.supervisory.order.contant.OrderStatus;
 import com.njzscloud.supervisory.order.pojo.result.OrderPagingResult;
+import com.njzscloud.supervisory.station.pojo.entity.StationManageEntity;
+import com.njzscloud.supervisory.station.service.StationManageService;
+import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult;
 import com.njzscloud.supervisory.sys.stationletter.constant.WarnCategory;
 import com.njzscloud.supervisory.sys.stationletter.mapper.StationLetterMapper;
 import com.njzscloud.supervisory.sys.stationletter.pojo.AuditResult;
@@ -37,6 +42,7 @@ public class StationLetterServiceImpl implements StationLetterService {
 
     private final StationLetterMapper stationLetterMapper;
     private final BizAuditConfigService bizAuditConfigService;
+    private final StationManageService stationManageService;
 
     @Override
     public StationLetterResult getPendingWarnList() {
@@ -48,6 +54,7 @@ public class StationLetterServiceImpl implements StationLetterService {
             entity.setWarnCategoryName(warnCategoryName);
         }
         result.setWarnList(entities);
+
         List<AuditResult> auditResults = Lists.newArrayList();
 
         // 1.查询未删除并且待审核的公司数量，表为biz_company
@@ -86,6 +93,54 @@ public class StationLetterServiceImpl implements StationLetterService {
         AuditResult orderAudit = buildOrderAuditResult();
         auditResults.add(orderAudit);
 
+        // 6.查询司机端：待接单订单数量
+        MyResult userDetail = SecurityUtil.loginUser();
+        Long userId = SecurityUtil.currentUserId();
+        BizObj bizObj = userDetail.getBizObj();
+        AuditResult sjAudit = new AuditResult();
+        sjAudit.setModuleType("sjOrder");
+        sjAudit.setAuditName("司机待接单");
+        if (BizObj.isDriver(bizObj)) {
+            QueryWrapper<OrderPagingResult> queryWrapper = Wrappers.query();
+            queryWrapper.eq("a.order_status", OrderStatus.DaiJieDan);
+            queryWrapper.eq("f.user_id", userId);
+            int sjOrderCount = stationLetterMapper.selectPendingOrderCount(queryWrapper);
+            sjAudit.setCount(sjOrderCount);
+        }
+        sjAudit.setCount(0);
+        auditResults.add(sjAudit);
+
+        // 7.查询清运公司端：待派单订单数量
+        AuditResult transAudit = new AuditResult();
+        transAudit.setModuleType("transOrder");
+        transAudit.setAuditName("清运公司待派单");
+        if (BizObj.isTrans(bizObj)) {
+            QueryWrapper<OrderPagingResult> queryWrapper = Wrappers.query();
+            queryWrapper.in("a.order_status", OrderStatus.DaiPaiDan, OrderStatus.DaiJieDan);
+            queryWrapper.eq("g.user_id", userId);
+            int transOrderCount = stationLetterMapper.selectPendingOrderCount(queryWrapper);
+            transAudit.setCount(transOrderCount);
+        }
+        transAudit.setCount(0);
+        auditResults.add(transAudit);
+
+        // 8.查询勘料员端：待勘料订单数量
+        AuditResult klyAudit = new AuditResult();
+        klyAudit.setModuleType("klyOrder");
+        klyAudit.setAuditName("勘料员待勘料");
+        List<StationManageEntity> stationManageEntityList = stationManageService.list(Wrappers.lambdaQuery(StationManageEntity.class)
+                .eq(StationManageEntity::getUserId, userDetail.getUserId()));
+        if (null != stationManageEntityList && stationManageEntityList.size() > 0) {
+            List<Long> collect = stationManageEntityList.stream().map(StationManageEntity::getStationId).collect(Collectors.toList());
+            QueryWrapper<OrderPagingResult> queryWrapper = Wrappers.query();
+            queryWrapper.eq("a.check_status", CheckStatus.WeiKanLiao)
+                    .eq("a.order_status", OrderStatus.YiJinChang)
+                    .in("a.station_id", collect);
+            int klyOrderCount = stationLetterMapper.selectPendingKlyOrderCount(queryWrapper);
+            klyAudit.setCount(klyOrderCount);
+        }
+        klyAudit.setCount(0);
+        auditResults.add(klyAudit);
         result.setAuditResultList(auditResults);
         return result;
     }

njzscloud-svr/src/main/resources/mapper/sys/stationletter/StationLetterMapper.xml

@@ -53,12 +53,14 @@
         WHERE deleted = 0 AND audit_status = 'DaiShenHe'
     </select>
 
-    <!-- 查询待审核的订单数量
+    <!-- 查询勘料员待勘料的订单数量-->
-    <select id="selectPendingOrderCount" resultType="int">
+    <select id="selectPendingKlyOrderCount" resultType="int">
         SELECT COUNT(*)
         FROM order_info
-        WHERE deleted = 0 AND audit_status = 'DaiShenHe'
+        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
-    </select>-->
+            ${ew.customSqlSegment}
+        </if>
+    </select>
 
     <!-- 查询待审核的订单数量 -->
     <select id="selectPendingOrderCount" resultType="int">