泰山运维系统云服务项目-工单系统开发

src/main/java/org/springblade/enums/OrderStatusEnum.java

@@ -4,12 +4,12 @@ public enum OrderStatusEnum {
 	/**
 	 * 工单创建
 	 */
-	STATUS_CREATE("1", "工单创建"),
+	STATUS_CREATE("1", "新工单"),
 
 	/**
 	 * 工单接单
 	 */
-	STATUS_CONFIRM("2", "工单下发"),
+	STATUS_CONFIRM("2", "已接单"),
 
 	/**
 	 * 工单处理

src/main/java/org/springblade/modules/business/check/order/controller/RtuCheckOrderController.java

@@ -111,7 +111,10 @@ public class RtuCheckOrderController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "分页", notes = "传入实体类CheckOrderInfoDTO")
     public R<IPage<CheckOrderInfoVO>> page(@ApiIgnore CheckOrderInfoDTO checkOrderInfoDTO, Query query) {
-        if (OrderStatusEnum.STATUS_CONFIRM.getCode().equals(Func.toStr(checkOrderInfoDTO.getOrderStatusOption()))) {
+        if (OrderStatusEnum.STATUS_CREATE.getCode().equals(Func.toStr(checkOrderInfoDTO.getOrderStatusOption()))) {
+            DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CREATE.getCode());
+            checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
+        } else if (OrderStatusEnum.STATUS_CONFIRM.getCode().equals(Func.toStr(checkOrderInfoDTO.getOrderStatusOption()))) {
             DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CONFIRM.getCode());
             checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
         } else if (OrderStatusEnum.STATUS_COSTS_PENDING_APPROVE.getCode().equals(Func.toStr(checkOrderInfoDTO.getOrderStatusOption()))) {
@@ -155,6 +158,11 @@ public class RtuCheckOrderController extends BladeController {
         return R.data(pages);
     }
 
+    /**
+     * 新工单列表
+     * @param checkOrderInfoDTO
+     * @return
+     */
     @GetMapping("/todo/confirm/list")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "分页", notes = "传入实体类CheckOrderInfoDTO")
@@ -536,7 +544,7 @@ public class RtuCheckOrderController extends BladeController {
         }
        // BladeUser user = AuthUtil.getUser();
 
-        DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CLOSE.getCode());
+        DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CANCEL.getCode());
         OrderProcessInfoEntity processInfoEntity = new OrderProcessInfoEntity();
         processInfoEntity.setOrderId(checkOrderInfoEntity.getId());
         processInfoEntity.setProcessDesc(checkOrderInfoEntity.getOrderDesc());
@@ -544,7 +552,7 @@ public class RtuCheckOrderController extends BladeController {
         rtuOrderProcessService.save(processInfoEntity);
 
         CheckOrderInfoEntity detail = rtuCheckOrderService.getById(checkOrderInfoEntity.getId());
-        dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CLOSE.getCode());
+        dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CANCEL.getCode());
         detail.setOrderStatusKey(dictInfoEntity.getId());
         detail.setOrderClose(OrderCloseEnum.ACTIVE_CLOSE.getCode());
         detail.setOrderConfirm(OrderConfirmEnum.ACTIVE_CONFIRM.getCode());
@@ -652,7 +660,7 @@ public class RtuCheckOrderController extends BladeController {
 //        processInfoEntity.setOrderId(checkOrderInfoEntity.getId());
 //        processInfoEntity.setOrderStatusKey(checkOrderInfoEntity.getOrderStatusKey());
 //        processInfoEntity.setProcessDesc("维修任务由[" + userInfo.getRealName() + "]确认");
-        return R.status(true);
+        return R.data(true);
     }
 
     @PostMapping("/manually")

src/main/java/org/springblade/modules/business/equipment/inspection/base/controller/EquipmentInspectionController.java

@@ -18,6 +18,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import org.springblade.constant.BusinessConstant;
+import org.springblade.constant.DictBusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -27,9 +28,15 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.enums.InspectionStatusEnum;
+import org.springblade.enums.OrderCloseEnum;
+import org.springblade.enums.OrderConfirmEnum;
+import org.springblade.enums.OrderStatusEnum;
+import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
+import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
+import org.springblade.modules.business.check.process.dto.OrderProcessInfoDTO;
 import org.springblade.modules.business.equipment.inspection.base.dto.EquipmentInspectionInfoDTO;
 import org.springblade.modules.business.equipment.inspection.base.entity.EquipmentInspectionInfoEntity;
 import org.springblade.modules.business.equipment.inspection.base.entity.UnfinishedInspectionEquipmentExportEntity;
