feat: 本部门保修单、报修单大厅、我的报修单、我的维修单

src/main/java/com/glxp/api/controller/auth/DeptUserController.java

@@ -57,6 +57,25 @@ public class DeptUserController {
         return ResultVOUtils.success(deptEntityPageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/auth/dept/user/list")
+    public BaseResponse filterListByDeptCode(FilterDeptUserReqeust filterDeptUserReqeust) {
+        //获取部门id
+        String idByCode = filterDeptUserReqeust.getDeptCode();
+        DeptEntity deptEntity = deptService.selectByCode(idByCode);
+        if (deptEntity.getLevel() == 1) {
+            filterDeptUserReqeust.setDeptId(null);
+        } else {
+            filterDeptUserReqeust.setDeptId(deptEntity.getId());
+        }
+        List<DeptUserResponse> deptEntityList = deptUserService.selectJoinDeptUser(filterDeptUserReqeust);
+        PageInfo<DeptUserResponse> pageInfo = new PageInfo<>(deptEntityList);
+        PageSimpleResponse<DeptUserResponse> deptEntityPageSimpleResponse = new PageSimpleResponse<>();
+        deptEntityPageSimpleResponse.setTotal(pageInfo.getTotal());
+        deptEntityPageSimpleResponse.setList(deptEntityList);
+        return ResultVOUtils.success(deptEntityPageSimpleResponse);
+    }
+
 
     @AuthRuleAnnotation("")
     @PostMapping("udi/auth/dept/user/delete")

src/main/java/com/glxp/api/entity/auth/DeptEntity.java

@@ -33,5 +33,6 @@ public class DeptEntity {
     private String thirdId4;
 
     private boolean spUse;
+    private boolean maintenance;
 
 }

src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java

@@ -73,6 +73,11 @@ public class DeviceRepairEntity {
      */
     @TableField(value = "repairUserName")
     private String repairUserName;
+    /**
+     * 维修部门
+     */
+    @TableField(value = "repairDeptCode")
+    private String repairDeptCode;
 
     /**
      * 维修人联系方式
@@ -247,4 +252,4 @@ public class DeviceRepairEntity {
      */
     @TableField(value = "confirmRemark")
     private String confirmRemark;
-}
+}

src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java

@@ -8,5 +8,6 @@ public class FilterDeptUserReqeust extends ListPageRequest {
     private Long deptId;
     private Long userId;
     private String deptName;
+    private String deptCode;
     private String key;
 }

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -33,4 +33,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String subordinateCode;//下级
     private String superiorPcode;//上级
     private Integer type;
+    private Boolean maintenance;
 }

src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java

@@ -14,7 +14,7 @@ public class DeviceInfoDetailQuery extends ListPageRequest {
     @NotNull(message = "缺少必要参数")
     private DeviceStatusEnum status;
 
-    @NotNull(message = "缺少必要参数")
+//    @NotNull(message = "缺少必要参数")
     private Boolean checkLock;
 
     /**
@@ -26,7 +26,7 @@ public class DeviceInfoDetailQuery extends ListPageRequest {
     /**
      * 设备id
      */
-    @NotNull(message = "缺少必要参数")
+//    @NotNull(message = "缺少必要参数")
     private Long productId;
 
     /**

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java

@@ -26,6 +26,8 @@ public class DeviceRepairApplyDetailDiagnosisParam {
 
     String repairUserName;
 
+    String repairDeptCode;
+
     String repairUserPhone;
 
     public void valid() {
@@ -33,6 +35,9 @@ public class DeviceRepairApplyDetailDiagnosisParam {
             if (innerFlag == null) {
                 throw new JsonException("请选择维修方式");
             }
+            if (StrUtil.isBlank(repairDeptCode)) {
+                throw new JsonException("维修部门不能为空");
+            }
             if (StrUtil.isBlank(repairUserName)) {
                 throw new JsonException("维修人姓名不能为空");
             }
@@ -43,6 +48,7 @@ public class DeviceRepairApplyDetailDiagnosisParam {
             innerFlag = null;
             repairUserName = null;
             repairUserPhone = null;
+            repairDeptCode = null;
         }
     }
 

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyQuery.java

@@ -24,4 +24,13 @@ public class DeviceRepairApplyQuery extends ListPageRequest {
      */
     Long confirmUserId;
 
+    /**
+     * 受理信息
+     */
+    String acceptInfo;
+    /**
+     * 报修信息
+     */
+    String repairInfo;
+
 }

src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java

@@ -26,4 +26,5 @@ public class InvSubWarehouseResponse {
 
     private Boolean lyInvType;
     private Boolean sgInvType;
+    private Boolean maintenance;
 }

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java

@@ -87,7 +87,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
                     .setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName())
                     .setCreateDeptCode(user.getLocDeptCode()).setCreateDeptName(user.getDeptName())
                     .setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
-                    .setRepairUserName(param.getRepairUserName()).setRepairUserPhone(param.getRepairUserPhone())
+                    .setRepairUserName(param.getRepairUserName()).setRepairUserPhone(param.getRepairUserPhone()).setRepairDeptCode(param.getRepairDeptCode())
             ;
             deviceRepairService.createRepair(repairEntity);
         }

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java

