diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java index cfe6bfa..08ecdfc 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java @@ -117,4 +117,16 @@ public class ComplaintCollectionUpdateParam { @Schema(description = "涉及对象") private String accountabilityTarget; + /** + * @see com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionClosingStatusEnum + */ + @Schema(description = "办结情况") + private String completionStatus; + + /** + * @see com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionPublicApprovalEnum + */ + @Schema(description = "群众认可") + private String publicRecognition; + } diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java index e91e644..3b6393e 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java @@ -149,6 +149,18 @@ public class ComplaintCollectionAndBlameAddRequest implements ParamChecked { @Schema(description = "业务类型name") private String businessTypeName; + /** + * @see com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionClosingStatusEnum + */ + @Schema(description = "办结情况") + private String completionStatus; + + /** + * @see com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionPublicApprovalEnum + */ + @Schema(description = "群众认可") + private String publicRecognition; + @Getter @Setter 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 ea40264..7dee9fe 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -191,6 +191,12 @@ public class ComplaintCollectionResourceService extends BaseDAO { if (param.getAccountabilityTarget()!=null){ uw.set(ComplaintCollection::getAccountabilityTarget, param.getAccountabilityTarget()); } + if (param.getCompletionStatus()!=null){ + uw.set(ComplaintCollection::getCompletionStatus, param.getCompletionStatus()); + } + if ((param.getPublicRecognition()!=null)){ + uw.set(ComplaintCollection::getPublicRecognition, param.getPublicRecognition()); + } uw.set(ComplaintCollection::getUpdateBy, UserContextHolder.getCurrentUser().getUserName()); uw.set(ComplaintCollection::getUpdateTime, LocalDateTime.now()); if (uw.getExpression() == null || uw.getExpression().getSqlSegment().isEmpty()) { 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 7494f47..86097fd 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -206,6 +206,8 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic collectionUpdateParam.setSecondDepartName(secondDepart.getShortName()); } collectionUpdateParam.setAccountabilityTarget(request.getAccountabilityTarget()); + collectionUpdateParam.setCompletionStatus(request.getCompletionStatus()); + collectionUpdateParam.setPublicRecognition(request.getPublicRecognition()); complaintCollectionResourceService.updateSelectiveById(collectionUpdateParam); // 是否属实 boolean itTure = InspectCaseEnum.isItTure(checkStatus);