Compare commits

..

No commits in common. '0d35e4b1ac89ce45b4ca71f0330311c7180995ef' and 'faa93ae9f601c6db88d2b5b711243bf94e0f7c88' have entirely different histories.

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

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

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

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

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

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

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

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

@ -335,19 +335,6 @@
</foreach>
)
</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>
ORDER BY n.crtTime DESC, cc.id DESC
</select>

Loading…
Cancel
Save