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

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

@@ -160,6 +160,7 @@ public class RtuCheckOrderController extends BladeController {
 
     /**
      * 新工单列表
+     *
      * @param checkOrderInfoDTO
      * @return
      */
@@ -387,6 +388,7 @@ public class RtuCheckOrderController extends BladeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "传入实体类CheckOrderInfoEntity")
     public R xjgdSave(@RequestBody CheckOrderInfoDTO checkOrderInfoEntity) {
+        BladeUser user = AuthUtil.getUser();
         if (Func.isNull(checkOrderInfoEntity.getBatchId())) {
             return R.fail("参数错误");
         }
@@ -395,18 +397,19 @@ public class RtuCheckOrderController extends BladeController {
         wrapper.last("limit 1");
         long count = rtuCheckOrderService.count(wrapper);
         if (count == 0) {
-            if (Func.notNull(checkOrderInfoEntity.getTaskOwnerId())){
+            if (Func.notNull(checkOrderInfoEntity.getTaskOwnerId())) {
                 DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CONFIRM.getCode());
                 checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
                 checkOrderInfoEntity.setOrderConfirmUser(checkOrderInfoEntity.getTaskOwnerId());
                 checkOrderInfoEntity.setOrderConfirm(1);
                 checkOrderInfoEntity.setOrderConfirmTime(new Date());
                 checkOrderInfoEntity.setContactUser(checkOrderInfoEntity.getTaskOwnerId());
-            }else{
+            } else {
                 DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CREATE.getCode());
                 checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
             }
             checkOrderInfoEntity.setOrderType(1);
+            checkOrderInfoEntity.setOrgId(Func.toLong(user.getDeptId()));
             rtuCheckOrderService.save(checkOrderInfoEntity);
             OrderProcessInfoEntity processInfoEntity = new OrderProcessInfoEntity();
             processInfoEntity.setOrderId(checkOrderInfoEntity.getId());
@@ -542,7 +545,7 @@ public class RtuCheckOrderController extends BladeController {
         if (Func.isNull(checkOrderInfoEntity.getId())) {
             return R.fail("参数错误");
         }
-       // BladeUser user = AuthUtil.getUser();
+        // BladeUser user = AuthUtil.getUser();
 
         DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CANCEL.getCode());
         OrderProcessInfoEntity processInfoEntity = new OrderProcessInfoEntity();
@@ -822,21 +825,32 @@ public class RtuCheckOrderController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "统计表格")
     public R<Map<String, Object>> orderCount(@ApiIgnore CheckOrderInfoDTO checkOrderInfoDTO) {
-        if (checkOrderInfoDTO.getAdCode() == null) {
-            return R.status(false);
-        }
-        checkOrderInfoDTO.setOrderClose(0);
+
+        BladeUser user = AuthUtil.getUser();
+        checkOrderInfoDTO.setOrgId(Func.toLong(user.getDeptId()));
         Long orderCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);
-        Long unConfirmOrderCount = rtuCheckOrderService.unconfirmOrderCount(checkOrderInfoDTO);
-        Long unCloseOrderCount = rtuCheckOrderService.unCloseOrderCount(checkOrderInfoDTO);
+
+        DictInfoEntity dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CREATE.getCode());
+        checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
+        Long unConfirmOrderCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);
+        dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CONFIRM.getCode());
+        checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
+        Long processingCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);
+        dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CLOSE_PENDING_APPROVE.getCode());
+        checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
+        Long closeApproveCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);
+        dictInfoEntity = baseInfoDictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE, OrderStatusEnum.STATUS_CLOSE.getCode());
+        checkOrderInfoDTO.setOrderStatusKey(dictInfoEntity.getId());
+        Long closeCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);
+
+
         Map<String, Object> data = new HashMap<>();
         data.put("orderCount", orderCount);
-        data.put("orderUnconfirm", unConfirmOrderCount);
-        data.put("orderProcessing", unCloseOrderCount);
-        checkOrderInfoDTO.setOrderConfirm(1);
-        checkOrderInfoDTO.setOrderClose(1);
-        Long reportOrderCount = rtuCheckOrderService.orderCount(checkOrderInfoDTO);
-        data.put("reportOrderCount", reportOrderCount);
+        data.put("orderUnconfirmCount", unConfirmOrderCount);
+        data.put("orderProcessingCount", processingCount);
+        data.put("closeApproveOrderCount", closeApproveCount);
+        data.put("closeOrderCount", closeCount);
+
         return R.data(data);
     }
 }

