From 63edade94bb54e20e622098ce096a66e7cb641cf Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: Fri, 11 Aug 2023 17:29:33 +0800
Subject: [PATCH] 巡检计划日历下指定天数打卡记录
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java | 2
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 14 ++++
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java | 2
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java | 2
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 139 +++++++++++++++++++++++++++++++++++++--------
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 12 +++
ard-work/src/main/resources/mapper/app/ArdAppPatrolpointRecordMapper.xml | 4 +
7 files changed, 147 insertions(+), 28 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 5dd4f92..0c428c8 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -218,10 +218,20 @@
* 巡检日历
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
- @ApiOperation("巡检日历")
+ @ApiOperation("管理端--巡检日历")
@PostMapping("recordMonth")
public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
return recordService.recordMonth(ardAppPatrolpointRecordParam);
}
+ /**
+ * 巡检日历
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
+ @ApiOperation("管理端--点击日历获取该记录下人员打卡记录")
+ @PostMapping("recordDetails")
+ public Results recordDetails(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
+ return recordService.recordDetails(ardAppPatrolpointRecordParam);
+ }
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
index ab30b47..e56d65d 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
@@ -55,6 +55,8 @@
private String recordImg;
+ private Integer pointsNum;
+
@TableField(exist = false)
private List<String> img;
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
index a029411..91cd123 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
@@ -51,6 +51,6 @@
*/
public int deleteArdAppPatrolplanById(String id);
-
+ List<ArdAppPatrolplan> shouldRecord(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java
index a7fa82c..90067e8 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java
@@ -60,4 +60,6 @@
* @return 结果
*/
public int deleteArdAppPatrolpointRecordByIds(String[] ids);
+
+// List<ArdAppPatrolpointRecord> maxNum();
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
index f518db1..bb94225 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
@@ -2,6 +2,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -9,14 +10,19 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecordImg;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointRecordImgMapper;
+import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,6 +49,15 @@
@Resource
private ArdAppPatrolplanMapper patrolplanMapper;
+
+ @Resource
+ private ArdAppPatroluserMapper userMapper;
+
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+ @Resource
+ private ArdAlarmpointsWellMapper wellMapper;
/**
* 查询app巡检计划记录
@@ -115,6 +130,14 @@
public Results record(ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
String id = IdUtils.simpleUUID();
ardAppPatrolpointRecord.setId(id);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ //查询该用户今天的打卡数据
+ QueryWrapper<ArdAppPatrolpointRecord> recordQueryWrapper = new QueryWrapper<>();
+ recordQueryWrapper.eq("plan_id", ardAppPatrolpointRecord.getPlanId())
+ .like("record_time", dateFormat.format(new Date()))
+ .eq("user_id",ardAppPatrolpointRecord.getUserId());
+ List<ArdAppPatrolpointRecord> recordList = ardAppPatrolpointRecordMapper.selectList(recordQueryWrapper);
+ ardAppPatrolpointRecord.setPointsNum(recordList.size()+1);
int num = ardAppPatrolpointRecordMapper.insert(ardAppPatrolpointRecord);
List<String> list = ardAppPatrolpointRecord.getImg();
for (int i = 0; i < list.size(); i++) {
@@ -230,46 +253,110 @@
@Override
public Results recordDetails(ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
//获取参数
String planId = ardAppPatrolpointRecordParam.getPlanId();
String toDay = ardAppPatrolpointRecordParam.getToDay();
- Date toDayDate = dateFormat.parse(toDay);
//查询计划表
ArdAppPatrolplan ardAppPatrolplan = patrolplanMapper.selectById(planId);
String cycle = ardAppPatrolplan.getCycle();
String begin = ardAppPatrolplan.getPatroBeginTime();
- Date beginDate = dateFormat.parse(begin);
String end = ardAppPatrolplan.getPatroEndTime();
- Date endDate = dateFormat.parse(end);
String create = ardAppPatrolplan.getCreateTime();
- Date createDate = dateFormat.parse(create);
+ JSONArray jsonArray = new JSONArray();
+ int c = 0;
if(cycle.equals("day")){
-
+ //每天计划取创建时间
+ c = toDay.compareTo(create.substring(0,10));
}else if(cycle.equals("once")){
- int bd = toDayDate.compareTo(beginDate);
- int en = toDayDate.compareTo(endDate);
- if(bd>=0 && en<=0){
- //传入时间为该计划内时间
- String date = dateFormat.format(new Date());
- Date dateDate = dateFormat.parse(date);
- int d = toDayDate.compareTo(dateDate);
- if(d < 0) {
- //查询计划内的历史数据
- QueryWrapper<ArdAppPatrolpointRecord> recordQueryWrapper = new QueryWrapper<>();
- recordQueryWrapper.eq("plan_id", planId).like("record_time", toDay).groupBy("user_id");
- List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(recordQueryWrapper);
- return Results.succeed(list);
- }else if(d > 0){
- //查询计划内的未来数据
- QueryWrapper<ArdAppPatroluser> appPatroluserQueryWrapper = new QueryWrapper<>();
- appPatroluserQueryWrapper.eq("patrolplan_id",planId).groupBy("app_user_id");
-
+ //单次计划取开始时间
+ c = toDay.compareTo(begin.substring(0,10));
+ }
+ if(cycle.equals("once") && c>0){
+ //单次计划大于开始时间==跨天，在计划时间外
+ return Results.succeed("[]");
+ }
+ if(c<0){
+ //每日计划小于创建时间或单次计划小于开始时间，在计划时间外
+ return Results.succeed("[]");
+ }else{
+ //在每日计划的时间范围内
+ String date = dateFormat.format(new Date());
+ //比较选中的日期和今天日期
+ int d = toDay.compareTo(date);
+ //查询该计划的所有人员
+ List<SysUser> users = sysUserMapper.userByPlanId(planId);
+ //大于0代表查询以后的记录
+ if(d>0){
+ //查询计划内的每日未来数据
+ for (int i = 0; i < users.size(); i++) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("userId",users.get(i).getUserId());
+ jsonObject.put("userName",users.get(i).getNickName());
+ jsonObject.put("type",false);
+ jsonArray.add(jsonObject);
}
- }else {
- return Results.succeed("[]");
+ return Results.succeed(jsonArray);
+ }else{
+ //查询计划内的实际历史打卡数据
+ QueryWrapper<ArdAppPatrolpointRecord> recordQueryWrapper = new QueryWrapper<>();
+ if(d<0){
+ //小于0是历史
+ recordQueryWrapper.select("max(points_num) pointsNum","user_id","user_name").eq("plan_id", planId).like("record_time", toDay).groupBy("user_id","user_name");
+ }else{
+ //等于0选中的日期就是今天，需要进一步判断小于当前时分秒的记录
+ recordQueryWrapper.select("max(points_num) pointsNum","user_id","user_name").eq("plan_id", planId).le("record_time", dateFormatTime.format(new Date())).groupBy("user_id","user_name");;
+ }
+ List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(recordQueryWrapper);
+ //选中这天该计划下没有任何打卡记录
+ if(list.size()==0){
+ for (int i = 0; i < users.size(); i++) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("userId",users.get(i).getUserId());
+ jsonObject.put("userName",users.get(i).getNickName());
+ jsonObject.put("type",false);
+ jsonArray.add(jsonObject);
+ }
+ return Results.succeed(jsonArray);
+ }
+ //查询该计划的所有兴趣点
+ List<ArdAlarmpointsWell> wellList = wellMapper.wellByPlanId(planId);
+ Integer wellNum = wellList.size();
+ //取出所有打了卡的userId
+ List<String> userIdList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ userIdList.add(list.get(i).getUserId());
+ }
+ //有打卡记录时的打卡情况查出一次都没打卡的人员
+ for (int i = 0; i < users.size(); i++) {
+ String userId = users.get(i).getUserId();
+ String userName = users.get(i).getNickName();
+ //如果该计划的所有人员userId不在所有打了卡的userId中
+ if (!userIdList.contains(userId)) {
+ //记录该人员未完成打卡
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("userId", userId);
+ jsonObject.put("userName", userName);
+ jsonObject.put("type", false);
+ jsonArray.add(jsonObject);
+ continue;
+ }
+ }
+ //全部打完卡或打了部分卡的人员
+ for (ArdAppPatrolpointRecord ardAppPatrolpointRecord : list) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("userId", ardAppPatrolpointRecord.getUserId());
+ jsonObject.put("userName", ardAppPatrolpointRecord.getUserName());
+ if (ardAppPatrolpointRecord.getPointsNum().equals(wellNum)) {
+ jsonObject.put("type", true);
+ } else {
+ jsonObject.put("type", false);
+ }
+ jsonArray.add(jsonObject);
+ }
+ return Results.succeed(jsonArray);
}
}
- return Results.succeed();
}
}
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 05d1447..2e0a218 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -109,4 +109,18 @@
<delete id="deleteArdAppPatrolplanById" parameterType="String">
delete from ard_app_patrolplan aap where aap.id = #{id};
</delete>
+
+ <select id="shouldRecord" parameterType="String" resultMap="ArdAppPatrolplanResult">
+ select
+ ard_app_patrolplan.id,
+ well.alarmpoints_id wellId,
+ users.app_user_id pUser,
+ sys_user.nick_name
+ from
+ ard_app_patrolplan
+ left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
+ left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
+ left join sys_user on users.app_user_id = sys_user.user_id
+ where ard_app_patrolplan.id = #{id} and del_name is null and del_time is null
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointRecordMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointRecordMapper.xml
index 059380a..64e943b 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointRecordMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointRecordMapper.xml
@@ -79,4 +79,8 @@
#{id}
</foreach>
</delete>
+
+<!-- <select id="maxNum">-->
+<!-- select user_id,user_name,max(points_num) pointsNum from ard_app_patrolpoint_record GROUP BY user_id,user_name-->
+<!-- </select>-->
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3