@@ -1,6 +1,8 @@
 package com.glxp.api.service.dev.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -24,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -43,16 +46,43 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
 
     @Override
     public List<DeviceRepairApplyEntity> pageList(DeviceRepairApplyQuery query) {
+        String acceptInfo = query.getAcceptInfo();
+        String repairInfo = query.getRepairInfo();
         if (query.getPage() != null) {
             PageHelper.startPage(query.getPage(), query.getLimit());
         }
-        List<DeviceRepairApplyEntity> list = super.list(Wrappers.lambdaQuery(DeviceRepairApplyEntity.class)
+        LambdaQueryWrapper<DeviceRepairApplyEntity> wrapper = Wrappers.lambdaQuery(DeviceRepairApplyEntity.class);
-                .eq(query.getApplyId() != null, DeviceRepairApplyEntity::getId, query.getApplyId())
+        wrapper.eq(query.getApplyId() != null, DeviceRepairApplyEntity::getId, query.getApplyId())
                 .eq(query.getStatus() != null, DeviceRepairApplyEntity::getStatus, query.getStatus())
                 .eq(query.getConfirmUserId() != null, DeviceRepairApplyEntity::getConfirmUserId, query.getConfirmUserId())
                 .eq(StrUtil.isNotBlank(query.getApplyDeptCode()), DeviceRepairApplyEntity::getApplyDeptCode, query.getApplyDeptCode())
-                .orderByDesc(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyEntity::getApplyTime)
+                .orderByDesc(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyEntity::getApplyTime);
-        );
+        if (StringUtils.isNotBlank(acceptInfo)){
+            wrapper.and(warpper->warpper.like(DeviceRepairApplyEntity::getConfirmDeptCode, acceptInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getConfirmDeptName, acceptInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getConfirmUserId, acceptInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getConfirmUserName, acceptInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getConfirmPhone, acceptInfo));
+        }
+        if (StringUtils.isNotBlank(repairInfo)){
+            wrapper.and(warpper->warpper.like(DeviceRepairApplyEntity::getApplyDeptCode, repairInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getApplyDeptName, repairInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getApplyUserId, repairInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getApplyUserName, repairInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getApplyUserPhone, repairInfo)
+                    .or()
+                    .like(DeviceRepairApplyEntity::getId, repairInfo));
+        }
+
+        List<DeviceRepairApplyEntity> list = super.list(wrapper);
         return list;
     }
 

src/main/resources/mybatis/mapper/auth/DeptDao.xml

@@ -38,6 +38,9 @@
             <if test="spUse != null">
                 AND a.spUse = #{spUse}
             </if>
+            <if test="maintenance != null">
+                AND a.maintenance = #{maintenance}
+            </if>
 
         </where>
 
@@ -197,7 +200,7 @@
         replace
         INTO auth_dept
         (id,pid, code, `name`, advanceType, isDefault,
-        status, updateTime, remark,`level`,pcode,spUse, thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
+        status, updateTime, remark,`level`,pcode,spUse, thirdId, thirdId1, thirdId2, thirdId3, thirdId4,maintenance)
         values (
         #{id},
         #{pid},
@@ -215,7 +218,8 @@
         #{thirdId1},
         #{thirdId2},
         #{thirdId3},
-        #{thirdId4}
+        #{thirdId4},
+        #{maintenance}
         )
     </insert>
 
@@ -245,6 +249,7 @@
             <if test="thirdId3 != null">remark=#{thirdId3},</if>
             <if test="thirdId4 != null">remark=#{thirdId4},</if>
             <if test="spUse != null">spUse=#{spUse},</if>
+            <if test="maintenance != null">maintenance=#{maintenance},</if>
 
 
         </trim>

src/main/resources/schemas/schema_v2.4.sql

@@ -2462,6 +2462,20 @@ CALL Pro_Temp_ColumnWork('device_info', 'assetReserveType',
 
 CALL Pro_Temp_ColumnWork('device_plan', 'status', 'tinyint    NULL DEFAULT NULL COMMENT ''设备巡检计划状态 ：1：草稿；2.已提交''', 1);
 
+INSERT ignore INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
+                             `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+                             VALUES (2094, '我的报修单', 1703, 11, '/dev/deviceRepairApplyMy', 'dev/deviceRepairApplyMy',
+                                     NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-11-29 18:00:49', NULL, NULL, NULL);
+
+
+CALL Pro_Temp_ColumnWork('auth_dept', 'maintenance',
+                         ' tinyint(0) ZEROFILL NULL COMMENT''是否为维修部门''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('device_repair', 'repairDeptCode',
+                         'varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修部门''',
+                         1);
+
 
 
 CALL Pro_Temp_ColumnWork('device_check_detail', 'normalFlag', 'tinyint    NULL DEFAULT NULL COMMENT ''巡检状态 ：0：异常；1.正常''', 1);