任务导出查询修改，新增按任务id查询导出

zhongrj

2023-05-08 64881c98f373304b32beca2f6b0aae7fdc065712

任务导出查询修改，新增按任务id查询导出

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java

@@ -37,7 +37,8 @@
    @InterceptorIgnore(tenantLine = "true")
    List<CallTaskResultVO> getCallTaskResultListPage(@Param("page") IPage<CallTaskResultVO> page,
                                                     @Param("callTaskResult") CallTaskResultVO callTaskResult,
                                                     @Param("list") List<String> list);
                                                     @Param("list") List<String> list,
                                                     @Param("idsList") List<String> idsList);

    /**
     * 通过水库编码获取行政区名称

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml

@@ -99,6 +99,12 @@
                #{adCode}
            </foreach>
        </if>
        <if test="idsList != null and idsList.size()>0">
            and ct."id" in
            <foreach collection="idsList" item="id" separator ="," open="("  close=")">
                #{id}
            </foreach>
        </if>
        <if test="callTaskResult.waterName!=null and callTaskResult.waterName!=''">
            and arb."name" like concat('%',#{callTaskResult.waterName},'%')
        </if>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java

@@ -23,6 +23,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@@ -224,7 +225,7 @@
            // 查询所有下级区域code
            list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
        }
        List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list);
        List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list,null);
        return page.setRecords(resultListPage);
    }

@@ -236,11 +237,16 @@
    @Override
    public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
        List<String> list = new ArrayList<>();
        List<String> idsList = new ArrayList<>();
        if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
            // 查询所有下级区域code
            list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
        }
        List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
        if (null!= callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
            // 查询所有下级区域code
            idsList = Arrays.asList(callTaskResult.getIds().split(","));
        }
        List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list,idsList);
        // 返回
        return resultListPage;
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java

@@ -103,5 +103,10 @@
     */
    private Integer taskStatus;

    /**
     * 任务ids
     */
    private String ids;


}