@@ -41,6 +48,7 @@ import org.springblade.modules.business.equipment.inspection.base.wrapper.Equipm
 import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
 import org.springblade.modules.business.equipment.inspection.plan.service.IEquipmentInspectionPlanService;
 import org.springblade.modules.business.equipment.inspection.report.dto.EquipmentInspectionReportDTO;
+import org.springblade.modules.business.equipment.inspection.report.entity.EquipmentInspectionReportEntity;
 import org.springblade.modules.business.equipment.inspection.report.service.IEquipmentInspectionReportService;
 import org.springblade.modules.resource.builder.oss.OssBuilder;
 import org.springblade.modules.system.entity.Dept;
@@ -110,19 +118,19 @@ public class EquipmentInspectionController extends BladeController {
     @ApiOperation(value = "分页", notes = "传入 EquipmentInspectionInfoDTO 实体类")
     public R<IPage<EquipmentInspectionInfoVO>> page(@ApiIgnore EquipmentInspectionInfoDTO inspectionInfoDTO, Query query) {
         BladeUser user = AuthUtil.getUser();
-        if (BusinessConstant.ROLE_SYS_ADMIN.equals(user.getRoleName())) {
-            if (inspectionInfoDTO.getAdCode() == null) {
-                inspectionInfoDTO.setAdCode(BusinessConstant.REGION_NM_ADCODE);
-            }
-        } else if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_COMPANY_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_COMPANY_SERVICE_PERSON.equals(user.getRoleName())) {
-            if (inspectionInfoDTO.getAdCode() == null) {
-                LambdaQueryWrapper<DeptRegionEntity> deptRegionEntityLambdaQueryWrapper = Wrappers.<DeptRegionEntity>query().lambda();
-                deptRegionEntityLambdaQueryWrapper.eq(DeptRegionEntity::getIsDeleted, 0);
-                deptRegionEntityLambdaQueryWrapper.eq(DeptRegionEntity::getDeptId, Func.toLong(user.getDeptId()));
-                DeptRegionEntity deptRegionEntity = deptRegionService.getOne(deptRegionEntityLambdaQueryWrapper);
-                inspectionInfoDTO.setAdCode(deptRegionEntity.getAdcd());
-            }
-        }
+//        if (BusinessConstant.ROLE_SYS_ADMIN.equals(user.getRoleName())) {
+//            if (inspectionInfoDTO.getAdCode() == null) {
+//                inspectionInfoDTO.setAdCode(BusinessConstant.REGION_NM_ADCODE);
+//            }
+//        } else if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_COMPANY_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_COMPANY_SERVICE_PERSON.equals(user.getRoleName())) {
+//            if (inspectionInfoDTO.getAdCode() == null) {
+//                LambdaQueryWrapper<DeptRegionEntity> deptRegionEntityLambdaQueryWrapper = Wrappers.<DeptRegionEntity>query().lambda();
+//                deptRegionEntityLambdaQueryWrapper.eq(DeptRegionEntity::getIsDeleted, 0);
+//                deptRegionEntityLambdaQueryWrapper.eq(DeptRegionEntity::getDeptId, Func.toLong(user.getDeptId()));
+//                DeptRegionEntity deptRegionEntity = deptRegionService.getOne(deptRegionEntityLambdaQueryWrapper);
+//                inspectionInfoDTO.setAdCode(deptRegionEntity.getAdcd());
+//            }
+//        }
         IPage<EquipmentInspectionInfoVO> pages = equipmentInspectionService.selectPage(Condition.getPage(query), inspectionInfoDTO);
         return R.data(pages);
     }
@@ -150,6 +158,11 @@ public class EquipmentInspectionController extends BladeController {
         return R.data(list);
     }
 
+    /**
+     * 待完结审批
+     *
+     * @return
+     */
     @GetMapping("/close-approve/list")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "全部列表，不分页")
@@ -956,4 +969,27 @@ public class EquipmentInspectionController extends BladeController {
         }
         return data;
     }
