Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-08 922e8c6763f9c8cd0311267b531b8b684ac5ea59

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

@@ -1,8 +1,10 @@
package com.ycl.controller.caseHandler;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
import com.ycl.entity.caseHandler.*;
@@ -41,6 +43,10 @@
    IPartyInfoService iPartyInfoService;
    @Autowired
    IWritService iWritService;
    @Autowired
    IBaseCaseService baseCaseService;
    @Autowired
    IDisposeRecordService iDisposeRecordService;

    @ApiOperation(value = "调度")
    @RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@@ -50,9 +56,18 @@
    }

    @ApiOperation(value = "上传违规/违建处置结果")
    @GetMapping("/addition_dispose_result")
    public CommonResult searchDisposeList(@RequestParam Integer caseId, @RequestParam Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
    @PostMapping("/addition_dispose_result")
    public CommonResult searchDisposeList(@RequestParam Long caseId,
                                          @RequestParam Integer type,
                                          @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();

        //修改案件状态为处置
        BaseCase baseCase = new BaseCase();
        baseCase.setId(caseId);
        baseCase.setState(BaseCaseStatus.DISPOSE);
        baseCaseService.updateById(baseCase);

        //当事人
        PartyInfo partyInfo = new PartyInfo();
        BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
@@ -64,7 +79,7 @@
        BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
        investigation.setBaseCaseId(caseId);
        investigation.setCreateTime(LocalDateTime.now());
        investigation.setCreateUser(user.getUserId().intValue());
        investigation.setCreateUser(user.getUserId().longValue());
        investigation.setPartyId(partyInfo.getId());
        iInvestigationService.save(investigation);
        //到达
@@ -72,20 +87,27 @@
        BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
        arrivalSituation.setBaseCaseId(caseId);
        arrivalSituation.setCreateTime(LocalDateTime.now());
        arrivalSituation.setCreateUser(user.getUserId().intValue());
        arrivalSituation.setCreateUser(user.getUserId().longValue());
        iArrivalSituationService.save(arrivalSituation);
        //文书
        Integer illegalBuildingType = 02;
        if (type == illegalBuildingType) {
        Integer illegalBuildingType = 2;
        if (type.equals(illegalBuildingType)) {
            Writ writ = new Writ();
            BeanUtils.copyProperties(uploadDisposingResultParam, writ);
            writ.setBaseCaseId(caseId);
            writ.setIllegalBuildingId(caseId);
            writ.setCreateTime(LocalDateTime.now());
            writ.setCreateUser(user.getUserId().intValue());
            writ.setCreateUser(user.getUserId().longValue());
            iWritService.save(writ);
        }
        /// TODO: 2022/9/30 添加成功后修改案件专题 添加流程 
        baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.CHECK));
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setBaseCaseId(caseId);
        disposeRecord.setState(0);
        disposeRecord.setCreateTime(LocalDateTime.now());
        disposeRecord.setCreateUser(user.getUserId().longValue());
        disposeRecord.setStepName("核查");
        iDisposeRecordService.save(disposeRecord);
        return CommonResult.success("add success");
    }
}