|
|
|
|
@ -24,12 +24,15 @@ import com.biutag.supervision.pojo.domain.NegativeDetail;
|
|
|
|
|
import com.biutag.supervision.pojo.domain.NegativeVo; |
|
|
|
|
import com.biutag.supervision.pojo.dto.ActionDto; |
|
|
|
|
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.VerifyData; |
|
|
|
|
import com.biutag.supervision.pojo.dto.jwdc.NegativeApiDto; |
|
|
|
|
import com.biutag.supervision.pojo.entity.*; |
|
|
|
|
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.service.complaintCollection.ComplaintCollectionService; |
|
|
|
|
import com.biutag.supervision.util.SpringUtil; |
|
|
|
|
import com.biutag.supervision.util.TimeUtil; |
|
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
|
@ -173,6 +176,8 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
|
|
|
|
|
// 单位会签
|
|
|
|
|
detail.setCountersignApplys(countersignApplyService.list(id)); |
|
|
|
|
enrichCountersignsWithHistory(detail); |
|
|
|
|
// 初核情况
|
|
|
|
|
initDes(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); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|