From b207529cad1d89f1ae780bc7f0f0e70b4a756209 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 21 九月 2023 13:47:54 +0800 Subject: [PATCH] 单兵端巡检日历修改 --- ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 8 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java index 22c8933..9c4f482 100644 --- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java @@ -14,12 +14,8 @@ import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell; import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellVo; import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper; -import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint; -import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord; -import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser; -import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper; -import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointRecordMapper; -import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper; +import com.ruoyi.app.patrolplan.domain.*; +import com.ruoyi.app.patrolplan.mapper.*; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUserVo; import com.ruoyi.common.utils.DateUtils; @@ -31,8 +27,6 @@ import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper; -import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan; import com.ruoyi.app.patrolplan.service.IArdAppPatrolplanService; import org.springframework.transaction.annotation.Transactional; @@ -63,6 +57,9 @@ @Resource private ArdAppPatrolpointRecordMapper recordMapper; + + @Resource + private ArdAppPatrolpointRecordImgMapper recordImgMapper; /** * 鏌ヨapp宸℃璁″垝 @@ -294,6 +291,28 @@ if(result<1){ return Results.error("淇敼澶辫触锛屽師鏁版嵁鍋滅敤鍑洪敊锛�"); } + String planId = planList.getId(); + QueryWrapper<ArdAppPatrolpointRecord> patrolpointRecordQueryWrapper = new QueryWrapper<>(); + patrolpointRecordQueryWrapper.eq("plan_id",planId); + List<ArdAppPatrolpointRecord> records = recordMapper.selectList(patrolpointRecordQueryWrapper); + if(records.size()>0){ + for (int i = 0; i < records.size(); i++) { + ArdAppPatrolpointRecord record = records.get(i); + record.setDel(1); + recordMapper.updateById(record); + String id = record.getId(); + QueryWrapper<ArdAppPatrolpointRecordImg> recordImgQueryWrapper = new QueryWrapper<>(); + recordImgQueryWrapper.eq("plan_id",planId); + List<ArdAppPatrolpointRecordImg> recordImgs = recordImgMapper.selectList(recordImgQueryWrapper); + if(recordImgs.size()>0){ + for (int j = 0; j < recordImgs.size(); j++) { + ArdAppPatrolpointRecordImg recordImg = recordImgs.get(j); + recordImg.setDel(1); + recordImgMapper.updateById(recordImg); + } + } + } + } int num = insertArdAppPatrolplan(para); if(num==1){ return Results.succeed("淇敼鎴愬姛锛屽凡閲嶆柊閮ㄧ讲浠诲姟锛�"); @@ -302,4 +321,14 @@ } } + @Override + public List<ArdAppPatrolplan> executeList(ArdAppPatrolplan ardAppPatrolplan) { + return ardAppPatrolplanMapper.executeList(ardAppPatrolplan); + } + + @Override + public Results executeOneById(String id) { + return Results.succeed(ardAppPatrolplanMapper.selectById(id)); + } + } -- Gitblit v1.9.3