ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportAuditingRecordVO.java
New file @@ -0,0 +1,21 @@ package com.ycl.platform.domain.vo; import com.ycl.platform.base.AbsVo; import lombok.Data; import java.util.Date; /** * @author：xp * @date：2024/9/4 15:34 */ @Data public class ReportAuditingRecordVO extends AbsVo { private Boolean result; private Date startCreateTime; private Date endCreateTime; } ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java
@@ -24,4 +24,14 @@ */ private List<WorkOrderAuditingRecord> auditingList; /** * 事前报备说明 */ private String beforeReportMsg; /** * 事后报备说明：已报备、报备失效等 */ private String afterReportMsg; } ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.platform.base.BaseSelect; import com.ycl.platform.domain.entity.ReportAuditingRecord; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.query.YwPointQuery; import com.ycl.platform.domain.vo.ReportAuditingRecordVO; import com.ycl.platform.domain.vo.YwPointVO; import com.ycl.platform.domain.excel.PointExport; import org.apache.ibatis.annotations.Mapper; @@ -94,4 +96,12 @@ * @return */ List<YwPoint> select(@Param("keyword") String keyword, @Param("unitId") Integer unitId); /** * 获取最新一条报备结果 * @param serialNumber * @param reportType * @return */ ReportAuditingRecordVO getReportResult(@Param("serialNumber") String serialNumber, @Param("reportType") String reportType); } ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -1,10 +1,12 @@ package com.ycl.platform.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.platform.domain.entity.ReportAuditingRecord; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.form.BatchEditPointForm; import com.ycl.platform.domain.form.YwPointForm; import com.ycl.platform.domain.query.YwPointQuery; import com.ycl.platform.domain.vo.ReportAuditingRecordVO; import com.ycl.system.Result; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; @@ -122,4 +124,11 @@ * @return */ Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException; /** * 获取报备是否审核通过（最新一条） * @param reportType * @return */ ReportAuditingRecordVO getReportResult(String serialNumber, String reportType); } ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; /** * 考核结果Service业务层处理 @@ -50,7 +51,12 @@ */ @Override public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) { contractResult.setUnitId(Long.valueOf(SecurityUtils.getUnitId())); Integer unitId = SecurityUtils.getUnitId(); Long uid = null; if (Objects.nonNull(unitId)) { uid = Long.valueOf(unitId); } contractResult.setUnitId(uid); return checkResultMapper.selectCheckResultList(contractResult); }
@@ -16,10 +16,7 @@ import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.*; import java.util.stream.Collectors; /** @@ -45,7 +42,12 @@ */ @Override public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) { contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId())); Integer unitId = SecurityUtils.getUnitId(); Long uid = null; if (Objects.nonNull(unitId)) { uid = Long.valueOf(unitId); } contractScore.setUnitId(uid); return contractScoreMapper.selectDefaultScoreList(contractScore); }
@@ -744,6 +744,12 @@ @Override public Result processImg(String workOrderNo) { WorkOrder workOrder = new LambdaQueryChainWrapper<>(baseMapper) .eq(WorkOrder::getWorkOrderNo, workOrderNo) .one(); if (Objects.isNull(workOrder)) { throw new RuntimeException("此工单不存在"); } // 运维记录 List<WorkOrderYwConditionRecordVO> workOrderYwConditionRecordVOS = this.selectYwConditionByYwId(workOrderNo); // 审核记录 @@ -751,6 +757,25 @@ WorkOrderProcessVO process = new WorkOrderProcessVO(); process.setYwList(workOrderYwConditionRecordVOS); process.setAuditingList(workOrderAuditingRecords); // 查询点位事前事后最新的一条数据是否审核通过 ReportAuditingRecordVO beforeRecord = ywPointService.getReportResult(workOrder.getSerialNumber(), "事前报备"); ReportAuditingRecordVO afterRecord = ywPointService.getReportResult(workOrder.getSerialNumber(), "事后报备"); Date now = new Date(); if (Objects.nonNull(beforeRecord)) { if (beforeRecord.getStartCreateTime().after(now)) { process.setBeforeReportMsg("事前报备已失效"); } else if (beforeRecord.getEndCreateTime().before(now)){ process.setBeforeReportMsg("事前报备未生效"); } } if (Objects.nonNull(afterRecord)) { if (afterRecord.getStartCreateTime().after(now)) { process.setAfterReportMsg("事后报备已失效"); } else if (afterRecord.getEndCreateTime().before(now)){ process.setAfterReportMsg("事后报备未生效"); } } return Result.ok().data(process); } } ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.dataListener.CurrencyDataListener; import com.ycl.platform.domain.entity.ReportAuditingRecord; import com.ycl.platform.domain.entity.YwPeople; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.excel.PointExport; import com.ycl.platform.domain.form.BatchEditPointForm; import com.ycl.platform.domain.form.YwPointForm; import com.ycl.platform.domain.query.YwPointQuery; import com.ycl.platform.domain.vo.ReportAuditingRecordVO; import com.ycl.platform.domain.vo.YwPointVO; import com.ycl.platform.mapper.YwPeopleMapper; import com.ycl.platform.mapper.YwPointMapper; @@ -250,6 +252,11 @@ return Result.ok(); } @Override public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) { return baseMapper.getReportResult(serialNumber, reportType); } /** * 修改点位的运维单位 * ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -198,4 +198,20 @@ </select> <select id="getReportResult" resultType="com.ycl.platform.domain.vo.ReportAuditingRecordVO"> SELECT ar.result, r.begin_create_time, r.end_create_time FROM t_report r INNER JOIN t_report_auditing_record ar ON r.id = ar.report_id AND ar.deleted = 0 AND r.report_type = #{reportType} AND r.deleted = 0 AND r.serial_number = #{serialNumber} AND ar.result = 1 ORDER BY ar.create_time DESC limit 1 </select> </mapper>
