Browse Source

feat:立即处理接口返回初核情况

feature/tsjb-1.0
buaixuexideshitongxue 4 weeks ago
parent
commit
54a24d9aee
  1. 6
      src/main/java/com/biutag/supervision/pojo/domain/NegativeDetail.java
  2. 17
      src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java
  3. 14
      src/main/java/com/biutag/supervision/service/NegativeService.java

6
src/main/java/com/biutag/supervision/pojo/domain/NegativeDetail.java

@ -1,6 +1,8 @@
package com.biutag.supervision.pojo.domain; package com.biutag.supervision.pojo.domain;
import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO;
import com.biutag.supervision.pojo.entity.*; import com.biutag.supervision.pojo.entity.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -46,4 +48,8 @@ public class NegativeDetail {
// 认定办结 // 认定办结
private Boolean confirmationCompletionFlag = false; private Boolean confirmationCompletionFlag = false;
@Schema(description = "投诉举报PageDTO")
private ComplaintCollectionPageDTO complaintCollectionPageDTO;
} }

17
src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java

@ -1,5 +1,6 @@
package com.biutag.supervision.pojo.dto.complaintCollection; package com.biutag.supervision.pojo.dto.complaintCollection;
import com.baomidou.mybatisplus.annotation.TableField;
import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum; import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum;
import com.biutag.supervision.pojo.enums.complaintCollection.YesOrNoEnum; import com.biutag.supervision.pojo.enums.complaintCollection.YesOrNoEnum;
import com.biutag.supervision.pojo.vo.FileVo; import com.biutag.supervision.pojo.vo.FileVo;
@ -269,5 +270,21 @@ public class ComplaintCollectionPageDTO {
@Schema(description = "剩余办理时长") @Schema(description = "剩余办理时长")
private Long remainingDuration; private Long remainingDuration;
@Schema(description = "初核工作开展情况")
@TableField("init_work_des")
private String initWorkDes;
@Schema(description = "初核发现的问题及下步工作计划")
@TableField("init_problem_plan")
private String initProblemPlan;
/**
* 和核查结论保持一致
* @see com.biutag.supervision.constants.enums.CheckStatusEnum
*/
@Schema(description = "初核结论")
@TableField("init_verdict")
private String initVerdict;
} }

14
src/main/java/com/biutag/supervision/service/NegativeService.java

@ -24,12 +24,15 @@ import com.biutag.supervision.pojo.domain.NegativeDetail;
import com.biutag.supervision.pojo.domain.NegativeVo; import com.biutag.supervision.pojo.domain.NegativeVo;
import com.biutag.supervision.pojo.dto.ActionDto; import com.biutag.supervision.pojo.dto.ActionDto;
import com.biutag.supervision.pojo.dto.NegativeDto; import com.biutag.supervision.pojo.dto.NegativeDto;
import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO;
import com.biutag.supervision.pojo.dto.flow.FirstDistributeData; import com.biutag.supervision.pojo.dto.flow.FirstDistributeData;
import com.biutag.supervision.pojo.dto.flow.VerifyData; import com.biutag.supervision.pojo.dto.flow.VerifyData;
import com.biutag.supervision.pojo.dto.jwdc.NegativeApiDto; import com.biutag.supervision.pojo.dto.jwdc.NegativeApiDto;
import com.biutag.supervision.pojo.entity.*; import com.biutag.supervision.pojo.entity.*;
import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.model.UserAuth;
import com.biutag.supervision.pojo.request.complaintCollection.ComplaintCollectionPageRequest;
import com.biutag.supervision.pojo.vo.NegativeFileVo; import com.biutag.supervision.pojo.vo.NegativeFileVo;
import com.biutag.supervision.service.complaintCollection.ComplaintCollectionService;
import com.biutag.supervision.util.SpringUtil; import com.biutag.supervision.util.SpringUtil;
import com.biutag.supervision.util.TimeUtil; import com.biutag.supervision.util.TimeUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -173,6 +176,8 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
// 单位会签 // 单位会签
detail.setCountersignApplys(countersignApplyService.list(id)); detail.setCountersignApplys(countersignApplyService.list(id));
enrichCountersignsWithHistory(detail); enrichCountersignsWithHistory(detail);
// 初核情况
initDes(detail);
return detail; return detail;
} }
@ -527,4 +532,13 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
} }
private void initDes(NegativeDetail detail) {
NegativeVo negative = detail.getNegative();
ComplaintCollectionPageRequest complaintCollectionPageRequest = new ComplaintCollectionPageRequest();
complaintCollectionPageRequest.setOriginId(negative.getOriginId());
// 使用 SpringUtil 延迟获取,打破循环依赖
ComplaintCollectionService service = SpringUtil.getBean(ComplaintCollectionService.class);
ComplaintCollectionPageDTO complaintCollectionPageDTO = service.getComplaintCollectionPageNew(complaintCollectionPageRequest).getRecords().get(0);
detail.setComplaintCollectionPageDTO(complaintCollectionPageDTO);
}
} }

Loading…
Cancel
Save