src/main/java/org/springblade/modules/business/check/order/entity/CheckOrderInfoEntity.java

@@ -8,6 +8,8 @@ package org.springblade.modules.business.check.order.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -35,6 +37,14 @@ public class CheckOrderInfoEntity extends BaseEntity {
 	@ApiModelProperty("租户ID")
 	private String tenantId;
 
+	/**
+	 * 机构ID
+	 */
+	@ApiModelProperty("机构ID")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Long orgId;
+
+
 	/**
 	 * 测站编码
 	 */

src/main/java/org/springblade/modules/business/check/order/mapper/RtuCheckOrderMapper.xml

@@ -26,6 +26,7 @@
         <result column="longitude" property="longitude"/>
         <result column="latitude" property="latitude"/>
         <result column="address" property="address"/>
+        <result column="org_id" property="orgId"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -67,6 +68,7 @@
         <result column="longitude" property="longitude"/>
         <result column="latitude" property="latitude"/>
         <result column="address" property="address"/>
+        <result column="org_id" property="orgId"/>
     </resultMap>
 
     <resultMap id="checkOrderCountVOResultMap" type="org.springblade.modules.business.check.order.vo.CheckOrderCountVO">
@@ -87,6 +89,9 @@
         LEFT JOIN blade_user u3 ON u3.id = o.create_user and u3.is_deleted=0
         WHERE
         o.is_deleted = 0
+        <if test="checkOrderInfoDTO.orgId!=null">
+            and o.org_id = #{checkOrderInfoDTO.orgId}
+        </if>
         <if test="checkOrderInfoDTO.rtuCode!=null">
             and o.rtu_code like concat(concat('%', #{checkOrderInfoDTO.rtuCode}), '%')
         </if>
@@ -276,6 +281,12 @@
         LEFT JOIN data_ad_cd_b a ON a.adcd = i.ad_code and a.is_deleted=0
         WHERE
         o.is_deleted = 0
+        <if test="checkOrderInfoDTO.orgId!=null">
+            and o.org_id = #{checkOrderInfoDTO.orgId}
+        </if>
+        <if test="checkOrderInfoDTO.orderStatusKey!=null">
+            and o.order_status_key = #{checkOrderInfoDTO.orderStatusKey}
+        </if>
         <if test="checkOrderInfoDTO.orderClose!=null">
             and o.order_close = #{checkOrderInfoDTO.orderClose}
         </if>

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

@@ -131,7 +131,18 @@ public class EquipmentInspectionController extends BladeController {
 //                inspectionInfoDTO.setAdCode(deptRegionEntity.getAdcd());
 //            }
 //        }
+        if (inspectionInfoDTO.getInspectionStatusOption() == 1) {
+            inspectionInfoDTO.setInspectionStatus(InspectionStatusEnum.STATUS_TODO.getCode());
+        } else if (inspectionInfoDTO.getInspectionStatusOption() == 2) {
+            inspectionInfoDTO.setInspectionStatus(InspectionStatusEnum.STATUS_CLOSE_APPROVE.getCode());
+        } else if (inspectionInfoDTO.getInspectionStatusOption() == 3) {
+            inspectionInfoDTO.setInspectionStatus(InspectionStatusEnum.STATUS_APPROVED.getCode());
+        }
         IPage<EquipmentInspectionInfoVO> pages = equipmentInspectionService.selectPage(Condition.getPage(query), inspectionInfoDTO);
+        List<EquipmentInspectionInfoVO> list = pages.getRecords();
+        for (EquipmentInspectionInfoVO vo : list) {
+            EquipmentInspectionWrapper.build().entityVO(vo);
+        }
         return R.data(pages);
     }
 

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

@@ -98,4 +98,11 @@ public class EquipmentInspectionInfoDTO extends EquipmentInspectionInfoEntity {
 	 */
 	@ApiModelProperty("工单评分")
 	private Integer orderRate;
+
+	/**
+	 * 巡检状态查询条件
+	 */
+	@ApiModelProperty("巡检状态查询条件")
+	private Integer inspectionStatusOption;
+
 }

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

@@ -96,6 +96,9 @@
         <if test="inspectionInfoDTO.inspectionPlanId!=null">
             and n.inspection_plan_id =  #{inspectionInfoDTO.inspectionPlanId}
         </if>
+        <if test="inspectionInfoDTO.inspectionStatus!=null">
+            and n.inspection_status =  #{inspectionInfoDTO.inspectionStatus}
+        </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/vo/EquipmentInspectionInfoVO.java

@@ -13,9 +13,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.business.equipment.inspection.base.entity.EquipmentInspectionInfoEntity;
+import org.springblade.modules.business.equipment.inspection.report.vo.EquipmentInspectionReportVO;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /***
  * Date:2022/8/23
@@ -165,4 +167,8 @@ public class EquipmentInspectionInfoVO extends EquipmentInspectionInfoEntity {
 	)
 	private Date inspectionReportTime;
 
+	/**
+	 * 填报列表
+	 */
+	private List<EquipmentInspectionReportVO> reportList;
 }

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

@@ -13,12 +13,17 @@ 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.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.business.equipment.inspection.report.vo.EquipmentInspectionReportVO;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IRoleService;
 import org.springblade.modules.system.service.IUserService;
 
+import java.util.List;
 import java.util.Objects;
 
 /***
@@ -53,6 +58,15 @@ public class EquipmentInspectionWrapper extends BaseEntityWrapper<EquipmentInspe
         return reportService;
     }
 
+    private static IEquipmentInspectionPlanService planService;
+
+    private static IEquipmentInspectionPlanService getPlanService() {
+        if (planService == null) {
+            planService = SpringUtil.getBean(IEquipmentInspectionPlanService.class);
+        }
+        return planService;
+    }
+
     @Override
     public EquipmentInspectionInfoVO entityVO(EquipmentInspectionInfoEntity entity) {
         EquipmentInspectionInfoVO equipmentInspectionInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, EquipmentInspectionInfoVO.class));
@@ -69,6 +83,21 @@ public class EquipmentInspectionWrapper extends BaseEntityWrapper<EquipmentInspe
                 entity.setInspectionReportTime(reportEntity.getCreateTime());
             }
         }
+
+        EquipmentInspectionPlanEntity planEntity = getPlanService().getById(entity.getInspectionPlanId());
+        entity.setInspectionCompleteTime(planEntity.getInspectionCompleteTime());
+        entity.setPlanScheduledType(planEntity.getPlanScheduledType());
+        entity.setTimeType(planEntity.getTimeType());
+
+        if (entity.getInspectionStatus() == 2 || entity.getInspectionStatus() == 3) {
+            EquipmentInspectionReportDTO dto = new EquipmentInspectionReportDTO();
+            dto.setInspectionId(entity.getId());
+            List<EquipmentInspectionReportVO> reportEntitys = getReportService().selectList(dto);
+            if (Func.notNull(reportEntitys)) {
+                entity.setReportList(reportEntitys);
+            }
+        }
+
 //		String rtuKindDesc = "";
 //		if (entity.getIsRain() != null && entity.getIsRain() == 1) {
 //			rtuKindDesc = "雨量站";

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

@@ -13,6 +13,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 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;
@@ -21,7 +22,10 @@ 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.OrderStatusEnum;
+import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
+import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
 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;
@@ -54,9 +58,13 @@ public class EquipmentInspectionPlanController extends BladeController {
     @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);
+    public R<IPage<EquipmentInspectionPlanVO>> page(@ApiIgnore EquipmentInspectionPlanDTO dto, Query query) {
+        if (dto.getPlanTypeOption() == 1) {
+            dto.setPlanScheduledType(1);
+        } else if (dto.getPlanTypeOption() == 2) {
+            dto.setPlanScheduledType(2);
+        }
+        IPage<EquipmentInspectionPlanVO> pages = planService.selectPage(Condition.getPage(query), dto);
         return R.data(pages);
     }
 
@@ -164,4 +172,30 @@ public class EquipmentInspectionPlanController extends BladeController {
         boolean temp = planService.deleteLogic(Func.toLongList(ids));
         return R.status(temp);
     }
+
+    @GetMapping("/count")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "统计表格")
+    public R<Map<String, Object>> planCount(@ApiIgnore EquipmentInspectionPlanDTO dto) {
+
+        BladeUser user = AuthUtil.getUser();
+        dto.setOrgId(Func.toLong(user.getDeptId()));
+        Long planCount = planService.planCount(dto);
+        dto.setPlanScheduledType(1);
+        Long onlyOneCount = planService.planCount(dto);
+        dto.setPlanScheduledType(2);
+        Long runCount = planService.planCount(dto);
+
+
+
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("planCount", planCount);
+        data.put("onlyOnePlanCount", onlyOneCount);
+        data.put("runPlanCount", runCount);
+        data.put("planWarnCount", 0);
+
+
+        return R.data(data);
+    }
 }

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

@@ -51,4 +51,11 @@ public class EquipmentInspectionPlanDTO extends EquipmentInspectionPlanEntity {
 	 */
 	@ApiModelProperty(value = "行政区划编码")
 	private String adCode;
+
+	/**
+	 * 按计划类型查询参数
+	 */
+	@ApiModelProperty(value = "计划类型查询参数")
+	private Integer planTypeOption;
+
 }

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

@@ -25,5 +25,7 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface EquipmentInspectionPlanMapper extends BaseMapper<EquipmentInspectionPlanEntity> {
-    List<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, @Param("inspectionInfoDTO") EquipmentInspectionPlanDTO inspectionInfoDTO);
+    List<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, @Param("planDTO") EquipmentInspectionPlanDTO planDTO);
+
+    Long planCount( @Param("planDTO") EquipmentInspectionPlanDTO dto);
 }

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

