pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoBa.BaUser; import com.dy.pipIrrGlobal.voBa.VoRoleSimple; import com.dy.pipIrrGlobal.voBa.VoSimpleUser; import com.dy.pipIrrGlobal.voBa.VoUserInfo; import org.apache.ibatis.annotations.Mapper; @@ -145,4 +146,10 @@ */ List<VoSimpleUser> getSimpleUsers(); /** * 获取巡检员列表 * @param inspector * @return */ List<VoRoleSimple> getInspectors(@Param("inspector") String inspector); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRoleSimple.java
New file @@ -0,0 +1,31 @@ package com.dy.pipIrrGlobal.voBa; import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.writer.ObjectWriterImplToString; import com.dy.common.po.BaseEntity; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; /** * @author ZhuBaoMin * @date 2024-11-29 15:02 * @LastEditTime 2024-11-29 15:02 * @Description 角色简单视图对象,获取巡检员使用 */ @Data @JsonPropertyOrder({"inspectorId", "inspector"}) public class VoRoleSimple implements BaseEntity { public static final long serialVersionUID = 202411291506001L; /** * 巡检员ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) private Long inspectorId; /** * 巡检员姓名 */ private String inspector; } pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -380,4 +380,21 @@ WHERE disabled = 0 AND deleted = 0 </select> <!--获取巡检员列表--> <select id="getInspectors" resultType="com.dy.pipIrrGlobal.voBa.VoRoleSimple"> SELECT us.id AS inspectorId, us.name AS inspector FROM ba_user us INNER JOIN ba_user_role ur ON ur.userId = us.id INNER JOIN ba_role rol ON rol.id = ur.roleId <where> AND us.disabled = 0 AND us.deleted = 0 AND rol.`name` = '巡检员' <if test = "inspector != null and inspector !=''"> AND us.name LIKE CONCAT('%',#{inspector},'%') </if> </where> </select> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
@@ -14,6 +14,7 @@ import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult; import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult; import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder; import com.dy.pipIrrGlobal.voBa.VoRoleSimple; import com.dy.pipIrrGlobal.voOp.VoProcessingResult; import com.dy.pipIrrGlobal.voOp.VoTaskType; import com.dy.pipIrrGlobal.voOp.VoWorkOrder; @@ -281,4 +282,20 @@ return BaseResponseUtils.buildException(e.getMessage()); } } /** * 获取巡检员列表 * @param inspector * @return */ @GetMapping(path = "/getInspectors") @SsoAop() public BaseResponse<List<VoRoleSimple>> getInspectors(@RequestParam("inspector") String inspector) { try { return BaseResponseUtils.buildSuccess(workOrderSv.getInspectors(inspector)); } catch (Exception e) { log.error("获取任务类型异常", e); return BaseResponseUtils.buildException(e.getMessage()); } } } pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
@@ -2,6 +2,7 @@ import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder; import com.dy.pipIrrGlobal.daoBa.BaUserMapper; import com.dy.pipIrrGlobal.daoOp.OpeApproveResultMapper; import com.dy.pipIrrGlobal.daoOp.OpeProcessingResultMapper; import com.dy.pipIrrGlobal.daoOp.OpeTaskTypeMapper; @@ -9,6 +10,7 @@ import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult; import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult; import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder; import com.dy.pipIrrGlobal.voBa.VoRoleSimple; import com.dy.pipIrrGlobal.voOp.VoProcessingResult; import com.dy.pipIrrGlobal.voOp.VoTaskType; import com.dy.pipIrrGlobal.voOp.VoWorkOrder; @@ -42,6 +44,9 @@ @Autowired private OpeTaskTypeMapper opeTaskTypeMapper; @Autowired private BaUserMapper baUserMapper; /** * 添加工单记录 @@ -240,4 +245,13 @@ public List<VoTaskType> getTaskTypes() { return opeTaskTypeMapper.getTaskTypes(); } /** * 获取巡检员列表 * @param inspector * @return */ public List<VoRoleSimple> getInspectors(String inspector) { return baUserMapper.getInspectors(inspector); } }