预案演练 普通案例查询不到的问题

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskRecPageVo.java

@@ -40,6 +40,9 @@ public class CoreDrillTaskRecPageVo {
     @ApiModelProperty(value = "推荐状态名称")
     private String recStatusText;
 
+    @ApiModelProperty(value = "推荐状态", example = "不推荐标识: null 未设置不推荐，6 不推荐(保留普通案例) 7   不推荐(保留行社优秀案例) 8 不推荐(保留地区优秀案例)")
+    private Integer unrecStatus;
+
 
     private String title;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -911,8 +911,25 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         for (CoreDrillTaskRecPageVo record : page.getRecords()) {
             //处理演练任务类型字典
             record.setTypeText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_TYPE, record.getType()));
-            //处理演练任务推荐状态字典
-            record.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, record.getRecStatus()));
+            // 6 不推荐(保留普通案例) 7   不推荐(保留行社优秀案例) 8 不推荐(保留地区优秀案例)
+            if(ObjectUtil.equal(6,record.getUnrecStatus()))
+            {
+                record.setRecStatusText("不推荐(保留普通案例)");
+            }
+            else if(ObjectUtil.equal(7,record.getUnrecStatus()))
+            {
+                record.setRecStatusText("不推荐(保留行社优秀案例)");
+            }
+            else if(ObjectUtil.equal(8,record.getUnrecStatus()))
+            {
+                record.setRecStatusText("不推荐(保留地区优秀案例)");
+            }
+            else
+            {
+                //处理演练任务推荐状态字典
+                record.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, record.getRecStatus()));
+            }
+
 
         }
         return TableDataInfo.build(page);
@@ -1010,7 +1027,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         if (ObjectUtil.notEqual(DrillDoStatus.DONE.getCode(), drillTask.getStatus())) {
             throw new SystemException("该预案演练任务未完成或已逾期!");
         }
-        return coreDrillTaskMapper.updateStatusById(request.getDrillTaskId(), request.getRecStatus(),0);
+        return coreDrillTaskMapper.updateStatusById(request.getDrillTaskId(), request.getRecStatus(),null);
     }
 
     private boolean isUnRecStatus(Integer recStatus)

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -197,7 +197,7 @@
         select * from core_drill_task t
         where t.rec_status is not null
         <if test="request.recStatus!=null">
-            and t.rec_status =#{request.recStatus}
+            and t.rec_status =#{request.recStatus} and t.unrec_status is null
         </if>
         <if test="request.unRecStatus!=null">
             and t.unrec_status =#{request.unRecStatus}
@@ -317,7 +317,7 @@
         where t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
         <if test="request.orgType==3">
-            and t.rec_status =0 and t.unrec_status =0
+            and t.rec_status =0 and t.unrec_status is null
         </if>
         <if test="request.orgType==2">
             and t.rec_status =2