@@ -57,6 +57,25 @@
         equipment_inspection_plan n
         WHERE
         n.is_deleted = 0
+        <if test="planDTO.planScheduledType!=null">
+            and n.plan_scheduled_type =  #{planDTO.planScheduledType}
+        </if>
+    </select>
+
+
+    <select id="planCount" resultType="java.lang.Long">
+        SELECT
+        count(*)
+        FROM
+        equipment_inspection_plan n
+        WHERE
+        n.is_deleted = 0
+        <if test="planDTO.orgId!=null">
+            and n.org_id = #{planDTO.orgId}
+        </if>
+        <if test="planDTO.planScheduledType!=null">
+            and n.plan_scheduled_type = #{planDTO.planScheduledType}
+        </if>
 
     </select>
 

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

@@ -9,6 +9,7 @@ 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.check.order.dto.CheckOrderInfoDTO;
 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;
@@ -25,8 +26,10 @@ import org.springblade.modules.business.equipment.inspection.plan.vo.EquipmentIn
  * Remark：认为有必要的其他信息
  */
 public interface IEquipmentInspectionPlanService extends BaseService<EquipmentInspectionPlanEntity> {
-	IPage<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, EquipmentInspectionPlanDTO inspectionInfoDTO);
+	IPage<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, EquipmentInspectionPlanDTO dto);
 
 	EquipmentInspectionPlanEntity yearPlan();
 	EquipmentInspectionPlanEntity getPlanInfo();
