消息中心,已撤回数据无法根据搜索框单独查询

src/main/java/com/bonus/nxdt/energy/newSubApply/entity/SubEntranceBean.java

@@ -35,6 +35,8 @@ public class SubEntranceBean {
     private String processId;
     private String fileId;
 
+    private String distInfo;
+
     //工器具
     private String equipmentName;
     private String number;

src/main/java/com/bonus/nxdt/energy/newSubApply/service/impl/NewconsServiceImpl.java

@@ -204,6 +204,7 @@ public class NewconsServiceImpl implements NewconsService {
             bean.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
             bean.setNameId(UserUtil.getLoginUser().getId().toString());
             bean.setMessage("【提示信息】 " + name + "撤回入场材料成功");
+            bean.setDistInfo("5");
             dao.insertAps(bean);
             dao.insertMessageTabeles(bean);
         }

src/main/resources/mappers/newSubApply/SubIndexMapper.xml

@@ -33,7 +33,12 @@
  			</if>
 		</if>
 		<if test="auditResult !=null and auditResult !=''">
-			and ap.audit_result like concat ('%',#{auditResult},'%')
+			<if test="auditResult != 5 and auditResult != '5'">
+				and ap.audit_result like concat ('%',#{auditResult},'%')
+			</if>
+		  	<if test="auditResult == 5 || auditResult == '5'">
+		  	    and mt.dist_info = '5'
+		  	</if>
 		</if>
 		<if test="isPart == 1 || isPart == '1'">
 			AND mt.audit_id IN (${auditId})

src/main/resources/static/pages/work/newSubApply/subIndex.html

@@ -78,7 +78,7 @@
                     <option value="0">未通过</option>
                     <option value="1">通过</option>
                     <option value="2">待审核</option>
-                    <option value="3">已撤回</option>
+                    <option value="5">已撤回</option>
                 </select>
             </div>