处理安全检查任务 分野与导出 查询重复问题处理

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -25,7 +25,6 @@ import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
 import com.xunmei.core.safetyCheck.enums.SafetyTaskSourceType;
 import com.xunmei.core.safetyCheck.mapper.CoreSafecheckPlanToRoleMapper;
 import com.xunmei.core.safetyCheck.mapper.CoreSafetyTaskMapper;
-import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataNfcService;
 import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataRemarkimgService;
 import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataService;
 import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskService;
@@ -86,20 +85,7 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         } else {
             page = new Page<>();
         }
-        //查询条件
-//        QueryWrapper<CoreSafetyTask> query = new QueryWrapper<>(coreSafetyTask);
-        //下穿
-//        if (coreSafetyTask.getCheckSub()){
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(coreSafetyTask.getOrgId());
-//            //清空前端传递的org_id
-//            coreSafetyTask.setOrgId(null);
-//            //添加in条件
-//            query.in("org_id",ids);
-//        }
-        //时间范围查询
-//        if (coreSafetyTask.getParams().get("beginTime") != null && coreSafetyTask.getParams().get("endTime") != null) {
-//            query.between("create_time", coreSafetyTask.getParams().get("beginTime"), coreSafetyTask.getParams().get("endTime"));
-//        }
+
         if (CollectionUtil.isNotEmpty(coreSafetyTask.getRange()) && coreSafetyTask.getRange().size() == 2) {
             coreSafetyTask.getRange().set(0, DateUtil.beginOfDay(coreSafetyTask.getRange().get(0)));
             coreSafetyTask.getRange().set(1, DateUtil.endOfDay(coreSafetyTask.getRange().get(1)));

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -197,7 +197,7 @@
         where id = #{id}
     </select>
     <select id="selectCoreSafetyTaskPage" resultType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
-        SELECT
+        SELECT distinct
         t.id,
         t.title,
         t.org_path,
@@ -917,7 +917,7 @@
         order by t.status asc,t.plan_end_time desc,t.id desc
     </select>
     <select id="down" resultType="com.xunmei.core.safetyCheck.vo.CoreSafetyTaskExport">
-        SELECT
+        SELECT distinct
         t.id,
         t.plan_id,
         t.title,