Compare commits

..

2 Commits

  1. 5
      src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java
  2. 4
      src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java
  3. 2
      src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java
  4. 3
      src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java
  5. 13
      src/main/resources/mapper/ComplaintCollectionMapper.xml

5
src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java

@ -89,8 +89,9 @@ public class ApplyCompletionAction implements Action {
public void updateNegative(Negative negative, VerifyData verifyData) { public void updateNegative(Negative negative, VerifyData verifyData) {
// 同步修改投诉举报涉及单位 // 同步修改投诉举报涉及单位
if (!Boolean.TRUE.equals(verifyData.getSkipInitView())){
updateComplaintCollectionInfo(negative, verifyData); updateComplaintCollectionInfo(negative, verifyData);
}
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String checkStatus = null; String checkStatus = null;
if (CheckStatusEnum.TRUE.getValue().equals(verifyData.getCheckStatusCode())) { if (CheckStatusEnum.TRUE.getValue().equals(verifyData.getCheckStatusCode())) {
@ -326,6 +327,8 @@ public class ApplyCompletionAction implements Action {
if (ComplaintCollectionInitialEnum.UN_UPLOADED.getCode().equals(complaintCollection.getGwf3())) { if (ComplaintCollectionInitialEnum.UN_UPLOADED.getCode().equals(complaintCollection.getGwf3())) {
ComplaintCollectionInitialReviewRequest request = new ComplaintCollectionInitialReviewRequest(); ComplaintCollectionInitialReviewRequest request = new ComplaintCollectionInitialReviewRequest();
request.setComplaintId(complaintCollection.getId()); request.setComplaintId(complaintCollection.getId());
request.setInitWorkDes("直接申请办结");
request.setInitProblemPlan("直接申请办结");
complaintCollectionService.initialReview(request); complaintCollectionService.initialReview(request);
} }
ComplaintCollectionUpdateParam complaintCollectionUpdateParam = new ComplaintCollectionUpdateParam(); ComplaintCollectionUpdateParam complaintCollectionUpdateParam = new ComplaintCollectionUpdateParam();

4
src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java

@ -1,6 +1,7 @@
package com.biutag.supervision.pojo.dto.flow; package com.biutag.supervision.pojo.dto.flow;
import com.biutag.supervision.pojo.vo.FileVo; import com.biutag.supervision.pojo.vo.FileVo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.Getter; import lombok.Getter;
@ -98,6 +99,9 @@ public class VerifyData {
// 群众认可 // 群众认可
private String publicRecognition; private String publicRecognition;
@Schema(description = "是否跳过初核")
private Boolean skipInitView ;
@Setter @Setter
@Getter @Getter
public static class Blame { public static class Blame {

2
src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java

@ -139,6 +139,8 @@ public class ComplaintCollectionQueryParam extends BasePage {
@Schema(description = "涉及单位ID集合(包含所有子节点)") @Schema(description = "涉及单位ID集合(包含所有子节点)")
private Set<String> involveDepartIds; private Set<String> involveDepartIds;
@Schema(description = "处理结果代码")
private List<String> handleResultCode;
// @Schema(description = "部门ID集合") // @Schema(description = "部门ID集合")
// private Set<String> secondDepartIds; // private Set<String> secondDepartIds;

3
src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java

@ -99,6 +99,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe
@Schema(description = "办理单位ID") @Schema(description = "办理单位ID")
private String handleDepartId; private String handleDepartId;
@Schema(description = "处理结果代码")
private List<String> handleResultCode;
@Override @Override
public void check() { public void check() {

13
src/main/resources/mapper/ComplaintCollectionMapper.xml

@ -335,6 +335,19 @@
</foreach> </foreach>
) )
</if> </if>
<if test="param.handleResultCode != null and param.handleResultCode.size > 0">
AND n.id IN (
SELECT DISTINCT nb.negativeId
FROM negative_blame nb
WHERE
<foreach collection="param.handleResultCode" item="code" separator=" OR ">
(
CONCAT(',', nb.handleResultCode, ',') LIKE CONCAT('%,', #{code}, ',%')
OR CONCAT(',', nb.leadHandleResultCode, ',') LIKE CONCAT('%,', #{code}, ',%')
)
</foreach>
)
</if>
</where> </where>
ORDER BY n.crtTime DESC, cc.id DESC ORDER BY n.crtTime DESC, cc.id DESC
</select> </select>

Loading…
Cancel
Save