diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
index aa09deb..357ccee 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
@@ -78,12 +78,15 @@ public class RepairController extends BaseController {
/**
* 工单列表
- * menu:1.报修查询，3派单入口，5维修入口, 7 管理员
+ * menu:1.报修查询，3派单入口，5维修入口, 7 管理员,9 楼层管理员
*
- * 报修查询：全部、处理中、待评价、已评价 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 : 工单名称搜索关键字
*
*/
@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 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));
}
/**
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
index 4f9680e..de9b4d3 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
@@ -39,6 +39,16 @@ public class RepairRemindController extends BaseController {
return result(repairRemindService.getRepairRemindList(userId));
}
+ /**
+ * 读取最新5条未读工单提醒
+ */
+ @RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR)
+ @RequestMapping("latestList")
+ public R latestList() {
+ Long userId = getLoginStaffId();
+ return R.ok().put("data", repairRemindService.getLatestRepairRemind(userId, 5));
+ }
+
/**
* 工单提醒 变成已读
*/
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
index 5e2d581..4a5093e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
@@ -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));
}
/**
@@ -76,7 +76,8 @@ public class RepairStatsController extends BaseController {
@RequiresPermissions(value = {"repair:manage:operator"})
@RequestMapping("repairAdminStats")
public R repairAdminStats() {
- RepairAdminStatsVo repairAdminStatsVo = repairWorkerStatsService.repairAdminStats();
+ Long userId = getLoginStaffId();
+ RepairAdminStatsVo repairAdminStatsVo = repairWorkerStatsService.repairAdminStats(userId);
return R.ok().put("repairAdminStats", repairAdminStatsVo);
}
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java
index a7327c2..23b210f 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java
@@ -22,14 +22,13 @@ public interface RepairMapper {
*/
Repair selectRepairById(Long id);
+ List normalRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
- List normalRepairList(@Param("userId") String userId, @Param("type") String type);
+ List preRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
- List preRepairList(@Param("userId") String userId, @Param("type") String type);
+ List workRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
- List workRepairList(@Param("userId") String userId, @Param("type") String type);
-
- List adminRepairList(@Param("userId") String userId, @Param("type") String type);
+ List 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 floorRepairList(@Param("floorerId")String floorerId);
+ List floorRepairList(@Param("floorerId") String floorerId, @Param("type") String type, @Param("repairName") String repairName);
/**
* 新增工单
*
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
index 7ac4ff8..d70ae90 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
@@ -12,6 +12,7 @@ import com.ics.admin.domain.RepairRemind;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import javax.persistence.criteria.CriteriaBuilder;
import java.util.List;
/**
@@ -37,6 +38,15 @@ public interface RepairRemindMapper {
* @return 工单提醒集合
*/
List getRepairRemindByUserId(Long userId);
+
+ /**
+ * 获取最新几条未读提醒
+ *
+ * @param userId 用户id
+ * @param number 条数
+ * @return 工单提醒集合
+ */
+ List getLatestRepairRemind(@Param("userId") Long userId, @Param("number") Integer number);
/**
* 已读工单
* @param repairRemind
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java
index 4addadf..da6c93e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java
@@ -40,7 +40,7 @@ public interface RepairStatsMapper {
* 第一行 管理员 工单与 通知统计
* @return
*/
- List repairAdminStats();
+ List repairAdminStats(Long userId);
/**
* 第二、三行 工单统计、工单完成情况、评价情况
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
index 759213d..e76e50e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
@@ -27,6 +27,15 @@ public interface IRepairRemindService {
*/
List getRepairRemindList(Long userId);
+ /**
+ * 获取最新几条未读提醒
+ *
+ * @param userId 用户id
+ * @param number 条数
+ * @return 工单提醒集合
+ */
+ List getLatestRepairRemind(Long userId, Integer number);
+
/**
* 新增工单提醒
*
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java
index da0c6b0..cc9a095 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java
@@ -39,7 +39,7 @@ public interface IRepairService {
* @param menu 1.普通用户，3派单员，5维修人, 7管理员
* 查询工单列表
*/
- List repairList(String menu, String userId, String type);
+ List repairList(String menu, String userId, String type ,String repairName);
/**
* 获取维修人员工单数量
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java
index 567a9c4..bd71fe9 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java
@@ -38,7 +38,7 @@ public interface IRepairStatsService {
/**
* 第一行 管理员 工单与 通知统计
*/
- RepairAdminStatsVo repairAdminStats();
+ RepairAdminStatsVo repairAdminStats(Long userId);
/**
* 第二、三行 工单统计、工单完成情况、评价情况
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
index 8b41dba..140c949 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
@@ -53,6 +53,11 @@ public class RepairRemindServiceImpl implements IRepairRemindService {
return repairRemindMapper.insertRepairRemind(repairRemind);
}
+ @Override
+ public List getLatestRepairRemind(Long userId, Integer number) {
+ return repairRemindMapper.getLatestRepairRemind(userId, number);
+ }
+
/**
* 工单提醒 变为已读
*
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java
index 1e2432e..2817eb4 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java
@@ -337,13 +337,14 @@ public class RepairServiceImpl implements IRepairService {
* 查询工单列表
*/
@Override
- public List repairList(String menu, String userId, String type) {
+ public List repairList(String menu, String userId, String type, String repairName) {
List 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 floorRepairList(String floorerId) {
- return repairMapper.floorRepairList(floorerId);
+ return repairMapper.floorRepairList(floorerId, "all", null);
}
/**
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
index 17dcb4b..87bb6a5 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
@@ -55,8 +55,8 @@ public class RepairStatsServiceImpl implements IRepairStatsService {
}
@Override
- public RepairAdminStatsVo repairAdminStats() {
- List list = repairStatsMapper.repairAdminStats();
+ public RepairAdminStatsVo repairAdminStats(Long userId) {
+ List list = repairStatsMapper.repairAdminStats(userId);
if (list != null && list.size() > 0) return list.get(0);
return null;
}
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
index d259511..ea1d000 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
@@ -209,6 +209,8 @@
and status 9
and status = 9
and status = 13
+ and status = 11
+ AND repair_name LIKE CONCAT('%', #{repairName}, '%')
order by create_time desc
@@ -219,6 +221,7 @@
and status = 1
and status ]]> 3 and status ]]> 11
and status = 11
+ AND repair_name LIKE CONCAT('%', #{repairName}, '%')
order by create_time desc
@@ -228,6 +231,7 @@
and status = 5
and status = 7
and (status = 9 or status = 13)
+ AND repair_name LIKE CONCAT('%', #{repairName}, '%')
order by create_time desc
@@ -235,7 +239,9 @@
where delete_flag = 0
and status = 3
+ and status = 11
+ AND repair_name LIKE CONCAT('%', #{repairName}, '%')
order by create_time desc
@@ -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}
+ and rep.status = 11
+
+ AND rep.repair_name LIKE CONCAT('%', #{repairName}, '%')
order by create_time desc
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
index 3b75c67..159f5fd 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
@@ -33,6 +33,11 @@
where user_id=#{userId} and delete_flag=0 order by `read` asc,create_time desc
+
+