修改bug 监察任务分析列表，应建/已建数据统计

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/IdxUjerMapper.java

@@ -6,9 +6,12 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.IdxUjerDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.IdxUjer;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Map;
 
 public interface IdxUjerMapper extends BaseMapper<IdxUjer> {
 
     IPage<IdxUjerDto> getPage(IPage<IdxUjerDto> page, @Param("ids") List<String> ids, @Param("bizType") String bizType);
 
+    List<Map<String,String>> getCompanyInfo();
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/IdxUjerMaper.xml

@@ -20,12 +20,16 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="bizType=='yingjian'">
-                AND b.SEQUENCE_NBR is null
-            </if>
+<!--            <if test="bizType=='yingjian'">-->
+<!--                AND b.SEQUENCE_NBR is null-->
+<!--            </if>-->
             <if test="bizType=='yijian'">
                 AND b.SEQUENCE_NBR is not null
             </if>
         </where>
     </select>
+
+    <select id="getCompanyInfo" resultType="java.util.Map">
+        SELECT ID AS companyId, `NAME` AS companyName FROM privilege_company_qyszyfjs
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/InspectionServiceImpl.java

@@ -56,9 +56,14 @@ public class InspectionServiceImpl implements InspectionService {
             String bizType, int current, int size
     ) {
         List<String> companyIds = idxFeignService.getTreeChildIds(dimensionTableId, selectValue).getResult();
-        Collection<CompanyModel> companyModels = Privilege.companyClient.companyTreeWithoutAuth().getResult();
+//        Collection<CompanyModel> companyModels = Privilege.companyClient.companyTreeWithoutAuth().getResult();
         Map<String, String> companyMap = new HashMap<>();
-        convertCompanyTreeToMap(companyModels, null, companyMap);
+        List<Map<String,String>> mapList = idxUjerMapper.getCompanyInfo();
+        for (Map<String, String> map:mapList) {
+            companyMap.put(map.get("companyId"),map.get("companyName"));
+        }
+
+//        convertCompanyTreeToMap(companyModels, null, companyMap);
         IPage<IdxUjerDto> idxUjerPage = new Page<>(current, size);
         IPage<IdxUjerDto> page = idxUjerMapper.getPage(idxUjerPage, companyIds, bizType);
         List<IdxUjerDto> records = page.getRecords();