Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-24 457e566525d57ce0904e00aab9298ab0693ad5a1

 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,17 @@
        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);
            }
        }
        int num = insertArdAppPatrolplan(para);
        if(num==1){
            return Results.succeed("修改成功，已重新部署任务！");
@@ -307,4 +315,9 @@
        return ardAppPatrolplanMapper.executeList(ardAppPatrolplan);
    }

    @Override
    public Results executeOneById(String id) {
        return Results.succeed(ardAppPatrolplanMapper.selectById(id));
    }

}