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

颜惠青
2 parents bade5dcc ae0c1003
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.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/framework/datapermission/config/OrderDataPermissionConfiguration.java
@@ -31,6 +31,11 @@ public class MainInfoRespVO {
     @ExcelProperty("工单名称")
     private String orderName;
+    /**
+     * 工单类型 Q:快速工单,C:普通工单,O:其他工单
+     */
+    private String orderType;
+
     @Schema(description = "来源ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1828")
     @ExcelProperty("来源ID 问题来源  1、巡查，2、游客居民，3、12345，4、网格  5、大区经理")
     private Integer sourceId;
@@ -155,7 +155,7 @@ public class AssignTasksInfoController {
     //打回
-    @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
+    //@PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
     @Operation(summary = "派单任务-驳回")
     @PutMapping(value = "/reject")
     public CommonResult reject(@RequestBody AssignTasksInfoUpdReqVO assignTaskCompany) {
@@ -163,7 +163,7 @@ public class AssignTasksInfoController {
     }
     //催交
-    @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
+    //@PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:update')")
     @Operation(summary = "派单任务-催交")
     @PutMapping(value = "/submission")
     public CommonResult submission(@RequestBody AssignTasksInfoUpdReqVO assignTaskCompany) {
@@ -12,6 +12,9 @@ import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.*;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.util.StringUtils;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 工单信息 Mapper
  *
@@ -39,7 +42,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 }
             }
         });
-        queryWrapper.eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
+        queryWrapper.likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
                 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
                 .eqIfPresent(MainInfoDO::getRootCauseBy, reqVO.getRootCauseBy())
+package com.zteits.urbanops.module.workorder.framework.datapermission.config;
+
+import com.zteits.urbanops.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
+import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 订单模块的数据权限配置
+ * 每个模块独立配置，互不影响
+ */
+@Configuration(proxyBeanMethods = false)
+public class OrderDataPermissionConfiguration {
+
+    /**
+     * 注册订单模块的DeptDataPermissionRuleCustomizer
+     * 作用：给DeptDataPermissionRule添加订单模块表的字段配置
+     */
+    @Bean
+    public DeptDataPermissionRuleCustomizer orderDeptDataPermissionRuleCustomizer() {
+        // 入参rule是全局的DeptDataPermissionRule实例，添加本模块的配置
+        return rule -> {
+            // 1. 工单表：MainInfoDO，部门字段默认dept_id
+            rule.addDeptColumn(MainInfoDO.class); // 默认映射表的dept_id字段
+        };
+    }
+
+}