打卡记录修改

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/inspectionslog/InspectionsLogServiceImpl.java

@@ -162,7 +162,7 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
                 }
 
 
-                item.setUserList(this.getInspectionsLogAppListVO2(item.getId()));
+                item.setUserList(this.getInspectionsLogAppListVO(item.getId()));
             });
         }
 
@@ -170,47 +170,7 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
         return inspectionsLogDOPageResult;
     }
 
-
-    //封装
-    public List<InspectionsLogAppListVO> getInspectionsLogAppListVO2(Long insId) {
-        List<InspectionsLogAppListVO> appListVO = new ArrayList<>();
-
-        //取最新一条签到状态
-        LambdaQueryWrapper<InspectionsLogDO> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(InspectionsLogDO::getStatus, 1);
-        wrapper.eq(InspectionsLogDO::getInspectionsId, insId);
-        wrapper.orderByDesc(InspectionsLogDO::getCreateTime);
-        final List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper);
-
-        if (list != null) {
-            final Long id = list.get(0).getId();
-            final List<SignInLogDO> signInLog = this.getSignInLog(id);
-            if (signInLog != null && signInLog.size() > 0) {
-                signInLog.forEach(signInLogDO->{
-                    final AdminUserDO user = adminUserService.getUser(signInLogDO.getUserId());
-                    if (user == null) {
-                        throw exception(USER_NOT_EXISTS);
-                    }
-                    InspectionsLogAppListVO appListVO1 = new InspectionsLogAppListVO();
-                    appListVO1.setRealName(signInLogDO.getRealName());
-                    appListVO1.setTime(signInLogDO.getCreateTime());
-                    appListVO1.setUserId(signInLogDO.getUserId());
-                    appListVO1.setIsInspect(signInLogDO.getIsInspect());
-                    final DeptDO dept = deptService.getDept(user.getDeptId());
-                    if (dept != null) {
-                        appListVO1.setDeptName(dept.getName());
-                    }
-                    appListVO1.setAvtar(user.getAvatar());
-                    appListVO.add(appListVO1);
-                });
-            }
-        }
-
-
-        return appListVO;
-    }
-
-
+    
     //封装
     public List<InspectionsLogAppListVO> getInspectionsLogAppListVO(Long insId) {
         List<InspectionsLogAppListVO> appListVO = new ArrayList<>();
@@ -246,12 +206,15 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
         wrapper.eq("inspections_id", pageReqVO.getInspectionsId());
         final List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper);
         if (list != null && list.size() > 0) {
-            //把签到记录起来
-            List<InspectionsLogAppListVO> appListVO = new ArrayList<>();
             list.forEach(item->{
                 if (item.getStatus() != null && item.getStatus() == 1) {
-                    final List<InspectionsLogAppListVO> inspectionsLogAppListVO2 = this.getInspectionsLogAppListVO2(item.getInspectionsId());
-                    if (inspectionsLogAppListVO2 != null) {}
+                    final List<InspectionsLogAppListVO> inspectionsLogAppListVO = this.getInspectionsLogAppListVO(item.getId());
+                    if (inspectionsLogAppListVO != null) {
+                        List<String> inspectCollect = inspectionsLogAppListVO.stream().filter(item2 -> item2.getIsInspect() == true).map(map3 -> map3.getRealName()).collect(Collectors.toList());
+                        item.setCooperateWithName(String.join(",", inspectCollect));
+                        List<String> withCollect = inspectionsLogAppListVO.stream().filter(item2 -> item2.getIsInspect() == false).map(map3 -> map3.getRealName()).collect(Collectors.toList());
+                        item.setInspectName(String.join(",", withCollect));
+                    }
                 }
             });
 
@@ -346,10 +309,35 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
             throw exception(SIGN_IN_LOG_ERROR5);
         }
 
+        //修改执行记录状态 添加日志表  方便查询    当前最新的一定是签到  查询出签到记录  和执行记录一起再一次插入
+        final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(createReqVO.getInspectionsId());
+        if (inspectionsLogNew == null) {
+            throw exception(INSPECTIONS_LOG_NOT_EXISTS);
+        }
+
         InspectionsLogDO updateObj = BeanUtils.toBean(createReqVO, InspectionsLogDO.class);
         inspectionsLogMapper.insert(updateObj);
 
-        //修改执行记录状态
+
+
+        List<SignInLogDO> signInLogDOS = signInLogMapper.selectList(new QueryWrapper<SignInLogDO>().eq("ins_id", inspectionsLogNew.getId()));
+
+
+        if (signInLogDOS == null || signInLogDOS.size() > 0) {
+            List<SignInLogDO> newList = new ArrayList<>();
+            signInLogDOS.forEach(item-> {
+                //插入执行记录
+                SignInLogDO signInLogDO = new SignInLogDO();
+                signInLogDO.setInsId(updateObj.getId());
+                signInLogDO.setUserId(item.getUserId());
+                signInLogDO.setRealName(item.getRealName());
+                signInLogDO.setIsInspect(item.getIsInspect());
+                signInLogDO.setGpsLocation(item.getGpsLocation());
+                newList.add(signInLogDO);
+            });
+
+            signInLogMapper.insertBatch(newList);
+        }
 
     }