+
+    /**
+     * 工单关闭
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/close")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "工单关闭", notes = "传入实体类EquipmentInspectionInfoDTO")
+    public R orderClose(@ApiIgnore EquipmentInspectionInfoDTO dto) {
+        if (Func.isNull(dto.getId())) {
+            return R.fail("参数错误");
+        }
+        EquipmentInspectionReportEntity reportEntity = new EquipmentInspectionReportEntity();
+        reportEntity.setInspectionId(dto.getId());
+        reportEntity.setInspectionDesc(dto.getApproveDesc());
+        inspectionReportService.save(reportEntity);
+        dto.setInspectionStatus(InspectionStatusEnum.STATUS_APPROVED.getCode());
+        dto.setInspectionReportId(reportEntity.getId());
+        equipmentInspectionService.updateById(dto);
+        return R.success("工单关闭已操作成功！");
+    }
 }

src/main/java/org/springblade/modules/business/equipment/inspection/base/dto/EquipmentInspectionInfoDTO.java

@@ -86,4 +86,16 @@ public class EquipmentInspectionInfoDTO extends EquipmentInspectionInfoEntity {
 	 */
 	@ApiModelProperty(value = "机构ID")
 	private Long deptId;
+
+	/**
+	 * 审批意见
+	 */
+	@ApiModelProperty("审批意见")
+	private String  approveDesc;
+
+	/**
+	 * 工单评分
+	 */
+	@ApiModelProperty("工单评分")
+	private Integer orderRate;
 }

src/main/java/org/springblade/modules/business/equipment/inspection/base/entity/EquipmentInspectionInfoEntity.java

@@ -186,4 +186,9 @@ public class EquipmentInspectionInfoEntity extends BaseEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long rainSeasonSecondReportId;
 
+	/**
+	 * 工单评分
+	 */
+	@ApiModelProperty("工单评分")
+	private Integer orderRate;
 }

src/main/java/org/springblade/modules/business/equipment/inspection/base/mapper/EquipmentInspectionMapper.xml

@@ -93,6 +93,9 @@
         LEFT JOIN blade_user u3 ON u3.id = n.rain_season_second_report_user and u2.is_deleted=0
         WHERE
         n.is_deleted = 0
+        <if test="inspectionInfoDTO.inspectionPlanId!=null">
+            and n.inspection_plan_id =  #{inspectionInfoDTO.inspectionPlanId}
+        </if>
         <if test="inspectionInfoDTO.rtuCode!=null">
             and n.rtu_code like concat(concat('%', #{inspectionInfoDTO.rtuCode}), '%')
         </if>

src/main/java/org/springblade/modules/business/equipment/inspection/base/wrapper/EquipmentInspectionWrapper.java

@@ -9,8 +9,15 @@ package org.springblade.modules.business.equipment.inspection.base.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.modules.business.equipment.inspection.base.entity.EquipmentInspectionInfoEntity;
 import org.springblade.modules.business.equipment.inspection.base.vo.EquipmentInspectionInfoVO;
+import org.springblade.modules.business.equipment.inspection.report.entity.EquipmentInspectionReportEntity;
+import org.springblade.modules.business.equipment.inspection.report.service.IEquipmentInspectionReportService;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IRoleService;
+import org.springblade.modules.system.service.IUserService;
 
 import java.util.Objects;
 
@@ -23,18 +30,45 @@ import java.util.Objects;
  * Remark：认为有必要的其他信息
  */
 
-public class EquipmentInspectionWrapper extends BaseEntityWrapper<EquipmentInspectionInfoEntity,EquipmentInspectionInfoVO> {
-	public static EquipmentInspectionWrapper build() {
-		return new EquipmentInspectionWrapper();
-	}
+public class EquipmentInspectionWrapper extends BaseEntityWrapper<EquipmentInspectionInfoEntity, EquipmentInspectionInfoVO> {
+    public static EquipmentInspectionWrapper build() {
+        return new EquipmentInspectionWrapper();
+    }
 
-	@Override
-	public EquipmentInspectionInfoVO entityVO(EquipmentInspectionInfoEntity entity) {
-		EquipmentInspectionInfoVO equipmentInspectionInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, EquipmentInspectionInfoVO.class));
-		return entityVO(equipmentInspectionInfoVO);
-	}
+    private static IUserService userService;
 
-	public EquipmentInspectionInfoVO entityVO(EquipmentInspectionInfoVO entity) {
+    private static IUserService getUserService() {
+        if (userService == null) {
+            userService = SpringUtil.getBean(IUserService.class);
+        }
+        return userService;
+    }
+
+    private static IEquipmentInspectionReportService reportService;
+
+    private static IEquipmentInspectionReportService getReportService() {
+        if (reportService == null) {
+            reportService = SpringUtil.getBean(IEquipmentInspectionReportService.class);
+        }
+        return reportService;
+    }
+
+    @Override
+    public EquipmentInspectionInfoVO entityVO(EquipmentInspectionInfoEntity entity) {
+        EquipmentInspectionInfoVO equipmentInspectionInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, EquipmentInspectionInfoVO.class));
+        return entityVO(equipmentInspectionInfoVO);
+    }
+
+    public EquipmentInspectionInfoVO entityVO(EquipmentInspectionInfoVO entity) {
+
+        if (Func.notNull(entity.getInspectionReportId())) {
+            EquipmentInspectionReportEntity reportEntity = getReportService().getById(entity.getInspectionReportId());
+            if (Func.notNull(reportEntity)) {
+                User user = getUserService().getById(reportEntity.getCreateUser());
+                entity.setServicePersonName(user.getRealName());
+                entity.setInspectionReportTime(reportEntity.getCreateTime());
+            }
+        }
 //		String rtuKindDesc = "";
 //		if (entity.getIsRain() != null && entity.getIsRain() == 1) {
 //			rtuKindDesc = "雨量站";
@@ -63,9 +97,6 @@ public class EquipmentInspectionWrapper extends BaseEntityWrapper<EquipmentInspe
 //			rtuKindDesc += "视频站";
 //		}
 //		entity.setRtuKindDesc(rtuKindDesc);
-
-
-
-		return entity;
-	}
+        return entity;
+    }
 }

