修改了工单bug

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionTaskDetailController.java

@@ -6,9 +6,6 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.property.domain.bo.InspectionTaskDetailBo;
-import org.dromara.property.domain.vo.InspectionTaskDetailVo;
-import org.dromara.property.service.IInspectionTaskDetailService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -20,14 +17,17 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.InspectionTaskDetailVo;
+import org.dromara.property.domain.bo.InspectionTaskDetailBo;
+import org.dromara.property.service.IInspectionTaskDetailService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 巡检明细
- * 前端访问路由地址为:/system/taskDetail
+ * 前端访问路由地址为:/property/taskDetail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Validated
 @RequiredArgsConstructor
@@ -40,7 +40,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 查询巡检明细列表
      */
-    //@SaCheckPermission("system:taskDetail:list")
+    @SaCheckPermission("property:taskDetail:list")
     @GetMapping("/list")
     public TableDataInfo<InspectionTaskDetailVo> list(InspectionTaskDetailBo bo, PageQuery pageQuery) {
         return inspectionTaskDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 导出巡检明细列表
      */
-    @SaCheckPermission("system:taskDetail:export")
+    @SaCheckPermission("property:taskDetail:export")
     @Log(title = "巡检明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(InspectionTaskDetailBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class InspectionTaskDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:taskDetail:query")
+    @SaCheckPermission("property:taskDetail:query")
     @GetMapping("/{id}")
     public R<InspectionTaskDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
@@ -72,7 +72,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 新增巡检明细
      */
-    @SaCheckPermission("system:taskDetail:add")
+    @SaCheckPermission("property:taskDetail:add")
     @Log(title = "巡检明细", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class InspectionTaskDetailController extends BaseController {
     /**
      * 修改巡检明细
      */
-    @SaCheckPermission("system:taskDetail:edit")
+    @SaCheckPermission("property:taskDetail:edit")
     @Log(title = "巡检明细", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class InspectionTaskDetailController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:taskDetail:remove")
+    @SaCheckPermission("property:taskDetail:remove")
     @Log(title = "巡检明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -4,8 +4,10 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.translation.annotation.Translation;
 import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.constant.TransConstant;
 
 import java.io.Serial;
 
@@ -13,7 +15,7 @@ import java.io.Serial;
  * 巡检明细对象 inspection_task_detail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -55,20 +57,60 @@ public class InspectionTaskDetail extends TenantEntity {
     private String patrolType;
 
     /**
-     * 签到类型
+     * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码)
      */
     private String signType;
 
+    /**
+     * 实际巡检时间
+     */
+    private Date actualInspectionTime;
+
+    /**
+     * 实际签到状态(1已签到2.未签到)
+     */
+    private String actualSignState;
+
     /**
      * 巡检状态(0未完成,1已完成)
      */
     private String inspectionState;
 
     /**
-     * 巡检照片
+     * 巡检图片
      */
     private String inspectionImage;
 
+    /**
+     * 计划巡检人
+     */
+    private String planInspectionPerson;
+
+    /**
+     * 实际巡检人
+     */
+    private String actualInspectionPerson;
+
+    /**
+     * 任务状态
+     */
+    private String taskStatus;
+
+    /**
+     * 巡检结果
+     */
+    private String inspectionResults;
+
+    /**
+     * 巡检描述
+     */
+    private String inspectionDesc;
+
+    /**
+     * 巡检位置
+     */
+    private String inspectionLocation;
+
     /**
      * 实际巡检时间
      */
@@ -89,4 +131,10 @@ public class InspectionTaskDetail extends TenantEntity {
      */
     private Date pointEndTime;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
 }

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

@@ -105,6 +105,10 @@ public class ServiceWorkOrders extends TenantEntity {
      * 工单图片
      */
     private String orderImgUrl;
+    /**
+     * 上报类型
+     */
+    private String reportingType;
     /**
      * 备注
      */

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

@@ -1,5 +1,6 @@
 package org.dromara.property.domain.bo;
 
+import org.dromara.property.domain.InspectionTaskDetail;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -7,14 +8,16 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
-import org.dromara.property.domain.InspectionTaskDetail;
+import org.dromara.common.translation.annotation.Translation;
-
 import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.constant.TransConstant;
+
 /**
  * 巡检明细业务对象 inspection_task_detail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -55,20 +58,60 @@ public class InspectionTaskDetailBo extends BaseEntity {
     private String patrolType;
 
     /**
-     * 签到类型
+     * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码)
      */
     private String signType;
 
+    /**
+     * 实际巡检时间
+     */
+    private Date actualInspectionTime;
+
+    /**
+     * 实际签到状态(1已签到2.未签到)
+     */
+    private String actualSignState;
+
     /**
      * 巡检状态(0未完成,1已完成)
      */
     private String inspectionState;
 
     /**
-     * 巡检照片
+     * 巡检图片
      */
     private String inspectionImage;
 
+    /**
+     * 计划巡检人
+     */
+    private String planInspectionPerson;
+
+    /**
+     * 实际巡检人
+     */
+    private String actualInspectionPerson;
+
+    /**
+     * 任务状态
+     */
+    private String taskStatus;
+
+    /**
+     * 巡检结果
+     */
+    private String inspectionResults;
+
+    /**
+     * 巡检描述
+     */
+    private String inspectionDesc;
+
+    /**
+     * 巡检位置
+     */
+    private String inspectionLocation;
+
     /**
      * 实际巡检时间
      */

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

@@ -3,6 +3,7 @@ package org.dromara.property.domain.bo;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +27,7 @@ public class ServiceWorkOrdersBo extends BaseEntity {
     /**
      * id
      */
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    @NotBlank(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -37,7 +38,7 @@ public class ServiceWorkOrdersBo extends BaseEntity {
     /**
      * 工单名称
      */
-    @NotNull(message = "工单名称不能为空", groups = { EditGroup.class })
+    @NotBlank(message = "工单名称不能为空", groups = { EditGroup.class })
     private String orderName;
     /**
      * 权重
@@ -49,6 +50,11 @@ public class ServiceWorkOrdersBo extends BaseEntity {
      */
     @NotNull(message = "工单类型不能为空", groups = { EditGroup.class })
     private Long  type;
+    /**
+     * 上报类型
+     */
+    @NotBlank(message = "上报类型不能为空", groups = { EditGroup.class })
+    private String reportingType;
 
     /**
      * 状态

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

@@ -1,10 +1,16 @@
 package org.dromara.property.domain.vo;
 
+import org.dromara.common.translation.annotation.Translation;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.property.domain.InspectionTaskDetail;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.property.domain.InspectionTaskDetail;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -16,7 +22,7 @@ import java.util.Date;
  * 巡检明细视图对象 inspection_task_detail
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -63,11 +69,23 @@ public class InspectionTaskDetailVo implements Serializable {
     private String patrolType;
 
     /**
-     * 签到类型
+     * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码)
      */
-    @ExcelProperty(value = "签到类型")
+    @ExcelProperty(value = "签到类型(1.现场拍照、2.摄像头签到、3.现场扫码)")
     private String signType;
 
+    /**
+     * 实际巡检时间
+     */
+    @ExcelProperty(value = "实际巡检时间")
+    private Date actualInspectionTime;
+
+    /**
+     * 实际签到状态(1已签到2.未签到)
+     */
+    @ExcelProperty(value = "实际签到状态(1已签到2.未签到)")
+    private String actualSignState;
+
     /**
      * 巡检状态(0未完成,1已完成)
      */
@@ -75,11 +93,52 @@ public class InspectionTaskDetailVo implements Serializable {
     private String inspectionState;
 
     /**
-     * 巡检照片
+     * 巡检图片
      */
-    @ExcelProperty(value = "巡检照片")
+    @ExcelProperty(value = "巡检图片")
     private String inspectionImage;
 
+    /**
+     * 巡检图片Url
+     */
+    @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "inspectionImage")
+    private String inspectionImageUrl;
+    /**
+     * 计划巡检人
+     */
+    @ExcelProperty(value = "计划巡检人")
+    private String planInspectionPerson;
+
+    /**
+     * 实际巡检人
+     */
+    @ExcelProperty(value = "实际巡检人")
+    private String actualInspectionPerson;
+
+    /**
+     * 任务状态
+     */
+    @ExcelProperty(value = "任务状态")
+    private String taskStatus;
+
+    /**
+     * 巡检结果
+     */
+    @ExcelProperty(value = "巡检结果")
+    private String inspectionResults;
+
+    /**
+     * 巡检描述
+     */
+    @ExcelProperty(value = "巡检描述")
+    private String inspectionDesc;
+
+    /**
+     * 巡检位置
+     */
+    @ExcelProperty(value = "巡检位置")
+    private String inspectionLocation;
+
     /**
      * 实际巡检时间
      */

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

@@ -48,6 +48,10 @@ public class ServiceWorkOrdersInfoVo implements Serializable {
      */
     @ExcelProperty(value = "工单类型")
     private Long type;
+    /**
+     * 上报类型
+     */
+    private String reportingType;
     /**
      * 权重
      */

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

@@ -54,6 +54,10 @@ public class ServiceWorkOrdersVo implements Serializable {
      */
     @ExcelProperty(value = "工单类型")
     private Long type;
+    /**
+     * 上报类型
+     */
+    private String reportingType;
     /**
      * 工单类型名称
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/InspectionTaskDetailMapper.java

@@ -1,17 +1,15 @@
 package org.dromara.property.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.property.domain.InspectionTaskDetail;
 import org.dromara.property.domain.vo.InspectionTaskDetailVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
  * 巡检明细Mapper接口
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
-@Mapper
 public interface InspectionTaskDetailMapper extends BaseMapperPlus<InspectionTaskDetail, InspectionTaskDetailVo> {
 
 }

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

@@ -1,9 +1,10 @@
 package org.dromara.property.service;
 
+import org.dromara.property.domain.InspectionTaskDetail;
+import org.dromara.property.domain.vo.InspectionTaskDetailVo;
+import org.dromara.property.domain.bo.InspectionTaskDetailBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.property.domain.bo.InspectionTaskDetailBo;
-import org.dromara.property.domain.vo.InspectionTaskDetailVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
  * 巡检明细Service接口
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 public interface IInspectionTaskDetailService {
 

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

@@ -9,13 +9,12 @@ 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.property.domain.InspectionTaskDetail;
+import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.InspectionTaskDetailBo;
 import org.dromara.property.domain.vo.InspectionTaskDetailVo;
+import org.dromara.property.domain.InspectionTaskDetail;
 import org.dromara.property.mapper.InspectionTaskDetailMapper;
 import org.dromara.property.service.IInspectionTaskDetailService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -25,7 +24,7 @@ import java.util.Collection;
  * 巡检明细Service业务层处理
  *
  * @author mocheng
- * @date 2025-07-15
+ * @date 2025-08-08
  */
 @Slf4j
 @RequiredArgsConstructor
@@ -81,7 +80,16 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
         lqw.eq(bo.getPointId() != null, InspectionTaskDetail::getPointId, bo.getPointId());
         lqw.eq(StringUtils.isNotBlank(bo.getPatrolType()), InspectionTaskDetail::getPatrolType, bo.getPatrolType());
         lqw.eq(StringUtils.isNotBlank(bo.getSignType()), InspectionTaskDetail::getSignType, bo.getSignType());
+        lqw.eq(bo.getActualInspectionTime() != null, InspectionTaskDetail::getActualInspectionTime, bo.getActualInspectionTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getActualSignState()), InspectionTaskDetail::getActualSignState, bo.getActualSignState());
         lqw.eq(StringUtils.isNotBlank(bo.getInspectionState()), InspectionTaskDetail::getInspectionState, bo.getInspectionState());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionImage()), InspectionTaskDetail::getInspectionImage, bo.getInspectionImage());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlanInspectionPerson()), InspectionTaskDetail::getPlanInspectionPerson, bo.getPlanInspectionPerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getActualInspectionPerson()), InspectionTaskDetail::getActualInspectionPerson, bo.getActualInspectionPerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getTaskStatus()), InspectionTaskDetail::getTaskStatus, bo.getTaskStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionResults()), InspectionTaskDetail::getInspectionResults, bo.getInspectionResults());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionDesc()), InspectionTaskDetail::getInspectionDesc, bo.getInspectionDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionLocation()), InspectionTaskDetail::getInspectionLocation, bo.getInspectionLocation());
         lqw.eq(bo.getInspectionTime() != null, InspectionTaskDetail::getInspectionTime, bo.getInspectionTime());
         lqw.eq(bo.getPointStartTime() != null, InspectionTaskDetail::getPointStartTime, bo.getPointStartTime());
         lqw.eq(bo.getPointEndTime() != null, InspectionTaskDetail::getPointEndTime, bo.getPointEndTime());
@@ -96,7 +104,6 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
      * @return 是否新增成功
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(InspectionTaskDetailBo bo) {
         InspectionTaskDetail add = MapstructUtils.convert(bo, InspectionTaskDetail.class);
         validEntityBeforeSave(add);
@@ -114,7 +121,6 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
      * @return 是否修改成功
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(InspectionTaskDetailBo bo) {
         InspectionTaskDetail update = MapstructUtils.convert(bo, InspectionTaskDetail.class);
         validEntityBeforeSave(update);
@@ -136,7 +142,6 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
      * @return 是否删除成功
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验

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

@@ -247,14 +247,12 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
         ordersLambdaQueryWrapper.eq(ServiceWorkOrdersRecord::getStatus, entity.getStatus());
         boolean exists = workOrdersRecordMapper.exists(ordersLambdaQueryWrapper);
         //TODO 做一些数据校验,如唯一约束
-        if (!exists) {
             ServiceWorkOrdersRecord serviceWorkOrdersRecord = new ServiceWorkOrdersRecord();
             serviceWorkOrdersRecord.setOrderId(entity.getId());
             serviceWorkOrdersRecord.setStatus(entity.getStatus());
             serviceWorkOrdersRecord.setHandler(entity.getHandler());
             workOrdersRecordMapper.insert(serviceWorkOrdersRecord);
     }
-    }
 
     /**
      * 校验并批量删除【工单处理】信息