上传处置驳回

wl

2022-11-18 8f66aa7785d8cc0bf1e642f638a7f1d8c67a5f69

上传处置驳回

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java

@@ -60,10 +60,8 @@
    @ApiOperation(value = "上传违规/违建处置结果")
    @PostMapping("/addition_dispose_result")
    @LogSave(operationType = "事项处置管理", contain = "案件上传处置结果")
    public CommonResult searchDisposeList(@RequestParam Long caseId,
                                          @RequestParam Integer type,
                                          @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
        iDisposeRecordService.saveUpload(caseId, type, uploadDisposingResultParam);
    public CommonResult searchDisposeList(@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
        iDisposeRecordService.saveOrUpdateUpload(uploadDisposingResultParam);
        return CommonResult.success("add success");
    }
}

 ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java

@@ -1,20 +1,32 @@
package com.ycl.dto.dispatch;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

@Data
@ApiModel("UploadDisposingResultParam")
public class UploadDisposingResultParam {

    @ApiModelProperty(value = "案件id")
    private Long caseId;
    //承办队员

    @ApiModelProperty(value = "调查取证id")
    private Long investigationId;

    @ApiModelProperty(value = "到达现场id")
    private Long arrivalSituationId;

    @ApiModelProperty(value = "当事人id")
    private Long partyInfoId;

    @ApiModelProperty(value = "文书id")
    private Long writId;

    @ApiModelProperty(value = "图片id")
    private Integer imageResourcesId;
    /**
     * 承办队员
     */

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java

@@ -80,7 +80,7 @@
     */
    @TableField("party_id")
    @ApiModelProperty(value = "当事人id")
    private Integer partyId;
    private Long partyId;

    /**
     * 情况描述

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java

@@ -28,7 +28,7 @@

    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "id")
    private Integer id;
    private Long id;

    /**
     * 姓名

 ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java

@@ -19,5 +19,5 @@

    List<MyBacklogVO> listMyTask(String num, Long userId);

    Boolean saveUpload(Long caseId, Integer type, UploadDisposingResultParam uploadDisposingResultParam);
    Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam);
}

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

@@ -1,5 +1,6 @@
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;
@@ -70,8 +71,71 @@

    @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();
        ArrivalSituation arrivalSituationed = iArrivalSituationService.getOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
        if (arrivalSituationed!=null || arrivalSituationed.getId()!=null){
            //当事人
            PartyInfo partyInfo = new PartyInfo();
            if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
                BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
                partyInfo.setCreateUser(user.getUserId().intValue());
                partyInfo.setCreateTime(LocalDateTime.now());
                partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
                iPartyInfoService.updateById(partyInfo);
            }
            //调查取证
            Investigation investigation = new Investigation();
            BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
            investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
            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")));
            investigation.setId(uploadDisposingResultParam.getInvestigationId());
            iInvestigationService.updateById(investigation);
            //到达
            ArrivalSituation arrivalSituation = new ArrivalSituation();
            BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
            arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
            arrivalSituation.setCreateTime(LocalDateTime.now());
            arrivalSituation.setCreateUser(user.getUserId());
            arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
            arrivalSituation.setId(uploadDisposingResultParam.getArrivalSituationId());
            iArrivalSituationService.updateById(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(), uploadDisposingResultParam.getSituationPic()));
            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.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")));
                writ.setBaseCaseId(uploadDisposingResultParam.getCaseId());
                iWritService.updateById(writ);
                imageResources.setUrl(StringUtils
                        .joinWith(",", uploadDisposingResultParam.getPic()
                                , uploadDisposingResultParam.getSituationPic()
                                , uploadDisposingResultParam.getOriginalPic()
                                , uploadDisposingResultParam.getOtherPic()
                                , uploadDisposingResultParam.getRectifiedPic()
                                , uploadDisposingResultParam.getWritPic()));
                iImageResourcesService.updateById(imageResources);
            }
        }

        //当事人
        PartyInfo partyInfo = new PartyInfo();
        if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
@@ -83,7 +147,7 @@
        //调查取证
        Investigation investigation = new Investigation();
        BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
        investigation.setBaseCaseId(caseId);
        investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
        investigation.setCreateTime(LocalDateTime.now());
        investigation.setCreateUser(user.getUserId());
        investigation.setPartyId(partyInfo.getId());
@@ -92,29 +156,25 @@
        //到达
        ArrivalSituation arrivalSituation = new ArrivalSituation();
        BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
        arrivalSituation.setBaseCaseId(caseId);
        arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
        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.setBelongToId(uploadDisposingResultParam.getCaseId());
        imageResources.setCreateTime(LocalDateTime.now());
        imageResources.setCreateUser(user.getUserId());
        if (type == violation) {
            imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
            iImageResourcesService.save(imageResources);
        }
        if (type == illegalBuildingType) {
        imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
        iImageResourcesService.save(imageResources);
        if (uploadDisposingResultParam.getWritCode() == null || uploadDisposingResultParam.getWritType() == null) {
            Writ writ = new Writ();
            BeanUtils.copyProperties(uploadDisposingResultParam, writ);
            writ.setBaseCaseId(caseId);
            writ.setIllegalBuildingId(caseId);
            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")));
@@ -128,12 +188,13 @@
                            , uploadDisposingResultParam.getOtherPic()
                            , uploadDisposingResultParam.getRectifiedPic()
                            , uploadDisposingResultParam.getWritPic()));
            iImageResourcesService.save(imageResources);
            iImageResourcesService.updateById(imageResources);
        }
        baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));

        baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).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());