src/main/java/org/springblade/modules/business/equipment/inspection/plan/controller/EquipmentInspectionPlanController.java

@@ -7,21 +7,31 @@
 package org.springblade.modules.business.equipment.inspection.plan.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
+import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.enums.InspectionStatusEnum;
+import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
+import org.springblade.modules.business.equipment.inspection.base.dto.EquipmentInspectionInfoDTO;
 import org.springblade.modules.business.equipment.inspection.base.entity.EquipmentInspectionInfoEntity;
 import org.springblade.modules.business.equipment.inspection.base.service.IEquipmentInspectionService;
+import org.springblade.modules.business.equipment.inspection.base.vo.EquipmentInspectionInfoVO;
+import org.springblade.modules.business.equipment.inspection.plan.dto.EquipmentInspectionPlanDTO;
 import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
 import org.springblade.modules.business.equipment.inspection.plan.service.IEquipmentInspectionPlanService;
+import org.springblade.modules.business.equipment.inspection.plan.vo.EquipmentInspectionPlanVO;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
 
@@ -41,6 +51,16 @@ public class EquipmentInspectionPlanController extends BladeController {
     private final IEquipmentInspectionPlanService planService;
     private final IEquipmentInspectionService inspectionService;
 
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "分页", notes = "传入 EquipmentInspectionPlanDTO 实体类")
+    public R<IPage<EquipmentInspectionPlanVO>> page(@ApiIgnore EquipmentInspectionPlanDTO inspectionInfoDTO, Query query) {
+
+        IPage<EquipmentInspectionPlanVO> pages = planService.selectPage(Condition.getPage(query), inspectionInfoDTO);
+        return R.data(pages);
+    }
+
+
     /**
      * 详情
      */

src/main/java/org/springblade/modules/business/equipment/inspection/plan/dto/EquipmentInspectionRtuDTO.java → src/main/java/org/springblade/modules/business/equipment/inspection/plan/dto/EquipmentInspectionPlanDTO.java

@@ -10,7 +10,7 @@ package org.springblade.modules.business.equipment.inspection.plan.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
+import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
 
 
 import java.util.Date;
