app首页统计详情页面修改，区分督察员和组长

wangqian
1 parent 5968c962
Showing 7 changed files with 62 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/enums/common/CommonConstants.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/vo/AppMainInfoPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java
@@ -215,5 +215,5 @@ public interface HomepageSummaryMapper  extends BaseMapperX&lt;DepartmentCostDO&gt; {
      * @Param null
      * @Return
      */
-    List<AppWorkOrderSummaryVo> countWorkOrder(@Param("queryType") String queryType, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    List<AppWorkOrderSummaryVo> countWorkOrder(@Param("queryType") String queryType,@Param("userId") Long userId, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
@@ -15,6 +15,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.taskstatistics.TaskStatistics
 import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.system.api.user.AdminUserApi;
+import com.zteits.urbanops.module.system.enums.common.CommonConstants;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
 /**
  * @Classname HomepageSummaryServiceImpl
  * @Description 首页统计实现
@@ -56,7 +59,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
     @Override
     public List<TaskCompletionStatusRspVo> taskCompletionSummary(AppHomePageSummaryReqVO req) {
-        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        Long userId = getLoginUserId();
         //巡查任务和养护任务已完成，未完成数量统计
         //返回数据初始化
         List<String> days = getDays(req.getBeginTime(), req.getEndTime());
@@ -102,7 +105,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
     @Override
     public PageResult<TaskDetailsRspVo> queryTaskDetails(AppHomePageSummaryPageReqVO req) {
-        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        Long userId = getLoginUserId();
         IPage<TaskDetailsRspVo> mpPage = MyBatisUtils.buildPage(req);
         if (req.getQueryType() == 2) {
             //已完成
@@ -110,7 +113,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         } else {
             //待办
             Long deptId = SecurityFrameworkUtils.getDeptId();
-            List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+            List<Long> roleIds = roleApi.getRoleIdsByUserId(getLoginUserId());
             mpPage = homepageSummaryMapper.queryPendingTaskDetails(mpPage, roleIds, userId, deptId, LocalDateTime.now());
         }
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
@@ -289,9 +292,19 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         // 1. 创建返回对象
         AppWorkOrderSummaryRspVo respVo = new AppWorkOrderSummaryRspVo();
+        Long userId = null;
+        //部派工单
+        if ("1".equals(req.getQueryType())) {
+            // 全域督察员查询自己发起的工单
+            List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY);
+            if (userIds.contains(getLoginUserId())) {
+               userId = getLoginUserId();
+            }
+        }
         // 2. 查询工单列表
         List<AppWorkOrderSummaryVo> workOrderList = homepageSummaryMapper.countWorkOrder(
                 req.getQueryType(),
+                userId,
                 req.getBeginTime(),
                 req.getEndTime()
         );
@@ -603,6 +603,9 @@
             <if test='queryType != null and queryType == "1"'>
                 AND w.order_no LIKE 'IWO%'
             </if>
+            <if test="userId != null">
+                AND w.user_id = #{userId}
+            </if>
             <if test="beginTime != null and beginTime != ''">
                 AND w.create_time >= #{beginTime}
             </if>
+package com.zteits.urbanops.module.system.enums.common;
+
+/**
+ * @Classname CommonConstants
+ * @Description 公共静态参数
+ * @Date 2026/1/3 10:15
+ * @Created by wangqian
+ */
+public interface CommonConstants {
+
+   public static final String INSPECTOR_ROLE_KEY = "Inspector_global";
+
+}
@@ -2,6 +2,7 @@ package com.zteits.urbanops.module.workorder.controller.app.maininfo.vo;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +16,10 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
 @Data
 public class AppMainInfoPageReqVO extends PageParam {
+    @NotEmpty
+    @Schema(description = "查询类型", example = "0:全部工单 1:全域工单")
+    public String queryType;
+
     @Schema(description = "搜索类型:1 位置 2 工单名称 3 情况描述 4 工单编号", example = "1")
     private String type;
@@ -56,6 +61,9 @@ public class AppMainInfoPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private String endTime;
+    @Schema(description = "用户id", example = "12" , hidden = true)
+    private Long userId;
+
     /**
      * 组装时间：beginTime + endTime → createTime
      */
@@ -147,6 +147,10 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
         LambdaQueryWrapperX<MainInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
         // 不查询快速工单 → 订单类型 != "Q"
         queryWrapper.ne(MainInfoDO::getOrderType, "Q");
+        // 部派工单 → 工单编号以 "IWO" 开头
+        if ("1".equals(reqVO.getQueryType()) ) {
+            queryWrapper.likeRight(MainInfoDO::getOrderNo, "IWO");
+        }
         queryWrapper.eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerCompanyId())
                  .eqIfPresent(MainInfoDO::getCompanyId, reqVO.getCompanyId())
                 .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
@@ -155,6 +159,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .betweenIfPresent(MainInfoDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(MainInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
                 .likeIfPresent(MainInfoDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(MainInfoDO::getUserId, reqVO.getUserId())
                 .orderByDesc(MainInfoDO::getId);
         return selectPage(reqVO, queryWrapper);
     }
@@ -3,6 +3,8 @@ package com.zteits.urbanops.module.workorder.service.maininfo;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.common.util.object.ObjectUtils;
+import com.zteits.urbanops.module.system.api.permission.RoleApi;
+import com.zteits.urbanops.module.system.enums.common.CommonConstants;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoSaveReqVO;
 import com.zteits.urbanops.module.workorder.controller.app.maininfo.vo.AppMainInfoPageReqVO;
@@ -15,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.MAIN_INFO_NOT_EXISTS;
 /**
@@ -29,6 +32,10 @@ public class MainInfoServiceImpl implements MainInfoService {
     @Resource
     private MainInfoMapper mainInfoMapper;
+    @Resource
+    private RoleApi roleApi;
+
+
     @Override
     public Long createMainInfo(MainInfoSaveReqVO createReqVO) {
         // 插入
@@ -106,6 +113,15 @@ public class MainInfoServiceImpl implements MainInfoService {
                 pageReqVO.setOrderName(content);
             }
         }
+        //部派工单
+        if ("1".equals(pageReqVO.getQueryType())) {
+            //全域督察员查询自己发起的工单
+            List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY);
+            if (userIds.contains(getLoginUserId())) {
+                pageReqVO.setUserId(getLoginUserId());
+                pageReqVO.setWorkerCompanyId(null);
+            }
+        }
         return mainInfoMapper.selectPageExcludeQuickOrder(pageReqVO);
     }