feature：非警务纠纷优化

xusd

2025-06-13 64db03a5eb8ece65c6487f9f3370f8b6ebfe0b8b

feature：非警务纠纷优化

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -2622,12 +2622,12 @@
                caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());

                caseInfo.setCaseLevel(3);
                //获取一级类型
                SyCause syCause = sysClient.getParentCaseTypeById(caseInfo.getCaseType());
                if (ObjectUtils.isNotEmpty(syCause)) {
                    caseInfo.setCaseTypeFirst(syCause.getId());
                    caseInfo.setCaseTypeFirstName(syCause.getName());
                }
//                //获取一级类型
//                SyCause syCause = sysClient.getParentCaseTypeById(caseInfo.getCaseType());
//                if (ObjectUtils.isNotEmpty(syCause)) {
//                    caseInfo.setCaseTypeFirst(syCause.getId());
//                    caseInfo.setCaseTypeFirstName(syCause.getName());
//                }
                //默认小程序可见
                if (ObjectUtils.isNotEmpty(caseInfo.getCanal())) {
                    if (CaseBaseConstsEnum.CASE_CANAL_1.getIndex().equals(caseInfo.getCanal())) {

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridEventWebController.java

@@ -73,6 +73,7 @@

    /**
    * 获取请求URL参数
     *
    * @return Map<String, Object>
    */
    private Map<String, Object> getParameter(){
@@ -211,8 +212,9 @@

    /**
    * 条件查询多个
    * @url {ctx}/api/web/gridEvent/listQuery
     *
    * @return Object
     * @url {ctx}/api/web/gridEvent/listQuery
    */
    @GetMapping("/listQuery")
    public Object listQuery() {
@@ -226,10 +228,11 @@

    /**
    * 条件分页查询
    * @url {ctx}/api/web/gridEvent/pageQuery
     *
    * @param page 页码
    * @param size 每页数量
    * @return Object
     * @url {ctx}/api/web/gridEvent/pageQuery
    */
    @GetMapping("/pageQuery")
    public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
@@ -246,9 +249,10 @@

    /**
    * 根据编号查询单个
    * @url {ctx}/api/web/gridEvent/getById
     *
    * @param id 主键编号
    * @return Object
     * @url {ctx}/api/web/gridEvent/getById
    */
    @GetMapping("/getById")
    public Object getById(@RequestParam(value = "id") String id) {
@@ -261,9 +265,10 @@

    /**
    * 根据主键单个
    * @url {ctx}/api/web/gridEvent/deleteById
     *
    * @param id 主键编号
    * @return Object
     * @url {ctx}/api/web/gridEvent/deleteById
    */
    @GetMapping("/deleteById")
    public Object deleteById(@RequestParam(value = "id") String id) {
@@ -277,9 +282,10 @@

    /**
    * 新增或更新对象
    * @url {ctx}/api/web/gridEvent/saveGridEvent
     *
    * @param gridEvent 实体对象
    * @return Object
     * @url {ctx}/api/web/gridEvent/saveGridEvent
    */
    @PostMapping("/saveGridEvent")
    public Object saveGridEvent(@RequestBody GridEvent gridEvent) {
@@ -293,9 +299,10 @@

    /**
     * 根据编号查询单个
     * @url {ctx}/api/web/gridEvent/getGridEventId
     *
     * @param caseId 案件编号
     * @return Object
     * @url {ctx}/api/web/gridEvent/getGridEventId
     */
    @GetMapping("/getGridEventId")
    public Object getGridEventId(@RequestParam(value = "caseId") String caseId) {
@@ -314,9 +321,10 @@

    /**
     * 根据编号查询单个
     * @url {ctx}/api/web/gridEvent/updateCaseEvent
     *
     * @param gridApprovalRecordVo
     * @return Object
     * @url {ctx}/api/web/gridEvent/updateCaseEvent
     */
    @PostMapping("/updateCaseEvent")
    public Object updateCaseEvent(@RequestBody GridApprovalRecordVo gridApprovalRecordVo) {
@@ -394,7 +402,44 @@
                    terms.put("mainId", gridApprovalRecordVo.getCaseId());
                }
                List<FileInfoBaseDTO> fileInfoBaseDTOList = fileInfoService.listFileInfoByTerms(terms);
                Map<String, Object> terms2 = new HashMap<>();
                if (ObjectUtils.isNotEmpty(gridApprovalRecordVo) && StringUtils.isNotBlank(gridApprovalRecordVo.getCaseId())) {
                    terms2.put("mainId", gridApprovalRecordVo.getCaseId());
                    terms2.put("ownerCat", "22_00014-5");
                }
                List<FileInfoBaseDTO> windUpList = fileInfoService.listFileInfoByTerms(terms2);
                List<GridFileRelatedVo> windupRelateVoList = new ArrayList<>();
                log.info("获取到附件上传："+fileInfoBaseDTOList.size());
                if (windUpList != null && windUpList.size() > 0) {
                    log.info("获取到结案附件上传：" + windUpList.size());
                    for (FileInfoBaseDTO fileInfoBaseDTO : windUpList) {
                        try {
                            GridFileUploadVo gridFileUploadVo = new GridFileUploadVo();
                            gridFileUploadVo.setFileName(fileInfoBaseDTO.getFileName());
                            gridFileUploadVo.setFilePath(fileInfoBaseDTO.getFullPath());
                            gridFileUploadVo.setFileSize(fileInfoBaseDTO.getSize() != null ? fileInfoBaseDTO.getSize().longValue() : 0L);
                            gridFileUploadVo.setType(fileInfoBaseDTO.getSuffix());
                            R<GridFileUploadDTO> result = null;
                            //上传附件信息
                            result = gridCaseDataService.uploadFileInfo(gridFileUploadVo);
                            if (R.SUCCESS == result.getCode()) {
                                //获取上传结果，组成新的附件对象
                                GridFileUploadDTO gridFileUploadDTO = result.getData();
                                GridFileRelatedVo gridFileRelatedVo = new GridFileRelatedVo();
                                gridFileRelatedVo.setFileName(gridFileUploadDTO.getFileName());
                                gridFileRelatedVo.setFilePath(gridFileUploadDTO.getFilePath());
                                gridFileRelatedVo.setOriginalFileName(gridFileUploadDTO.getOriginalFileName());
                                gridFileRelatedVo.setFileSize(gridFileUploadDTO.getFileSize());
                                gridFileRelatedVo.setType("add");
                                gridFileRelatedVo.setFileType(gridFileUploadDTO.getFileType());
                                windupRelateVoList.add(gridFileRelatedVo);
                            }
                        } catch (Exception e) {
                            e.printStackTrace();
                            log.info("附件上传失败：" + fileInfoBaseDTO.getId());
                        }
                    }
                }
                List<GridFileRelatedVo> gridFileRelatedVoList = new ArrayList<>();
                for (FileInfoBaseDTO fileInfoBaseDTO: fileInfoBaseDTOList){
                    try {
@@ -423,9 +468,13 @@
                        log.info("附件上传失败："+fileInfoBaseDTO.getId());
                    }
                }
                log.info("xsdgridApprovalRecordVo{}",gridApprovalRecordVo);
                if(gridApprovalRecordVo.getHandleName().equals(GridEnum.EVENT_FLOW_3.getIndex())){
                    //插入到更新事件对象中
                    log.info("gridFileRelatedVoList{}",gridFileRelatedVoList);
                    log.info("windupRelateVoList{}",windupRelateVoList);
                    gridApprovalRecordVo.setAfterAttachmentInfoList(gridFileRelatedVoList);
                    gridApprovalRecordVo.setEndAttachmentInfoList(windupRelateVoList);
                }else{
                    //插入到更新事件对象中
                    gridApprovalRecordVo.setAttachmentInfoList(gridFileRelatedVoList);

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridApprovalRecordVo.java

@@ -24,6 +24,7 @@
    private String nextHandleName; // 下一环节名称
    private List<GridFileRelatedVo> attachmentInfoList; // 审批附件
    private List<GridFileRelatedVo> afterAttachmentInfoList; // 处理后现场照片
    private List<GridFileRelatedVo> endAttachmentInfoList; // 处理后现场照片
    private String processingTime;// 环节处理期限，格式yyyy-MM-dd HH:mm:ss 如2022-05-20 15:11:21
    private String extInfo; // 扩展信息，json格式的字符串
    private String handleStatus;//处理状态（0：化解中  1:化解成功、2:化解不成功、3:不予受理）

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCaseDataService.java

@@ -142,7 +142,6 @@
        fileUpload.setFileName(gridFileUploadVo.getFileName());
        fileUpload.setOriginalFileName(gridFileUploadVo.getFileName());
        fileUpload.setType(gridFileUploadVo.getType());
        log.info("xsd:{}", JSON.toJSONString(fileUpload));
        log.info("xsd上传文件:{}", gridUrl + "/standard/attachment/upload");
        String s = null;
        try {
@@ -152,7 +151,7 @@
            } else {
                s = HttpClientUtils.httpPostRaw(gridUrl + "/standard/attachment/uploadBase64", JSON.toJSONString(fileUpload), headVo, "utf-8");
            }
            log.info("xsd:{}", s);
            log.info("xsd附件上传结果{}",s);
            JSONObject object = JSONObject.parseObject(s);
            if (object.getInteger("code") != null && object.getInteger("code") == 0) {
                GridFileUploadDTO data = object.getObject("data", GridFileUploadDTO.class);