bug修改

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/InspectionTaskDetailBo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import org.dromara.common.translation.annotation.Translation;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.constant.TransConstant;
@@ -60,7 +62,7 @@ public class InspectionTaskDetailBo extends BaseEntity {
     /**
      * 实际巡检时间
      */
-    private Date actualInspectionTime;
+    private LocalDateTime actualInspectionTime;
 
     /**
      * 实际签到状态(1已签到2.未签到)
@@ -106,7 +108,7 @@ public class InspectionTaskDetailBo extends BaseEntity {
     /**
      * 实际巡检时间
      */
-    private Date inspectionTime;
+    private LocalDateTime inspectionTime;
 
     /**
      * 备注

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionTaskDetailVo.java

@@ -1,6 +1,8 @@
 package org.dromara.property.domain.vo;
 
 import org.dromara.common.translation.annotation.Translation;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.constant.TransConstant;
@@ -94,7 +96,7 @@ public class InspectionTaskDetailVo implements Serializable {
      * 实际巡检时间
      */
     @ExcelProperty(value = "实际巡检时间")
-    private Date actualInspectionTime;
+    private LocalDateTime actualInspectionTime;
 
     /**
      * 实际签到状态(1已签到2.未签到)

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.property.domain.CustomerContingenPlan;
 import org.dromara.property.domain.CustomerContingenPlanRecord;
 import org.dromara.property.domain.entity.resident.ResidentPerson;
@@ -21,12 +22,14 @@ import org.dromara.property.mapper.CustomerContingenPlanMapper;
 import org.dromara.property.mapper.CustomerContingenPlanRecordMapper;
 import org.dromara.property.mapper.ResidentPersonMapper;
 import org.dromara.property.service.ICustomerContingenPlanService;
+import org.dromara.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Objects;
 
 /**
  * 客户服务-应急预案Service业务层处理
@@ -102,7 +105,23 @@ public class CustomerContingenPlanServiceImpl implements ICustomerContingenPlanS
     @Override
     public List<CustomerContingenPlanVo> queryList(CustomerContingenPlanBo bo) {
         LambdaQueryWrapper<CustomerContingenPlan> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<CustomerContingenPlanVo> customerContingenPlanVos = baseMapper.selectVoList(lqw);
+        customerContingenPlanVos.forEach(s -> {
+            if (Objects.equals(s.getContingenPlanType(), "0")) {
+                s.setContingenPlanType("自然灾害");
+            }
+            if (Objects.equals(s.getContingenPlanType(), "1")) {
+                s.setContingenPlanType("事故灾难");
+            }
+            if (Objects.equals(s.getContingenPlanType(), "2")) {
+                s.setContingenPlanType("公共卫生");
+            }
+            if (Objects.equals(s.getContingenPlanType(), "3")) {
+                s.setContingenPlanType("社会安全");
+            }
+        });
+
+        return customerContingenPlanVos;
     }
 
     private LambdaQueryWrapper<CustomerContingenPlan> buildQueryWrapper(CustomerContingenPlanBo bo) {

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskDetailServiceImpl.java

@@ -26,6 +26,7 @@ import org.dromara.property.domain.enums.OrderReportingTypeEnum;
 import org.dromara.property.domain.enums.OrderTypeOperationEnum;
 import org.dromara.property.domain.enums.WorkOrderStatusEnum;
 import org.dromara.property.domain.vo.*;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
 import org.dromara.property.domain.vo.mobile.MInspectionTaskDetailVo;
 import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersRecordVo;
 import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersVo;
@@ -39,6 +40,7 @@ import org.dromara.property.service.IInspectionTaskDetailService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -113,7 +115,17 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
             });
         }
 
-        return TableDataInfo.build(result);
+        Page<InspectionTaskDetailVo> inspectionTaskDetailVoPage = result.setRecords(result.getRecords().stream().map(vo -> {
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            vo.setActualInspectionPerson(loginUser.getNickname());
+            vo.setPlanInspectionPerson(loginUser.getNickname());
+            vo.setActualInspectionTime(LocalDateTime.now());
+//            vo.setSignType();
+
+            return vo;
+        }).collect(Collectors.toList()));
+
+        return TableDataInfo.build(inspectionTaskDetailVoPage);
     }
 
     private void disposeData(InspectionTaskDetailVo vo, Map<Long, String> taskNameMap, Map<Long, String> routeNameMap, Map<Long, String> planNameMap, Map<Long, String> pointNameMap) {
@@ -311,7 +323,9 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
         //当前登录用户id
         LoginUser loginUser = LoginHelper.getLoginUser();
         Assert.isTrue(planInspectionPersonIds.contains(loginUser.getUserId()), "当前签到人不在计划巡检人列表内");
-        bo.setActualInspectionPerson(loginUser.getUserId().toString());
+        bo.setActualInspectionPerson(loginUser.getNickname());
+//        bo.setActualInspectionTime(LocalDateTime.now());
+        bo.setInspectionTime(LocalDateTime.now());
         InspectionTaskDetail update = MapstructUtils.convert(bo, InspectionTaskDetail.class);
         boolean flag = baseMapper.updateById(update) > 0;
         if (flag) {