Merge branch 'han' of uskycloud/usky-modules into master

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseBuildController.java

@@ -38,6 +38,7 @@ public class BaseBuildController {
      *
      * @param buildNum  建筑编号
      * @param buildName 建筑名称
+     * @param companyId 单位ID
      * @param pageNum   当前页
      * @param pageSize  每页条数
      * @return
@@ -45,9 +46,10 @@ public class BaseBuildController {
     @GetMapping("baseBuildList")
     public ApiResult<CommonPage<Object>> baseBuildList(@RequestParam(value = "buildNum", required = false) String buildNum,
                                                        @RequestParam(value = "buildName", required = false) String buildName,
+                                                       @RequestParam(value = "companyId", required = false) String companyId,
                                                        @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                        @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(baseBuildService.baseBuildList(buildNum, buildName, pageNum, pageSize));
+        return ApiResult.success(baseBuildService.baseBuildList(buildNum, buildName, companyId, pageNum, pageSize));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/BaseCompanyMapper.java

@@ -2,8 +2,12 @@ package com.usky.fire.mapper;
 
 import com.usky.fire.domain.BaseCompany;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.fire.service.vo.DemFireReformVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 联网单位信息表 Mapper 接口
@@ -14,5 +18,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface BaseCompanyMapper extends CrudMapper<BaseCompany> {
-
+    List<BaseCompany> companyNameList(@Param("companyIdList") String[] companyIdList);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseBuildService.java

@@ -22,11 +22,12 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
      *
      * @param buildNum 项目编号
      * @param buildName 单位编号
+     * @param companyId 单位ID
      * @param pageNum     当前页
      * @param pageSize    每页条数
      * @return
      */
-    CommonPage<Object> baseBuildList(String buildNum, String buildName, Integer pageNum, Integer pageSize);
+    CommonPage<Object> baseBuildList(String buildNum, String buildName, String companyId, Integer pageNum, Integer pageSize);
 
     /**
      * 建筑信息-列表查询-导出

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseBuildServiceImpl.java

@@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.fire.domain.BaseBuildAttach;
-import com.usky.fire.domain.BaseBuildExtinguish;
+import com.usky.fire.domain.*;
+import com.usky.fire.mapper.BaseCompanyMapper;
 import com.usky.fire.service.BaseBuildAttachService;
 import com.usky.fire.service.BaseBuildExtinguishService;
 import com.usky.fire.service.BaseBuildService;
-import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.mapper.BaseBuildMapper;
+import com.usky.fire.service.BaseCompanyService;
 import com.usky.fire.service.vo.BaseBuildAddVO;
 import com.usky.fire.service.vo.BaseBuildExportVO;
 import com.usky.fire.service.vo.CompanyDataVo;
@@ -47,20 +47,34 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     @Autowired
     private BaseBuildExtinguishService baseBuildExtinguishService;
 
+    @Autowired
+    private BaseCompanyMapper baseCompanyMapper;
+
     @Override
-    public CommonPage<Object> baseBuildList(String buildNum, String buildName, Integer pageNum, Integer pageSize) {
+    public CommonPage<Object> baseBuildList(String buildNum, String buildName, String companyId, Integer pageNum, Integer pageSize) {
         List<Object> list = new ArrayList<>();
         IPage<BaseBuild> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<BaseBuild> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(BaseBuild::getId, BaseBuild::getBuildNum, BaseBuild::getBuildName, BaseBuild::getAddress, BaseBuild::getBuildArea,
                 BaseBuild::getFireRating, BaseBuild::getUseCharacter, BaseBuild::getBuildStructure, BaseBuild::getBuildHigh,
-                BaseBuild::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson, BaseBuild::getFireRisk, BaseBuild::getBuildPlan)
+                BaseBuild::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson,
+                BaseBuild::getFireRisk, BaseBuild::getBuildPlan, BaseBuild::getCompanyId)
                 .eq(BaseBuild::getDeleteFlag, 0)
                 .like(StringUtils.isNotBlank(buildNum), BaseBuild::getBuildNum, buildNum)
                 .like(StringUtils.isNotBlank(buildName), BaseBuild::getBuildName, buildName)
+                .eq(StringUtils.isNotBlank(companyId), BaseBuild::getCompanyId, companyId)
                 .orderByDesc(BaseBuild::getId);
         page = this.page(page, queryWrapper);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
+            List<String> companyIdList = new ArrayList<>();
+            for (int j = 0; j < page.getRecords().size(); j++) {
+                companyIdList.add(page.getRecords().get(j).getCompanyId());
+            }
+            List<BaseCompany> list1 = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(companyIdList)) {
+                String[] a2 = companyIdList.toArray(new String[companyIdList.size()]);
+                list1 = baseCompanyMapper.companyNameList(a2);
+            }
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("id", page.getRecords().get(i).getId());
@@ -77,6 +91,13 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                 map.put("managePerson", page.getRecords().get(i).getManagePerson());
                 map.put("fireRisk", page.getRecords().get(i).getFireRisk());
                 map.put("buildPlan", page.getRecords().get(i).getBuildPlan());
+                if (CollectionUtils.isNotEmpty(list1)) {
+                    for (int j = 0; j < list1.size(); j++) {
+                        if (page.getRecords().get(i).getCompanyId().equals(list1.get(j).getCompanyId())) {
+                            map.put("companyName", list1.get(j).getCompanyName());
+                        }
+                    }
+                }
                 list.add(map);
             }
         }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -1083,12 +1083,12 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         BaseBuildAddVO baseBuildAddVO = new BaseBuildAddVO();
                         baseBuildAddVO.setBaseBuild(list4.get(j));
                         for (int k = 0; k < list5.size(); k++) {
-                            if (list4.get(j).getId()==list5.get(k).getBuildId()){
+                            if (list4.get(j).getId().equals(list5.get(k).getBuildId())){
                                 baseBuildAddVO.setBaseBuildAttach(list5.get(k));
                             }
                         }
                         for (int l = 0; l < list6.size(); l++) {
-                            if (list4.get(j).getId()==list6.get(l).getBuildId()){
+                            if (list4.get(j).getId().equals(list6.get(l).getBuildId())){
                                 list8.add(list6.get(l));
                                 baseBuildAddVO.setBaseBuildExtinguishList(list8);
                             }

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseCompanyMapper.xml

@@ -37,5 +37,18 @@
         <result column="update_person" property="updatePerson" />
         <result column="update_time" property="updateTime" />
     </resultMap>
-
+    <select id="companyNameList" resultType="com.usky.fire.domain.BaseCompany">
+        SELECT
+        *
+        FROM
+        base_company
+        <where>
+            <if test="companyIdList != null and companyIdList != ''">
+                company_id in
+                <foreach collection="companyIdList" item="companyId" index="index" open="(" close=")" separator=",">
+                   #{companyId}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>