diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java index 6f26b1d..2b59138 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java @@ -68,7 +68,7 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "被投诉二级机构名字") private String secondDepartName; - @Schema(description = "办理方式") + @Schema(description = "办理方式 0自办 1下发") private String handleMethod; @Schema(description = "来件内容") diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java index 2cfb1d3..217fb13 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -46,6 +46,7 @@ public class ComplaintCollectionResourceService extends BaseDAO { queryWrapper.eq(StrUtil.isNotBlank(param.getResponderPhone()), ComplaintCollection::getResponderPhone, param.getResponderPhone()); queryWrapper.eq(StrUtil.isNotBlank(param.getStatus()), ComplaintCollection::getStatus, param.getStatus()); queryWrapper.in(CollectionUtil.isNotEmpty(param.getInitialReviewFileList()), ComplaintCollection::getGwf3, param.getInitialReviewFileList()); + queryWrapper.eq(StrUtil.isNotBlank(param.getHandleMethod()), ComplaintCollection::getHandleMethod, param.getHandleMethod()); if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) { return Collections.emptyList(); } diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java index 5a5531d..6a5245d 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -1020,7 +1020,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic negative.setPoliceType(cc.getPoliceType()); // 核查情况 - negative.setCheckStatus(cc.getCheckStatus()); + negative.setCheckStatusCode(cc.getCheckStatus()); negative.setCheckStatusName(cc.getCheckStatusName()); negative.setCheckStatusDesc(cc.getCheckStatusDesc()); @@ -1172,12 +1172,14 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic @Override @Transactional(rollbackFor = Exception.class) public void addNegativeTemp(ComplaintCollectionPageRequest request) { - if(StrUtil.isBlank(request.getOriginId())){ - throw new IllegalArgumentException("下发旧数据必须填写编号"); - } +// if(StrUtil.isBlank(request.getOriginId())){ +// throw new IllegalArgumentException("下发旧数据必须填写编号"); +// } // 1. 查询待下发数据(status=0 且 negativeId为空) ComplaintCollectionQueryParam queryParam = new ComplaintCollectionQueryParam(); queryParam.setStatus("0"); // 初始状态 + queryParam.setHandleMethod("1"); + // 也是可填可不填 queryParam.setOriginId(request.getOriginId()); List pendingList = complaintCollectionResourceService.query(queryParam);