+
+	Long planCount(EquipmentInspectionPlanDTO dto);
 }

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

@@ -10,10 +10,6 @@ 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;
@@ -37,51 +33,56 @@ 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 IPage<EquipmentInspectionPlanVO> selectPage(IPage<EquipmentInspectionPlanVO> page, EquipmentInspectionPlanDTO dto) {
+        return page.setRecords(baseMapper.selectPage(page, dto));
+    }
 
-	@Override
-	public EquipmentInspectionPlanEntity yearPlan() {
-		LambdaQueryWrapper<EquipmentInspectionPlanEntity> wrapper = Wrappers.<EquipmentInspectionPlanEntity>query().lambda();
-		wrapper.eq(EquipmentInspectionPlanEntity::getIsDeleted,0);
-		wrapper.orderByDesc(EquipmentInspectionPlanEntity::getCreateTime);
-		wrapper.last("limit 1");
-		return baseMapper.selectOne(wrapper);
-	}
+    @Override
+    public EquipmentInspectionPlanEntity yearPlan() {
+        LambdaQueryWrapper<EquipmentInspectionPlanEntity> wrapper = Wrappers.<EquipmentInspectionPlanEntity>query().lambda();
+        wrapper.eq(EquipmentInspectionPlanEntity::getIsDeleted, 0);
+        wrapper.orderByDesc(EquipmentInspectionPlanEntity::getCreateTime);
+        wrapper.last("limit 1");
+        return baseMapper.selectOne(wrapper);
+    }
 
