20:25 我的待办分页查询条件修改，处置表单 修改

fuliqi

2023-11-24 d885ffc9f9ed909b0f7cb27da26e8b8fff1f89ea

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java

@@ -1,19 +1,23 @@
package com.ycl.service.caseHandler.impl;

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.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.StepName;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.resources.ImageResources;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.*;
import com.ycl.service.resources.IImageResourcesService;
import com.ycl.vo.MyBacklogVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -26,6 +30,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -40,12 +45,10 @@

    @Resource
    BaseCaseMapper baseCaseMapper;

    @Resource
    DisposeRecordMapper disposeRecordMapper;
    @Resource
    WorkflowConfigStepMapper workflowConfigStepMapper;

    @Autowired
    IInvestigationService iInvestigationService;
    @Autowired
@@ -60,84 +63,159 @@
    IDisposeRecordService iDisposeRecordService;
    @Autowired
    IImageResourcesService iImageResourcesService;
    public final static Short LAST_WEEK = 0;
    public final static Short LAST_MONTH = 1;
    public final static Short LAST_THREEMONTH = 2;

    @Override
    public List<MyBacklogVO> listMyTask(String num, Long userId) {
        return disposeRecordMapper.selectMyBackList(userId, num);
    public Page<MyBacklogVO> listMyTask(Page<MyBacklogVO> page, String num, Long userId, Short type, Short source, Short time) {
        LocalDateTime alarmTimeStart = null;
        LocalDateTime alarmTimeEnd = null;
        if (Objects.equals(time, LAST_WEEK)) {
            alarmTimeStart = LocalDateTime.now().minusDays(7);
            alarmTimeEnd = LocalDateTime.now();
        } else if (Objects.equals(time, LAST_MONTH)) {
            alarmTimeStart = LocalDateTime.now().minusMonths(1);
            alarmTimeEnd = LocalDateTime.now();
        } else if (Objects.equals(time, LAST_THREEMONTH)) {
            alarmTimeStart = LocalDateTime.now().minusMonths(3);
            alarmTimeEnd = LocalDateTime.now();
        }
        //TODO:出现过一次重复数据
        return disposeRecordMapper.selectMyBackList(page, userId, num, alarmTimeStart, alarmTimeEnd, source, type);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean saveUpload(Long caseId, Integer type, UploadDisposingResultParam uploadDisposingResultParam) {
    public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //当事人
        PartyInfo partyInfo = new PartyInfo();
        if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
        List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
        if (!list.isEmpty()) {
            //TODO:违规没有当事人ID,违建才有
            if (uploadDisposingResultParam.getPartyInfoId() != null) {
                //当事人
                PartyInfo partyInfo = new PartyInfo();
                BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
                partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
                iPartyInfoService.updateById(partyInfo);
                //调查取证
                Investigation investigation = new Investigation();
                BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
                investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
                investigation.setPartyId(partyInfo.getId());
                //TODO:改为集合的字符串形式
                investigation.setPic(uploadDisposingResultParam.getPic().toString());
                //TODO:小程序前端页面没有调查时间，暂时不填
                //investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                investigation.setId(uploadDisposingResultParam.getInvestigationId());
                iInvestigationService.updateById(investigation);
            }
            //到达
            ArrivalSituation arrivalSituation = new ArrivalSituation();
            BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
            arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
            arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
            arrivalSituation.setId(uploadDisposingResultParam.getArrivalSituationId());
            //TODO:改为集合的字符串形式
            arrivalSituation.setSituationPic(uploadDisposingResultParam.getSituationPic().toString());
            iArrivalSituationService.updateById(arrivalSituation);
            //文书
            String handType = "02";
            ImageResources imageResources = new ImageResources();
            imageResources.setType(handType);
            imageResources.setBelongToId(uploadDisposingResultParam.getCaseId());
            imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic().toString(), uploadDisposingResultParam.getSituationPic().toString()));
            imageResources.setId(uploadDisposingResultParam.getImageResourcesId());
            iImageResourcesService.updateById(imageResources);
            if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) {
                Writ writ = new Writ();
                BeanUtils.copyProperties(uploadDisposingResultParam, writ);
                writ.setBaseCaseId(uploadDisposingResultParam.getCaseId());
                writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
                writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                iWritService.updateById(writ);
                imageResources.setUrl(StringUtils
                        .joinWith(",", uploadDisposingResultParam.getPic()
                                , uploadDisposingResultParam.getSituationPic()
                                , uploadDisposingResultParam.getOriginalPic()
                                , uploadDisposingResultParam.getOtherPic()
                                , uploadDisposingResultParam.getRectifiedPic()
                                , uploadDisposingResultParam.getWritPic()));
                iImageResourcesService.updateById(imageResources);
            }
            baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        } else {
            //当事人
            PartyInfo partyInfo = new PartyInfo();
            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
            partyInfo.setCreateUser(user.getUserId().intValue());
            partyInfo.setCreateTime(LocalDateTime.now());
            iPartyInfoService.save(partyInfo);
        }
        //调查取证
        Investigation investigation = new Investigation();
        BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
        investigation.setBaseCaseId(caseId);
        investigation.setCreateTime(LocalDateTime.now());
        investigation.setCreateUser(user.getUserId());
        investigation.setPartyId(partyInfo.getId());
        investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        iInvestigationService.save(investigation);
        //到达
        ArrivalSituation arrivalSituation = new ArrivalSituation();
        BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
        arrivalSituation.setBaseCaseId(caseId);
        arrivalSituation.setCreateTime(LocalDateTime.now());
        arrivalSituation.setCreateUser(user.getUserId());
        arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        iArrivalSituationService.save(arrivalSituation);
        //文书
        Integer illegalBuildingType = 2;
        Integer violation = 1;
        String handType = "02";
        ImageResources imageResources = new ImageResources();
        imageResources.setType(handType);
        imageResources.setBelongToId(caseId);
        imageResources.setCreateTime(LocalDateTime.now());
        imageResources.setCreateUser(user.getUserId());
        if (type == violation) {
            imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
            //调查取证
            Investigation investigation = new Investigation();
            BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
            investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
            investigation.setCreateTime(LocalDateTime.now());
            //TODO:改为集合的字符串形式
            investigation.setPic(uploadDisposingResultParam.getPic().toString());
            investigation.setCreateUser(user.getUserId());
            investigation.setPartyId(partyInfo.getId());

            //TODO:前端页面没有调查时间，暂时不填
//            investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
            iInvestigationService.save(investigation);
            //到达
            ArrivalSituation arrivalSituation = new ArrivalSituation();
            BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
            arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
            arrivalSituation.setCreateTime(LocalDateTime.now());
            arrivalSituation.setCreateUser(user.getUserId());
            //TODO:改为集合的字符串形式
            arrivalSituation.setSituationPic(uploadDisposingResultParam.getSituationPic().toString());
            arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
            iArrivalSituationService.save(arrivalSituation);
            //文书
            String handType = "02";
            ImageResources imageResources = new ImageResources();
            imageResources.setType(handType);
            imageResources.setBelongToId(uploadDisposingResultParam.getCaseId());
            imageResources.setCreateTime(LocalDateTime.now());
            imageResources.setCreateUser(user.getUserId());
            imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic().toString(), uploadDisposingResultParam.getSituationPic().toString()));
            iImageResourcesService.save(imageResources);
            if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) {
                Writ writ = new Writ();
                BeanUtils.copyProperties(uploadDisposingResultParam, writ);
                writ.setBaseCaseId(uploadDisposingResultParam.getCaseId());
                writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
                writ.setCreateTime(LocalDateTime.now());
                writ.setCreateUser(user.getUserId());
                writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                iWritService.save(writ);
                imageResources.setUrl(StringUtils
                        .joinWith(",", uploadDisposingResultParam.getPic().toString()
                                , uploadDisposingResultParam.getSituationPic().toString()
                                , uploadDisposingResultParam.getOriginalPic()
                                , uploadDisposingResultParam.getOtherPic()
                                , uploadDisposingResultParam.getRectifiedPic()
                                , uploadDisposingResultParam.getWritPic()));
                iImageResourcesService.updateById(imageResources);
            }

            baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        }
        if (type == illegalBuildingType) {
            Writ writ = new Writ();
            BeanUtils.copyProperties(uploadDisposingResultParam, writ);
            writ.setBaseCaseId(caseId);
            writ.setIllegalBuildingId(caseId);
            writ.setCreateTime(LocalDateTime.now());
            writ.setCreateUser(user.getUserId());
            writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
            writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
            writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
            iWritService.save(writ);
            imageResources.setUrl(StringUtils
                    .joinWith(",", uploadDisposingResultParam.getPic()
                            , uploadDisposingResultParam.getSituationPic()
                            , uploadDisposingResultParam.getOriginalPic()
                            , uploadDisposingResultParam.getOtherPic()
                            , uploadDisposingResultParam.getRectifiedPic()
                            , uploadDisposingResultParam.getWritPic()));
            iImageResourcesService.save(imageResources);
        }
        baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        String stepName = StepName.CHECK.getName();
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setBaseCaseId(caseId);
        disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
        disposeRecord.setState(0);
        disposeRecord.setCreateTime(LocalDateTime.now());
        disposeRecord.setCreateUser(user.getUserId());
        disposeRecord.setStepName(stepName);
        disposeRecord.setStartTime(LocalDateTime.now());

        //结束上传处置流程
        QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
        qureyDispatch.eq("name", StepName.DISPOSE.getName());