单兵端巡检日历修改

aijinhui

2023-09-21 b207529cad1d89f1ae780bc7f0f0e70b4a756209

单兵端巡检日历修改

 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java

@@ -64,6 +64,18 @@
    @TableField(exist = false)
    private List<String> img;

    /** 删除标记 */
    @Excel(name = "删除标记")
    private Integer del;

    public Integer getDel() {
        return del;
    }

    public void setDel(Integer del) {
        this.del = del;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecordImg.java

@@ -26,6 +26,18 @@
    @Excel(name = "巡检图片")
    private String img;

    /** 删除标记 */
    @Excel(name = "删除标记")
    private Integer del;

    public Integer getDel() {
        return del;
    }

    public void setDel(Integer del) {
        this.del = del;
    }

    public void setId(String id) 
    {
        this.id = id;

 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("修改成功，已重新部署任务！");

 ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java

@@ -661,14 +661,14 @@
                int planNum = dayNum+onceNum;
                //这天总兴趣点数
                int wellNum = dayWell+onceWell;
                QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("user_id",userId).like("record_time",ymd);
                List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
                //已打卡总条数
                QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("user_id",userId).like("record_time",ymd).isNull("del");
                List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
                int num = list.size();
                //应打卡总条数
                int record = planNum*wellNum;
                if(num==record){
                if(num>=record){
                    recordBoolean = true;
                }
            }