BJ_FS / urbanops

Commit 583e08e6554b319268994992250587f0bd87f146

Authored by 颜惠青
2 parents bade5dcc ae0c1003

Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

Inline Side-by-side
Showing 4 changed files with 39 additions and 3 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java
  View file @583e08e
... ... @@ -31,6 +31,11 @@ public class MainInfoRespVO {
31 31 @ExcelProperty("工单名称")
32 32 private String orderName;
33 33  
  34 + /**
  35 + * 工单类型 Q:快速工单,C:普通工单,O:其他工单
  36 + */
  37 + private String orderType;
  38 +
34 39 @Schema(description = "来源ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1828")
35 40 @ExcelProperty("来源ID 问题来源 1、巡查，2、游客居民，3、12345，4、网格 5、大区经理")
36 41 private Integer sourceId;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
  View file @583e08e
... ... @@ -155,7 +155,7 @@ public class AssignTasksInfoController {
155 155  
156 156  
157 157 //打回
158   - @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
  158 + //@PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
159 159 @Operation(summary = "派单任务-驳回")
160 160 @PutMapping(value = "/reject")
161 161 public CommonResult reject(@RequestBody AssignTasksInfoUpdReqVO assignTaskCompany) {
... ... @@ -163,7 +163,7 @@ public class AssignTasksInfoController {
163 163 }
164 164  
165 165 //催交
166   - @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
  166 + //@PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
167 167 @Operation(summary = "派单任务-催交")
168 168 @PutMapping(value = "/submission")
169 169 public CommonResult submission(@RequestBody AssignTasksInfoUpdReqVO assignTaskCompany) {
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
  View file @583e08e
... ... @@ -12,6 +12,9 @@ import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.*;
12 12 import org.apache.poi.ss.formula.functions.T;
13 13 import org.springframework.util.StringUtils;
14 14  
  15 +import java.util.Collection;
  16 +import java.util.List;
  17 +
15 18 /**
16 19 * 工单信息 Mapper
17 20 *
... ... @@ -39,7 +42,7 @@ public interface MainInfoMapper extends BaseMapperX<MainInfoDO> {
39 42 }
40 43 }
41 44 });
42   - queryWrapper.eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
  45 + queryWrapper.likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
43 46 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
44 47  
45 48 .eqIfPresent(MainInfoDO::getRootCauseBy, reqVO.getRootCauseBy())
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/framework/datapermission/config/OrderDataPermissionConfiguration.java 0 → 100644
  View file @583e08e
  1 +package com.zteits.urbanops.module.workorder.framework.datapermission.config;
  2 +
  3 +import com.zteits.urbanops.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
  4 +import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
  5 +import org.springframework.context.annotation.Bean;
  6 +import org.springframework.context.annotation.Configuration;
  7 +
  8 +/**
  9 + * 订单模块的数据权限配置
  10 + * 每个模块独立配置，互不影响
  11 + */
  12 +@Configuration(proxyBeanMethods = false)
  13 +public class OrderDataPermissionConfiguration {
  14 +
  15 + /**
  16 + * 注册订单模块的DeptDataPermissionRuleCustomizer
  17 + * 作用：给DeptDataPermissionRule添加订单模块表的字段配置
  18 + */
  19 + @Bean
  20 + public DeptDataPermissionRuleCustomizer orderDeptDataPermissionRuleCustomizer() {
  21 + // 入参rule是全局的DeptDataPermissionRule实例，添加本模块的配置
  22 + return rule -> {
  23 + // 1. 工单表：MainInfoDO，部门字段默认dept_id
  24 + rule.addDeptColumn(MainInfoDO.class); // 默认映射表的dept_id字段
  25 + };
  26 + }
  27 +
  28 +}
... ...