修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java

@@ -86,4 +86,7 @@ public class OrgUsrDto extends BaseDto {
 
     @ApiModelProperty(value = "唯一编号")
     private String code;
+
+    @ApiModelProperty(value = "合同编号")
+    private Long contractId;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -43,6 +43,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      */
     List<OrgUsr> listOrgUserById(Long orgUserId);
 
+    List<OrgUsrDto> selectOrgUsrList (@Param("seq") Long seq);
+
     /**
      * * @param null
      * @return

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -302,6 +302,27 @@
           </if>
     </select>
 
+    <select id="selectOrgUsrList" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto">
+        SELECT DISTINCT
+            cb_org_usr.sequence_nbr ,
+            cb_org_usr.biz_org_name,
+            cb_org_usr.biz_org_code,
+            cb_org_usr.amos_org_id,
+            cb_org_usr.amos_org_code,
+            cb_org_usr.biz_org_type,
+            cb_org_usr.build_name,
+            cb_org_usr.build_id,
+            cb_org_usr.parent_id,
+            cb_contract.sequence_nbr as contract_id
+        FROM
+            cb_org_usr
+            LEFT JOIN  cb_contract  on cb_org_usr.sequence_nbr = cb_contract.signed_company_id and cb_contract.company_id = #{seq}
+        WHERE
+            cb_org_usr.sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = #{seq} and is_delete = 0 )
+          AND cb_org_usr.biz_org_type = "COMPANY"
+          AND cb_org_usr.is_delete = 0
+    </select>
+
     <select id="listContractDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.CompanyDto">
 
         SELECT

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/MaintenanceResourceDto.java

@@ -32,6 +32,11 @@ public class MaintenanceResourceDto extends BaseTreeNode {
      */
     private Integer type;
 
+    /**
+     * 维保合同编号
+     */
+    private String contractId;
+
     public MaintenanceResourceDto() {
 
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import org.apache.commons.lang3.StringUtils;
@@ -76,7 +77,8 @@ public class MaintenanceCompanyServiceImpl
 
     @Autowired
     SourceFileServiceImpl sourceFileService;
-
+    @Autowired
+    OrgUsrMapper orgUsrMapper;
     /**
      * 分页查询
      */
@@ -710,7 +712,7 @@ public class MaintenanceCompanyServiceImpl
             maintenanceCompany.put("type", 1);
             maintenanceCompany.put("parentId", 0);
             // 查询该维保单位下的业主信息
-            List<OrgUsrDto> orgUsrDtos = this.baseMapper.selectOrgUsrList(list.getSequenceNbr());
+            List<OrgUsrDto> orgUsrDtos = orgUsrMapper.selectOrgUsrList(list.getSequenceNbr());
             orgUsrDtos.forEach(orgUsrDto -> {
                 Map<String, Object> airCompany = new HashMap<>();
                 airCompany.put("id", orgUsrDto.getSequenceNbr());
@@ -718,6 +720,7 @@ public class MaintenanceCompanyServiceImpl
                 airCompany.put("name", orgUsrDto.getBizOrgName());
                 airCompany.put("type", 2);
                 airCompany.put("parentId", list.getSequenceNbr());
+                airCompany.put("contractId", orgUsrDto.getContractId());
                 companysMsg.add(airCompany);
             });
             companysMsg.add(maintenanceCompany);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto;
 import com.yeejoin.equipmanage.common.dto.WaterResourceDto;
 import com.yeejoin.equipmanage.common.dto.WaterResourceTypeDto;
@@ -122,14 +123,29 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
         if (!CollectionUtils.isEmpty(list)) {
             List<MaintenanceResourceDto> companyTree = getCompanyList(appKey, product, token);
             if (!CollectionUtils.isEmpty(companyTree)) {
+                List<MaintenanceResourceDto> result =   new ArrayList<>();
+                result.addAll(list);
+                for (int i = 0; i < list.size(); i++) {
+                    for (int j = 0; j < companyTree.size(); j++) {
+                        if (list.get(i).getParentId().equals(companyTree.get(j).getParentId()) && list.get(i).getId().equals(companyTree.get(j).getId()) ){
+                            result.remove(list.get(i));
+                        }
+                    }
+                }
+
+                result.addAll(companyTree);
+                result.forEach(e->{if (e.getContractId() == null){
+                    e.setContractId(QRCodeUtil.generateQRCode());
+                }
+                });
                 List<MaintenanceResourceDto> dataList = new ArrayList<>();
-                list.addAll(companyTree);
-                Map<String, Optional<MaintenanceResourceDto>> collect = list.stream().collect(groupingBy(MaintenanceResourceDto::getId, minBy(Comparator.comparing(MaintenanceResourceDto::getParentId))));
+                Map<String, Optional<MaintenanceResourceDto>> collect = result.stream().collect(groupingBy(MaintenanceResourceDto::getContractId, minBy(Comparator.comparing(MaintenanceResourceDto::getParentId))));
                 collect.entrySet().forEach(entry -> {
                     entry.getValue().ifPresent(v -> {
                         dataList.add(v);
                     });
                 });
+
                 return TreeNodeUtil.assembleTree(dataList);
             }
             return TreeNodeUtil.assembleTree(list);