资料查询，以废除归到未上报

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -758,7 +758,16 @@
         iq.is_deleted = 0
         and iq.classify = #{query.classify}
         and iq.contract_id = #{query.contractId}
-        <if test="query.taskStatus != null and query.taskStatus != ''">and iq.status = #{query.taskStatus}</if>
+        <if test="query.taskStatus != null and query.taskStatus != ''">
+          <choose>
+              <when test="query.taskStatus == 0">
+                  and (iq.status = 0 or iq.status = 3)
+              </when>
+              <otherwise>
+                  and iq.status = #{query.taskStatus}
+              </otherwise>
+          </choose>
+        </if>
         <if test="query.sourceType != null and query.sourceType != ''">and iq.source_type = #{query.sourceType}</if>
         <if test="query.reportNumber != null and query.reportNumber != ''">and t.batch = #{query.reportNumber}</if>
         <if test="query.fileUserIdAndName != null and query.fileUserIdAndName != ''">and iq.file_user_id_and_name like

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -519,7 +519,8 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                 if (ObjectUtil.isNotEmpty(vor.getCreateTime())) {
                     vor.setStartTime(DateUtil.format(vor.getCreateTime(), "yyyy-MM-dd"));
                 }
-                vor.setTaskStatusStr(new Integer("0").equals(vor.getStatus()) ? "未上报" : new Integer("1").equals(vor.getStatus()) ? "待审批" : new Integer("2").equals(vor.getStatus()) ? "已审批" : "已废除");
+                //已废除归到未上报
+                vor.setTaskStatusStr(new Integer("0").equals(vor.getStatus()) ? "未上报" : new Integer("1").equals(vor.getStatus()) ? "待审批" : new Integer("2").equals(vor.getStatus()) ? "已审批" : "未上报");
                 try {
                     //填报人
                     String fileUserIdAndName = vor.getFileUserIdAndName();