mirror of
https://gitee.com/elegant_wings/dbd-meeting.git
synced 2025-06-21 17:09:36 +08:00
工单检索及楼层管理员列表、无效工单列表
This commit is contained in:
lujiang
parent
3787fe83a2
commit
0bacded2eb
@ -78,12 +78,15 @@ public class RepairController extends BaseController {
|
||||
|
||||
/**
|
||||
* 工单列表
|
||||
* menu:1.报修查询，3派单入口，5维修入口, 7 管理员
|
||||
* menu:1.报修查询，3派单入口，5维修入口, 7 管理员,9 楼层管理员
|
||||
* <p>
|
||||
* 报修查询：全部、处理中、待评价、已评价 type对应值：all、process、evaling、evaled
|
||||
* 派单入口：重新派单、待派单、已派单、已关闭 type对应值：anew、wait、already、close
|
||||
* 报修查询：全部、处理中、待评价、已评价、无效申请 type对应值：all、process、evaling、evaled、invalid
|
||||
* 派单入口：重新派单、待派单、已派单、已关闭（无效申请） type对应值：anew、wait、already、close
|
||||
* 维修入口：待完成、进行中、已完成 type对应值：wait、working、close
|
||||
* 管理员：重派单，全部 type对应值：anew、all 【小程序暂时用不到】
|
||||
* 管理员：重派单，全部，无效申请 type对应值：anew、all、invalid 【小程序暂时用不到】
|
||||
* 楼层管理员：全部、无效申请 type对应值：all、invalid
|
||||
*
|
||||
* name : 工单名称搜索关键字
|
||||
* </p>
|
||||
*/
|
||||
@RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR)
|
||||
@ -91,10 +94,11 @@ public class RepairController extends BaseController {
|
||||
public R list(@RequestBody Map<String, String> map) {
|
||||
String type = map.get("type");
|
||||
String menu = map.get("menu");
|
||||
String repairName = map.get("name");
|
||||
if (StringUtils.isBlank(type) || StringUtils.isBlank(menu)) return R.error();
|
||||
startPage();
|
||||
Long userId = getLoginStaffId();
|
||||
return result(repairService.repairList(menu, userId.toString(), type));
|
||||
return result(repairService.repairList(menu, userId.toString(), type, repairName));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -47,7 +47,7 @@ public class RepairStatsController extends BaseController {
|
||||
@RequestMapping("oneWorkerList")
|
||||
public R oneWorkerList(String workerId) {
|
||||
startPage();
|
||||
return result(repairService.repairList("5", workerId, ""));
|
||||
return result(repairService.repairList("5", workerId, "", null));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -22,14 +22,13 @@ public interface RepairMapper {
|
||||
*/
|
||||
Repair selectRepairById(Long id);
|
||||
|
||||
List<Repair> normalRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
|
||||
|
||||
List<Repair> normalRepairList(@Param("userId") String userId, @Param("type") String type);
|
||||
List<Repair> preRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
|
||||
|
||||
List<Repair> preRepairList(@Param("userId") String userId, @Param("type") String type);
|
||||
List<Repair> workRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
|
||||
|
||||
List<Repair> workRepairList(@Param("userId") String userId, @Param("type") String type);
|
||||
|
||||
List<Repair> adminRepairList(@Param("userId") String userId, @Param("type") String type);
|
||||
List<Repair> adminRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
|
||||
|
||||
/**
|
||||
* 维修工 工单 数量统计
|
||||
@ -41,10 +40,10 @@ public interface RepairMapper {
|
||||
|
||||
/**
|
||||
* 楼层管理管工单列表
|
||||
* @param floorerId 管理员id
|
||||
* @param floorerId 楼层管理员id
|
||||
* @return
|
||||
*/
|
||||
List<Repair> floorRepairList(@Param("floorerId")String floorerId);
|
||||
List<Repair> floorRepairList(@Param("floorerId") String floorerId, @Param("type") String type, @Param("repairName") String repairName);
|
||||
/**
|
||||
* 新增工单
|
||||
*
|
||||
|
||||
@ -39,7 +39,7 @@ public interface IRepairService {
|
||||
* @param menu 1.普通用户，3派单员，5维修人, 7管理员
|
||||
* 查询工单列表
|
||||
*/
|
||||
List<Repair> repairList(String menu, String userId, String type);
|
||||
List<Repair> repairList(String menu, String userId, String type ,String repairName);
|
||||
|
||||
/**
|
||||
* 获取维修人员工单数量
|
||||
|
||||
@ -337,13 +337,14 @@ public class RepairServiceImpl implements IRepairService {
|
||||
* 查询工单列表
|
||||
*/
|
||||
@Override
|
||||
public List<Repair> repairList(String menu, String userId, String type) {
|
||||
public List<Repair> repairList(String menu, String userId, String type, String repairName) {
|
||||
List<Repair> list = null;
|
||||
//1.普通用户，3派单员，5维修人, 7管理员
|
||||
if ("7".equals(menu)) list = repairMapper.adminRepairList(userId, type);
|
||||
if ("5".equals(menu)) list = repairMapper.workRepairList(userId, type);
|
||||
if ("3".equals(menu)) list = repairMapper.preRepairList(userId, type);
|
||||
if ("1".equals(menu)) list = repairMapper.normalRepairList(userId, type);
|
||||
//1.普通用户，3派单员，5维修人, 7管理员 ,9楼层管理员
|
||||
if ("9".equals(menu)) list = repairMapper.floorRepairList(userId, type, repairName);
|
||||
if ("7".equals(menu)) list = repairMapper.adminRepairList(userId, type, repairName);
|
||||
if ("5".equals(menu)) list = repairMapper.workRepairList(userId, type, repairName);
|
||||
if ("3".equals(menu)) list = repairMapper.preRepairList(userId, type, repairName);
|
||||
if ("1".equals(menu)) list = repairMapper.normalRepairList(userId, type, repairName);
|
||||
if (list != null && list.size() > 0) {
|
||||
for (Repair repair : list) {
|
||||
if (repair.getPerUserId() != null && repair.getPerUserId() > 0) {
|
||||
@ -381,7 +382,7 @@ public class RepairServiceImpl implements IRepairService {
|
||||
|
||||
@Override
|
||||
public List<Repair> floorRepairList(String floorerId) {
|
||||
return repairMapper.floorRepairList(floorerId);
|
||||
return repairMapper.floorRepairList(floorerId, "all", null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -209,6 +209,8 @@
|
||||
<if test="type == 'process'">and status <![CDATA[ < ]]> 9 </if>
|
||||
<if test="type == 'evaling'">and status = 9</if>
|
||||
<if test="type == 'evaled'">and status = 13</if>
|
||||
<if test="type == 'invalid'">and status = 11</if>
|
||||
<if test="repairName != null and repairName != ''"> AND repair_name LIKE CONCAT('%', #{repairName}, '%')</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
<!--派单员-->
|
||||
@ -219,6 +221,7 @@
|
||||
<if test="type == 'wait'">and status = 1</if>
|
||||
<if test="type == 'already'">and status <![CDATA[ > ]]> 3 and status <![CDATA[ <> ]]> 11</if>
|
||||
<if test="type == 'close'">and status = 11</if>
|
||||
<if test="repairName != null and repairName != ''"> AND repair_name LIKE CONCAT('%', #{repairName}, '%')</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
<!--维修人员-->
|
||||
@ -228,6 +231,7 @@
|
||||
<if test="type == 'wait'">and status = 5</if>
|
||||
<if test="type == 'working'">and status = 7</if>
|
||||
<if test="type == 'close'">and (status = 9 or status = 13)</if>
|
||||
<if test="repairName != null and repairName != ''"> AND repair_name LIKE CONCAT('%', #{repairName}, '%')</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
<!--管理员-->
|
||||
@ -235,7 +239,9 @@
|
||||
<include refid="selectRepairVo"/>
|
||||
where delete_flag = 0
|
||||
<if test="type == 'anew'">and status = 3</if>
|
||||
<if test="type == 'invalid'">and status = 11</if>
|
||||
<if test="type == 'all'"></if>
|
||||
<if test="repairName != null and repairName != ''"> AND repair_name LIKE CONCAT('%', #{repairName}, '%')</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
@ -254,6 +260,9 @@
|
||||
ics_repair rep,ics_repair_address_floor floor
|
||||
where
|
||||
rep.delete_flag=0 and floor.delete_flag=0 and floor.id=rep.floor_id and floor.admin_id= #{floorerId}
|
||||
<if test="type == 'invalid'">and rep.status = 11</if>
|
||||
<if test="type == 'all'"></if>
|
||||
<if test="repairName != null and repairName != ''"> AND rep.repair_name LIKE CONCAT('%', #{repairName}, '%')</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user