@@ -25,7 +25,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class EquipmentInspectionRtuDTO extends RtuInfoEntity {
+public class EquipmentInspectionPlanDTO extends EquipmentInspectionPlanEntity {
 
 	/**
 	 * 机构ID

src/main/java/org/springblade/modules/business/equipment/inspection/plan/mapper/EquipmentInspectionPlanMapper.java

@@ -7,7 +7,11 @@
 package org.springblade.modules.business.equipment.inspection.plan.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.business.equipment.inspection.plan.dto.EquipmentInspectionPlanDTO;
 import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
+import org.springblade.modules.business.equipment.inspection.plan.vo.EquipmentInspectionPlanVO;
 
 
 import java.util.List;
@@ -21,5 +25,5 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface EquipmentInspectionPlanMapper extends BaseMapper<EquipmentInspectionPlanEntity> {
-
+    List<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, @Param("inspectionInfoDTO") EquipmentInspectionPlanDTO inspectionInfoDTO);
 }

src/main/java/org/springblade/modules/business/equipment/inspection/plan/mapper/EquipmentInspectionPlanMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.business.equipment.inspection.plan.mapper.EquipmentInspectionPlanMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="orderProcessInfoResultMap"
+    <resultMap id="inspectionInfoResultMap"
                type="org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity">
         <result column="inspection_id" property="inspectionId"/>
         <result column="plan_title" property="planTitle"/>
@@ -26,4 +26,38 @@
 
     </resultMap>
 
+
+    <resultMap id="inspectionInfoVOResultMap"
+               type="org.springblade.modules.business.equipment.inspection.plan.vo.EquipmentInspectionPlanVO">
+        <result column="inspection_id" property="inspectionId"/>
+        <result column="plan_title" property="planTitle"/>
+        <result column="plan_scheduled_type" property="planScheduledType"/>
+        <result column="time_type" property="timeType"/>
+        <result column="plan_status" property="planStatus"/>
+        <result column="org_id" property="orgId"/>
+        <result column="project_id" property="projectId"/>
+        <result column="inspection_complete_time" property="inspectionCompleteTime"/>
+        <result column="inspection_start_time" property="beforeRainSeasonStartTime"/>
+        <result column="inspection_end_time" property="beforeRainSeasonEndTime"/>
+        <result column="before_rain_season_start_time" property="beforeRainSeasonStartTime"/>
+        <result column="before_rain_season_end_time" property="beforeRainSeasonEndTime"/>
+        <result column="rain_season_first_start_time" property="rainSeasonFirstStartTime"/>
+        <result column="rain_season_first_end_time" property="rainSeasonFirstEndTime"/>
+        <result column="rain_season_second_start_time" property="rainSeasonSecondStartTime"/>
+        <result column="rain_season_second_end_time" property="rainSeasonSecondEndTime"/>
+        <result column="plan_desc" property="planDesc"/>
+        <result column="batch_id" property="batchId"/>
+
+    </resultMap>
+
+    <select id="selectPage" resultMap="inspectionInfoVOResultMap">
+        SELECT
+        n.*
+        FROM
+        equipment_inspection_plan n
+        WHERE
+        n.is_deleted = 0
+
+    </select>
+
 </mapper>

src/main/java/org/springblade/modules/business/equipment/inspection/plan/service/IEquipmentInspectionPlanService.java

@@ -7,8 +7,13 @@
 package org.springblade.modules.business.equipment.inspection.plan.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.equipment.inspection.base.dto.EquipmentInspectionInfoDTO;
+import org.springblade.modules.business.equipment.inspection.base.vo.EquipmentInspectionInfoVO;
+import org.springblade.modules.business.equipment.inspection.plan.dto.EquipmentInspectionPlanDTO;
 import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
+import org.springblade.modules.business.equipment.inspection.plan.vo.EquipmentInspectionPlanVO;
 
 
 /***
@@ -20,6 +25,8 @@ import org.springblade.modules.business.equipment.inspection.plan.entity.Equipme
  * Remark：认为有必要的其他信息
  */
 public interface IEquipmentInspectionPlanService extends BaseService<EquipmentInspectionPlanEntity> {
+	IPage<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, EquipmentInspectionPlanDTO inspectionInfoDTO);
+
 	EquipmentInspectionPlanEntity yearPlan();
 	EquipmentInspectionPlanEntity getPlanInfo();
 }

src/main/java/org/springblade/modules/business/equipment/inspection/plan/service/impl/EquipmentInspectionPlanServiceImpl.java

@@ -7,15 +7,18 @@
 package org.springblade.modules.business.equipment.inspection.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.business.equipment.inspection.plan.dto.EquipmentInspectionPlanDTO;
 import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
 import org.springblade.modules.business.equipment.inspection.plan.mapper.EquipmentInspectionPlanMapper;
 import org.springblade.modules.business.equipment.inspection.plan.service.IEquipmentInspectionPlanService;
+import org.springblade.modules.business.equipment.inspection.plan.vo.EquipmentInspectionPlanVO;
 import org.springframework.stereotype.Service;
 
 import java.util.Calendar;
@@ -34,6 +37,11 @@ import java.util.List;
 public class EquipmentInspectionPlanServiceImpl extends BaseServiceImpl<EquipmentInspectionPlanMapper, EquipmentInspectionPlanEntity> implements IEquipmentInspectionPlanService {
 
 
+	@Override
+	public IPage<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, EquipmentInspectionPlanDTO inspectionInfoDTO) {
+		return page.setRecords(baseMapper.selectPage(page, inspectionInfoDTO));
+	}
+
 	@Override
 	public EquipmentInspectionPlanEntity yearPlan() {
 		LambdaQueryWrapper<EquipmentInspectionPlanEntity> wrapper = Wrappers.<EquipmentInspectionPlanEntity>query().lambda();

src/main/java/org/springblade/modules/business/equipment/inspection/report/controller/EquipmentInspectionReportController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.constant.BusinessConstant;
+import org.springblade.constant.DictBusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
@@ -30,10 +31,16 @@ import org.springblade.core.tool.utils.ConcurrentDateFormat;
 import org.springblade.core.tool.utils.Func;
 
 import org.springblade.enums.InspectionStatusEnum;
+import org.springblade.enums.OrderCloseEnum;
+import org.springblade.enums.OrderConfirmEnum;
+import org.springblade.enums.OrderStatusEnum;
+import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
+import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
+import org.springblade.modules.business.check.process.dto.OrderProcessInfoDTO;
 import org.springblade.modules.business.equipment.inspection.base.dto.EquipmentInspectionInfoDTO;
 import org.springblade.modules.business.equipment.inspection.base.entity.EquipmentInspectionInfoEntity;
 import org.springblade.modules.business.equipment.inspection.base.service.IEquipmentInspectionService;
@@ -90,7 +97,7 @@ public class EquipmentInspectionReportController extends BladeController {
 
 
 	/**
-	 * 分页
+	 * 巡检填报信息
 	 */
 	@GetMapping("/list")
 	@ApiImplicitParams({
@@ -100,30 +107,30 @@ public class EquipmentInspectionReportController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页")
 	public R<List<EquipmentInspectionReportVO>> list(@ApiIgnore EquipmentInspectionReportDTO inspectionReportDTO) {
-		if (inspectionReportDTO.getInspectionYear() != null) {
-			Date year = Func.parseDate(inspectionReportDTO.getInspectionYear(), "yyyy-MM-dd");
-			Calendar calendar = Calendar.getInstance();
-			calendar.setTime(year);
-			calendar.set(Calendar.MONTH, 0);
-			calendar.set(Calendar.DAY_OF_MONTH, 1);
-			calendar.set(Calendar.HOUR_OF_DAY, 0);
-			calendar.set(Calendar.MINUTE, 0);
-			calendar.set(Calendar.SECOND, 0);
-			inspectionReportDTO.setInspectionYearStartDate(calendar.getTime());
-			calendar.add(Calendar.YEAR, 1);
-			inspectionReportDTO.setInspectionYearEndDate(calendar.getTime());
-		} else {
-			Calendar calendar = Calendar.getInstance();
-			calendar.setTime(new Date());
-			calendar.set(Calendar.MONTH, 0);
-			calendar.set(Calendar.DAY_OF_MONTH, 1);
-			calendar.set(Calendar.HOUR_OF_DAY, 0);
-			calendar.set(Calendar.MINUTE, 0);
-			calendar.set(Calendar.SECOND, 0);
-			inspectionReportDTO.setInspectionYearStartDate(calendar.getTime());
-			calendar.add(Calendar.YEAR, 1);
-			inspectionReportDTO.setInspectionYearEndDate(calendar.getTime());
-		}
+//		if (inspectionReportDTO.getInspectionYear() != null) {
+//			Date year = Func.parseDate(inspectionReportDTO.getInspectionYear(), "yyyy-MM-dd");
+//			Calendar calendar = Calendar.getInstance();
+//			calendar.setTime(year);
+//			calendar.set(Calendar.MONTH, 0);
+//			calendar.set(Calendar.DAY_OF_MONTH, 1);
+//			calendar.set(Calendar.HOUR_OF_DAY, 0);
+//			calendar.set(Calendar.MINUTE, 0);
+//			calendar.set(Calendar.SECOND, 0);
+//			inspectionReportDTO.setInspectionYearStartDate(calendar.getTime());
+//			calendar.add(Calendar.YEAR, 1);
+//			inspectionReportDTO.setInspectionYearEndDate(calendar.getTime());
+//		} else {
+//			Calendar calendar = Calendar.getInstance();
+//			calendar.setTime(new Date());
+//			calendar.set(Calendar.MONTH, 0);
+//			calendar.set(Calendar.DAY_OF_MONTH, 1);
+//			calendar.set(Calendar.HOUR_OF_DAY, 0);
+//			calendar.set(Calendar.MINUTE, 0);
+//			calendar.set(Calendar.SECOND, 0);
+//			inspectionReportDTO.setInspectionYearStartDate(calendar.getTime());
+//			calendar.add(Calendar.YEAR, 1);
+//			inspectionReportDTO.setInspectionYearEndDate(calendar.getTime());
+//		}
 		List<EquipmentInspectionReportVO> list = reportService.selectList(inspectionReportDTO);
 		for (EquipmentInspectionReportVO vo : list) {
 			EquipmentInspectionReportWrapper.build().entityVO(vo);
@@ -238,11 +245,10 @@ public class EquipmentInspectionReportController extends BladeController {
 			return R.fail("参数错误");
 		}
 		BladeUser user = AuthUtil.getUser();
-
 		reportService.save(inspectionReportEntity);
-
 		EquipmentInspectionInfoEntity inspectionInfoEntity = inspectionService.getById(inspectionReportEntity.getInspectionId());
 		inspectionInfoEntity.setInspectionStatus(InspectionStatusEnum.STATUS_CLOSE_APPROVE.getCode());
+		inspectionInfoEntity.setInspectionReportId(inspectionReportEntity.getId());
 		inspectionService.updateById(inspectionInfoEntity);
 //		Calendar dt = Calendar.getInstance();
 //		dt.setTime(new Date());
@@ -1293,4 +1299,5 @@ public class EquipmentInspectionReportController extends BladeController {
 		BladeFile bladeFile = ossBuilder.template().putFile(file);
 		return R.data(bladeFile);
 	}
+
 }

src/main/java/org/springblade/modules/business/equipment/inspection/report/mapper/EquipmentInspectionReportMapper.xml

@@ -178,6 +178,9 @@
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         WHERE
         r.is_deleted = 0
+        <if test="inspectionReportDTO.inspectionId!=null">
+            and r.inspection_id = #{inspectionReportDTO.inspectionId}
+        </if>
         <if test="inspectionReportDTO.rtuCode!=null">
             and r.rtu_code = #{inspectionReportDTO.rtuCode}
         </if>
@@ -192,7 +195,7 @@
             ancestors
             like concat(concat('%', #{inspectionReportDTO.adCode}), '%')))
         </if>
-        order by r.rtu_code ASC,r.create_time desc
+        order by r.create_time
     </select>
 
     <select id="selectPage" resultMap="reportVOResultMap">

src/main/java/org/springblade/modules/business/equipment/inspection/report/wrapper/EquipmentInspectionReportWrapper.java

@@ -90,49 +90,49 @@ public class EquipmentInspectionReportWrapper extends BaseEntityWrapper<Equipmen
 //		if (null != biz) {
 //			vo.setSatelliteModelText(biz.getDictValue());
 //		}
-		LambdaQueryWrapper<RtuInfoEntity> rtuwrapper = Wrappers.<RtuInfoEntity>query().lambda();
-		rtuwrapper.eq(RtuInfoEntity::getIsDeleted, 0);
-		rtuwrapper.eq(RtuInfoEntity::getRtuCode, vo.getRtuCode());
-		RtuInfoEntity rtuInfoEntity = getRtuBaseInfoService().getOne(rtuwrapper);
-
-		vo.setRtuName(rtuInfoEntity.getRtuName());
-		vo.setIsRain(rtuInfoEntity.getIsRain());
-		vo.setIsRes(rtuInfoEntity.getIsRes());
-		vo.setIsRiver(rtuInfoEntity.getIsRiver());
-		vo.setIsGround(rtuInfoEntity.getIsGround());
-
-		vo.setAdCity(rtuInfoEntity.getAdCity());
-		vo.setAdDist(rtuInfoEntity.getAdDist());
-
-		String ancestors = vo.getAncestors();
-		if (null != ancestors && ancestors.length() > 0) {
-			String[] ancestorsList = ancestors.split(",");
-			String adCode;
-			if (ancestorsList.length >= 3) {
-				adCode = ancestorsList[2];
-			} else {
-				adCode = vo.getAdCode();
-			}
-			if (null != adCode) {
-				LambdaQueryWrapper<DeptRegionEntity> wrapper = Wrappers.<DeptRegionEntity>query().lambda();
-				wrapper.eq(DeptRegionEntity::getIsDeleted, 0);
-				wrapper.eq(DeptRegionEntity::getAdcd, adCode);
-				List<DeptRegionEntity> deptRegionEntities = getDeptRegionService().list(wrapper);
-				if (null != deptRegionEntities && deptRegionEntities.size() > 0) {
-					String manageCompany = "";
-					for (DeptRegionEntity deptRegionEntity : deptRegionEntities) {
-						Dept dept = getDeptService().getById(deptRegionEntity.getDeptId());
-						if (null != dept) {
-							if (manageCompany.length() > 0) {
-								manageCompany += " / ";
-							}
-							manageCompany += dept.getDeptName();
-						}
-					}
-					vo.setManageCompany(manageCompany);
-				}
-			}
-		}
+//		LambdaQueryWrapper<RtuInfoEntity> rtuwrapper = Wrappers.<RtuInfoEntity>query().lambda();
+//		rtuwrapper.eq(RtuInfoEntity::getIsDeleted, 0);
+//		rtuwrapper.eq(RtuInfoEntity::getRtuCode, vo.getRtuCode());
+//		RtuInfoEntity rtuInfoEntity = getRtuBaseInfoService().getOne(rtuwrapper);
+//
+//		vo.setRtuName(rtuInfoEntity.getRtuName());
+//		vo.setIsRain(rtuInfoEntity.getIsRain());
+//		vo.setIsRes(rtuInfoEntity.getIsRes());
+//		vo.setIsRiver(rtuInfoEntity.getIsRiver());
+//		vo.setIsGround(rtuInfoEntity.getIsGround());
+//
+//		vo.setAdCity(rtuInfoEntity.getAdCity());
+//		vo.setAdDist(rtuInfoEntity.getAdDist());
+//
+//		String ancestors = vo.getAncestors();
+//		if (null != ancestors && ancestors.length() > 0) {
+//			String[] ancestorsList = ancestors.split(",");
+//			String adCode;
+//			if (ancestorsList.length >= 3) {
+//				adCode = ancestorsList[2];
+//			} else {
+//				adCode = vo.getAdCode();
+//			}
+//			if (null != adCode) {
+//				LambdaQueryWrapper<DeptRegionEntity> wrapper = Wrappers.<DeptRegionEntity>query().lambda();
+//				wrapper.eq(DeptRegionEntity::getIsDeleted, 0);
+//				wrapper.eq(DeptRegionEntity::getAdcd, adCode);
+//				List<DeptRegionEntity> deptRegionEntities = getDeptRegionService().list(wrapper);
+//				if (null != deptRegionEntities && deptRegionEntities.size() > 0) {
+//					String manageCompany = "";
+//					for (DeptRegionEntity deptRegionEntity : deptRegionEntities) {
+//						Dept dept = getDeptService().getById(deptRegionEntity.getDeptId());
+//						if (null != dept) {
+//							if (manageCompany.length() > 0) {
+//								manageCompany += " / ";
+//							}
+//							manageCompany += dept.getDeptName();
+//						}
+//					}
+//					vo.setManageCompany(manageCompany);
+//				}
+//			}
+//		}
 		return vo;
 	}
 }

src/main/java/org/springblade/task/InspectionPlanCheckTask.java

@@ -71,6 +71,8 @@ public class InspectionPlanCheckTask implements Callable<Integer> {
                             dto.setInspectionTitle(planEntity.getPlanTitle());
                             dto.setInspectionStatus(InspectionStatusEnum.STATUS_TODO.getCode());
                             dto.setInspectionDate(Date.from(inspectionDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()));
+                            dto.setTenantId(planEntity.getTenantId());
+                            dto.setOrgId(planEntity.getOrgId());
                             inspectionService.save(dto);
                         }
                     } else if (planEntity.getTimeType() == 2) {
@@ -90,6 +92,8 @@ public class InspectionPlanCheckTask implements Callable<Integer> {
                             dto.setInspectionTitle(planEntity.getPlanTitle());
                             dto.setInspectionStatus(InspectionStatusEnum.STATUS_TODO.getCode());
                             dto.setInspectionDate(Date.from(monday.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()));
+                            dto.setTenantId(planEntity.getTenantId());
+                            dto.setOrgId(planEntity.getOrgId());
                             inspectionService.save(dto);
                         }
                     } else if (planEntity.getTimeType() == 3) {
@@ -106,6 +110,8 @@ public class InspectionPlanCheckTask implements Callable<Integer> {
                             dto.setInspectionTitle(planEntity.getPlanTitle());
                             dto.setInspectionStatus(InspectionStatusEnum.STATUS_TODO.getCode());
                             dto.setInspectionDate(Date.from(inspectionDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()));
+                            dto.setTenantId(planEntity.getTenantId());
+                            dto.setOrgId(planEntity.getOrgId());
                             inspectionService.save(dto);
                         }
                     }

src/main/resources/application.yml

@@ -202,6 +202,7 @@ blade:
       - /galaxy-demo/demo/**
       - /galaxy-business/open/user/reg
       - /galaxy-business/data/manage/video
+      - /galaxy-business/rtu/data/**
     #授权认证配置
     auth:
       - method: ALL