涉访涉诉+综合查询--查询条件调整

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

@@ -69,6 +69,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe
     @Schema(description = "信件状态（局）")
     private String processingStatus;
 
+    @Schema(description = "状态")
+    private String status;
+
     @Override
     public void check() {
         if (CollectionUtil.isNotEmpty(discoveryTimeList)){

src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java

@@ -74,6 +74,7 @@ public class ComplaintCollectionResourceService extends BaseDAO {
         qw.eq(StrUtil.isNotBlank(param.getRepeatt()), ComplaintCollection::getRepeatt, param.getRepeatt());
         qw.eq(StrUtil.isNotBlank(param.getLeadApproval()), ComplaintCollection::getLeadApproval, param.getLeadApproval());
         qw.eq(StrUtil.isNotBlank(param.getProcessingStatus()), ComplaintCollection::getProcessingStatus, param.getProcessingStatus());
+        qw.eq(StrUtil.isNotBlank(param.getStatus()), ComplaintCollection::getStatus, param.getStatus());
         // 来件内容
         // 标签（表里如果是逗号字符串 tag="URGENT,NORMAL"）
         // 语义：命中任意一个标签即可（OR）

src/main/java/com/biutag/supervision/service/NegativeQueryService.java

@@ -182,11 +182,18 @@ public class NegativeQueryService {
             );
         }
         if (CollectionUtil.isNotEmpty(param.getHandleResultCode())){
-            String codes = param.getHandleResultCode().stream()
-                    .map(code -> "'" + code + "'")
-                    .collect(Collectors.joining(","));
-            queryWrapper.inSql( Negative::getId,
-                    "SELECT DISTINCT negativeId FROM negative_blame WHERE handleResultCode IN (" + codes + ")"
+            String likeOr = param.getHandleResultCode().stream()
+                    .map(code ->
+                            "("
+                                    + "CONCAT(',', handleResultCode, ',') LIKE CONCAT('%,','" + code + "',',%')"
+                                    + " OR "
+                                    + "CONCAT(',', leadHandleResultCode, ',') LIKE CONCAT('%,','" + code + "',',%')"
+                                    + ")"
+                    )
+                    .collect(Collectors.joining(" OR "));
+            queryWrapper.inSql(
+                    Negative::getId,
+                    "SELECT DISTINCT negativeId FROM negative_blame WHERE " + likeOr
             );
             queryWrapper.in(Negative::getProcessingStatus,List.of("completed", "approval"));
         }
@@ -201,7 +208,7 @@ public class NegativeQueryService {
             NegativeQueryVo vo = new NegativeQueryVo();
             BeanUtils.copyProperties(item, vo);
             if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) {
-                vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey()));
+//                vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey()));
             }
             return vo;
         }).toList();