BUG修复

sop-api/src/main/java/com/qmth/sop/server/api/TBDelayWarnController.java

@@ -54,9 +54,7 @@ public class TBDelayWarnController {
             @ApiParam(value = "预警时间结束", required = false) @RequestParam(required = false) Long endTime,
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(pageNumber, pageSize), type, status, serviceId, custom, fieldObj, sopNo, startTime, endTime, null);
-
-        return ResultUtil.ok(resultIPage);
+        return ResultUtil.ok(tBDelayWarnService.query(new Page<>(pageNumber, pageSize), type, status, serviceId, custom, fieldObj, sopNo, startTime, endTime, null));
     }
 
 
@@ -64,7 +62,6 @@ public class TBDelayWarnController {
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表信息", response = TBDelayWarnResult.class)})
     public Result get(@ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
-
         return ResultUtil.ok(tBDelayWarnService.get(id));
     }
 
@@ -90,6 +87,4 @@ public class TBDelayWarnController {
         tBDelayWarnService.saveTBDelayWarn(tBDelayWarn);
         return ResultUtil.ok();
     }
-
-
 }

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDelayWarnMapper.java

@@ -8,6 +8,7 @@ import com.qmth.sop.business.bean.result.WorkWarnResult;
 import com.qmth.sop.business.entity.TBDelayWarn;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,7 +30,7 @@ public interface TBDelayWarnMapper extends BaseMapper<TBDelayWarn> {
      * @param status
      * @param serviceId
      * @param custom
-     * @param fieldObj
+     * @param fieldObjList
      * @param sopNo
      * @param startTime
      * @param endTime
@@ -37,7 +38,7 @@ public interface TBDelayWarnMapper extends BaseMapper<TBDelayWarn> {
      * @param dpr
      * @return
      */
-    IPage<TBDelayWarnResult> query(IPage<Map> iPage, @Param("type") String type, @Param("status") String status, @Param("serviceId") Long serviceId, @Param("custom") String custom, @Param("fieldObj") String fieldObj, @Param("sopNo") String sopNo, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("id") Long id, @Param("dpr") DataPermissionDto dpr);
+    IPage<TBDelayWarnResult> query(IPage<Map> iPage, @Param("type") String type, @Param("status") String status, @Param("serviceId") Long serviceId, @Param("custom") String custom, @Param("fieldObjList") List<String> fieldObjList, @Param("sopNo") String sopNo, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("id") Long id, @Param("dpr") DataPermissionDto dpr);
 
     /**
      * 获取预警待办

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDelayWarnServiceImpl.java

@@ -20,8 +20,10 @@ import com.qmth.sop.common.util.ServletUtil;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -63,7 +65,35 @@ public class TBDelayWarnServiceImpl extends ServiceImpl<TBDelayWarnMapper, TBDel
     public IPage<TBDelayWarnResult> query(IPage<Map> iPage, DelayWarnTypeEnum type, DelayWarnStatusEnum status, Long serviceId, String custom, String fieldObj, String sopNo, Long startTime, Long endTime, Long id) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
-        return this.baseMapper.query(iPage, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(status) ? status.name() : null, serviceId, custom, fieldObj, sopNo, startTime, endTime, id, dpr);
+        List<String> fieldObjList = new ArrayList<>();
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.APPROVE_RADIO.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.APPROVE_RADIO.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SCAN_START_TIME.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.SCAN_START_TIME.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SCAN_END_TIME.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.SCAN_END_TIME.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.MARK_START_TIME.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.MARK_START_TIME.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.MARK_END_TIME.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.MARK_END_TIME.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getTitle().contains(fieldObj)) {
+            fieldObjList.add(ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && CollectionUtils.isEmpty(fieldObjList)) {
+            fieldObjList.add(fieldObj);
+        }
+        return this.baseMapper.query(iPage, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(status) ? status.name() : null, serviceId, custom, fieldObjList, sopNo, startTime, endTime, id, dpr);
     }
 
     /**

sop-business/src/main/resources/mapper/TBDelayWarnMapper.xml

@@ -34,8 +34,11 @@
             <if test="custom != null and custom != ''">
                 and sc.name like concat('%', #{custom} , '%')
             </if>
-            <if test="fieldObj != null and fieldObj != ''">
-                and a.field_obj like concat('%', #{fieldObj} , '%')
+            <if test="fieldObjList != null and fieldObjList != '' and fieldObjList.size > 0">
+                and a.field_obj in
+                <foreach collection="fieldObjList" item="fieldObj" open="(" separator="," close=")">
+                    #{fieldObj}
+                </foreach>
             </if>
             <if test="sopNo != null and sopNo != ''">
                 and a.sop_no like concat('%', #{sopNo} , '%')