-	@Override
-	public EquipmentInspectionPlanEntity getPlanInfo() {
-		LambdaQueryWrapper<EquipmentInspectionPlanEntity> wrapper = Wrappers.<EquipmentInspectionPlanEntity>query().lambda();
-		wrapper.eq(EquipmentInspectionPlanEntity::getIsDeleted,0);
-		wrapper.orderByDesc(EquipmentInspectionPlanEntity::getCreateTime);
-		List<EquipmentInspectionPlanEntity> list = this.list(wrapper);
-		if (null != list && list.size()>0){
-			return list.get(0);
-		}else {
-			EquipmentInspectionPlanEntity entity=new EquipmentInspectionPlanEntity();
-			Calendar calendar= Calendar.getInstance();
-			calendar.setTime(new Date());
-			calendar.set(Calendar.MONTH,4-1);
-			calendar.set(Calendar.DAY_OF_MONTH,1);
-			entity.setBeforeRainSeasonStartTime(calendar.getTime());
-			calendar.set(Calendar.MONTH,6-1);
-			calendar.set(Calendar.DAY_OF_MONTH,1);
-			entity.setBeforeRainSeasonEndTime(calendar.getTime());
-			calendar.set(Calendar.MONTH,6-1);
-			calendar.set(Calendar.DAY_OF_MONTH,1);
-			entity.setRainSeasonFirstStartTime(calendar.getTime());
-			calendar.set(Calendar.MONTH,8-1);
-			calendar.set(Calendar.DAY_OF_MONTH,15);
-			entity.setRainSeasonFirstEndTime(calendar.getTime());
-			calendar.set(Calendar.MONTH,8-1);
-			calendar.set(Calendar.DAY_OF_MONTH,15);
-			entity.setRainSeasonSecondStartTime(calendar.getTime());
-			calendar.set(Calendar.MONTH,10-1);
-			calendar.set(Calendar.DAY_OF_MONTH,1);
-			entity.setRainSeasonSecondEndTime(calendar.getTime());
-			return entity;
-		}
-	}
+    @Override
+    public EquipmentInspectionPlanEntity getPlanInfo() {
+        LambdaQueryWrapper<EquipmentInspectionPlanEntity> wrapper = Wrappers.<EquipmentInspectionPlanEntity>query().lambda();
+        wrapper.eq(EquipmentInspectionPlanEntity::getIsDeleted, 0);
+        wrapper.orderByDesc(EquipmentInspectionPlanEntity::getCreateTime);
+        List<EquipmentInspectionPlanEntity> list = this.list(wrapper);
+        if (null != list && list.size() > 0) {
+            return list.get(0);
+        } else {
+            EquipmentInspectionPlanEntity entity = new EquipmentInspectionPlanEntity();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.set(Calendar.MONTH, 4 - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            entity.setBeforeRainSeasonStartTime(calendar.getTime());
+            calendar.set(Calendar.MONTH, 6 - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            entity.setBeforeRainSeasonEndTime(calendar.getTime());
+            calendar.set(Calendar.MONTH, 6 - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            entity.setRainSeasonFirstStartTime(calendar.getTime());
+            calendar.set(Calendar.MONTH, 8 - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 15);
+            entity.setRainSeasonFirstEndTime(calendar.getTime());
+            calendar.set(Calendar.MONTH, 8 - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 15);
+            entity.setRainSeasonSecondStartTime(calendar.getTime());
+            calendar.set(Calendar.MONTH, 10 - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            entity.setRainSeasonSecondEndTime(calendar.getTime());
+            return entity;
+        }
+    }
+
+    @Override
+    public Long planCount(EquipmentInspectionPlanDTO dto) {
+        return baseMapper.planCount(dto);
+    }
 }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.common.cache.DictBizCache;
 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.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
@@ -20,7 +21,9 @@ import org.springblade.modules.business.equipment.inspection.report.entity.Equip
 import org.springblade.modules.business.equipment.inspection.report.vo.EquipmentInspectionReportVO;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
 
 import java.util.List;
 import java.util.Objects;
@@ -35,44 +38,58 @@ import java.util.Objects;
  */
 
 public class EquipmentInspectionReportWrapper extends BaseEntityWrapper<EquipmentInspectionReportEntity, EquipmentInspectionReportVO> {
-	public static EquipmentInspectionReportWrapper build() {
-		return new EquipmentInspectionReportWrapper();
-	}
+    public static EquipmentInspectionReportWrapper build() {
+        return new EquipmentInspectionReportWrapper();
+    }
 
-	private static IRtuBaseInfoService rtuBaseInfoService;
+    private static IRtuBaseInfoService rtuBaseInfoService;
 
-	private static IRtuBaseInfoService getRtuBaseInfoService() {
-		if (rtuBaseInfoService == null) {
-			rtuBaseInfoService = SpringUtil.getBean(IRtuBaseInfoService.class);
-		}
-		return rtuBaseInfoService;
-	}
+    private static IRtuBaseInfoService getRtuBaseInfoService() {
+        if (rtuBaseInfoService == null) {
+            rtuBaseInfoService = SpringUtil.getBean(IRtuBaseInfoService.class);
+        }
+        return rtuBaseInfoService;
+    }
 
-	private static IDeptRegionService deptRegionService;
+    private static IDeptRegionService deptRegionService;
 
-	private static IDeptRegionService getDeptRegionService() {
-		if (deptRegionService == null) {
-			deptRegionService = SpringUtil.getBean(IDeptRegionService.class);
-		}
-		return deptRegionService;
-	}
+    private static IDeptRegionService getDeptRegionService() {
+        if (deptRegionService == null) {
+            deptRegionService = SpringUtil.getBean(IDeptRegionService.class);
+        }
+        return deptRegionService;
+    }
 
-	private static IDeptService deptService;
+    private static IDeptService deptService;
 
-	private static IDeptService getDeptService() {
-		if (deptService == null) {
-			deptService = SpringUtil.getBean(IDeptService.class);
-		}
-		return deptService;
-	}
+    private static IDeptService getDeptService() {
+        if (deptService == null) {
+            deptService = SpringUtil.getBean(IDeptService.class);
+        }
+        return deptService;
+    }
 
-	@Override
-	public EquipmentInspectionReportVO entityVO(EquipmentInspectionReportEntity entity) {
-		EquipmentInspectionReportVO vo = Objects.requireNonNull(BeanUtil.copy(entity, EquipmentInspectionReportVO.class));
-		return entityVO(vo);
-	}
+    private static IUserService userService;
+
+    private static IUserService getUserService() {
+        if (userService == null) {
+            userService = SpringUtil.getBean(IUserService.class);
+        }
+        return userService;
+    }
+
+    @Override
+    public EquipmentInspectionReportVO entityVO(EquipmentInspectionReportEntity entity) {
+        EquipmentInspectionReportVO vo = Objects.requireNonNull(BeanUtil.copy(entity, EquipmentInspectionReportVO.class));
+        return entityVO(vo);
+    }
+
+    public EquipmentInspectionReportVO entityVO(EquipmentInspectionReportVO vo) {
+        if (Func.isNull(vo.getServicePersonName())) {
+            User user = getUserService().getById(vo.getCreateUser());
+            vo.setServicePersonName(user.getRealName());
+        }
 
-	public EquipmentInspectionReportVO entityVO(EquipmentInspectionReportVO vo) {
 //		LambdaQueryWrapper<RtuInfoEntity> rtuwrapper = Wrappers.<RtuInfoEntity>query().lambda();
 //		rtuwrapper.eq(RtuInfoEntity::getIsDeleted, 0L);
 //		rtuwrapper.eq(RtuInfoEntity::getRtuCode, vo.getRtuCode());
@@ -133,6 +150,6 @@ public class EquipmentInspectionReportWrapper extends BaseEntityWrapper<Equipmen
 //				}
 //			}
 //		}
-		return vo;
-	}
+        return vo;
+    }
 }