From b39fe4bb2e243a070c7ae4b325f1c3540aa118dc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Apr 2023 14:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A1=E6=9F=A5=EF=BC=8C=E6=8B=9F=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD=E7=BD=AE=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEnterpriseServiceImpl.java | 47 ++++++++++++++++--- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 7867b1434b..48cd614b50 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.aop.NoRepeatSubmit; @@ -170,7 +171,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl update=new LambdaUpdateWrapper<>(); + update.eq(IcEnterprisePatrolRecordEntity::getId, formDTO.getPatrolId()) + .set(IcEnterprisePatrolRecordEntity::getPatrolTime, formDTO.getPatrolTime()) + .set(IcEnterprisePatrolRecordEntity::getStaffId, formDTO.getStaffId()) + .set(IcEnterprisePatrolRecordEntity::getStaffName, formDTO.getStaffName()) + .set(IcEnterprisePatrolRecordEntity::getMobile, formDTO.getMobile()) + .set(IcEnterprisePatrolRecordEntity::getResult, formDTO.getResult()) + .set(IcEnterprisePatrolRecordEntity::getDetailed, formDTO.getDetailed()) + .set(IcEnterprisePatrolRecordEntity::getReviewTime, formDTO.getReviewTime()); + enterprisePatrolRecordDao.update(null,update); //删除之前的图片 enterprisePatrolAttachmentDao.deleteByPatrolId(formDTO.getPatrolId(), formDTO.getUserId()); } @@ -187,7 +197,19 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, formDTO.getEnterpriseId()) + .orderByDesc(IcEnterprisePatrolRecordEntity::getPatrolTime) + .orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime) + .last("limit 1"); + IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper); + if (null != latestPatrol) { + // 更新主表的最新结果和最新检查时间 + baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), latestPatrol.getPatrolTime(), latestPatrol.getResult(), formDTO.getUserId()); + }else{ + baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), null, StrConstant.EPMETY_STR, formDTO.getUserId()); + } return patrolRecordEntity.getId(); } @@ -203,14 +225,27 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl patrolUpdate = new LambdaUpdateWrapper<>(); + patrolUpdate.eq(IcEnterprisePatrolRecordEntity::getId, patrolId) + .set(IcEnterprisePatrolRecordEntity::getUpdatedBy, currentUserId) + .set(IcEnterprisePatrolRecordEntity::getUpdatedTime, nowTime) + .set(IcEnterprisePatrolRecordEntity::getDelFlag, NumConstant.ONE_STR); + enterprisePatrolRecordDao.update(null, patrolUpdate); //2、删除之前的图片 enterprisePatrolAttachmentDao.deleteByPatrolId(patrolId, currentUserId); - //3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空 + // 3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId()); - if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) { + queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId()) + .orderByDesc(IcEnterprisePatrolRecordEntity::getPatrolTime) + .orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime) + .last("limit 1"); + IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper); + if (null != latestPatrol) { + // 更新主表的最新结果和最新检查时间 + baseDao.updateLatestPatrol(origin.getEnterpriseId(), latestPatrol.getPatrolTime(), latestPatrol.getResult(), currentUserId); + } else { baseDao.updateLatestPatrol(origin.getEnterpriseId(), null, StrConstant.EPMETY_STR, currentUserId); } }