水库填报状态查询修改

zhongrj

2023-08-23 1d893feaa091ea901dec35a1e2f7bcb1e46cf120

水库填报状态查询修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.sjztmd.entity.TbAttResBase;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

@@ -42,5 +43,8 @@
     * @return
     */
    @DS("zt")
    List<Map<String, Object>> getTbInfo(@Param("resGuid") String resGuid,@Param("tableName") String tableName);
    @InterceptorIgnore(tenantLine = "true")
    List<Map<String, Object>> getTbInfo(@Param("resGuid") String resGuid,
                                        @Param("tableNameColumn") String tableNameColumn,
                                        @Param("tableName") String tableName);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml

@@ -66,6 +66,6 @@

    <!--查询水库其他填报数据-->
    <select id="getTbInfo" resultType="java.util.Map">
        SELECT #{tableName} AS name,ifnull("check_state",-1) as name FROM "tb_att_res_water_delivery" WHERE "res_guid" = #{resGuid}
        SELECT ${tableNameColumn} AS name,ifnull("check_state",-1) as value FROM ${tableName} WHERE "res_guid" = #{resGuid}
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java

@@ -290,7 +290,7 @@
    private CompletableFuture<List<Map<String,Object>>> getTbInfo(String tableName,String resGuid,ThreadPoolExecutor executor){
        return CompletableFuture.supplyAsync(()->{
            // 查询所有水库填报的状态信息
            List<Map<String, Object>> tbInfo = baseMapper.getTbInfo(resGuid, tableName);
            List<Map<String, Object>> tbInfo = baseMapper.getTbInfo(resGuid,"\'"+tableName+"'" ,"\""+tableName+"\"");
            if (tbInfo.size()==0){
                Map<String, Object> map = new HashMap<>(2);
                map.put("NAME",tableName);