修改bug：2263 陈浩

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

 package com.yeejoin.amos.boot.biz.common.dao.mapper;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 
@@ -10,5 +12,9 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 * @date 2021-06-07
 */
 public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
-
+	/**
+	 * 获取领域专家的列表信息，且带有该领域下的专家统计数量
+	 * @return
+	 */
+   public List<DataDictionary>  getDataDictionaryListAndCount();
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

 package com.yeejoin.amos.boot.biz.common.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,5 +40,9 @@ public class DataDictionary extends BaseEntity {
     //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;
+    
+    @ApiModelProperty(value = "对应消防专家的数量，仅适应与消防资源专家领域树结构的展示")
+    @TableField(exist = false)
+    private int count;
 
 }

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

 package com.yeejoin.amos.boot.biz.common.service.impl;
 
 
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
-import com.yeejoin.amos.boot.biz.common.utils.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-
-import java.util.Collection;
-import java.util.List;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 
 /**
  * 数据字典 服务实现类
@@ -30,7 +34,8 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 
     @Value("${redis.cache.failure.time}")
     private long time;
-
+    @Autowired
+    DataDictionaryMapper dataDictionaryMapper;
 
     @Override
     public Object getFireChemical(String type) throws Exception {
@@ -82,4 +87,11 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
         return menus;
 
     }
+    
+    
+    public List<DataDictionary> getDataDictionaryAndCount(){
+    	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount();
+		return list;
+    	
+    }
 }

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper">
+<mapper namespace="com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper">
+<select id="getDataDictionaryListAndCount" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 
+SELECT
+	cdd.*, count(cfe.sequence_nbr) AS count
+FROM
+	cb_data_dictionary cdd
+LEFT JOIN (
+	SELECT
+		*
+	FROM
+		cb_fire_experts
+	WHERE
+		is_delete = 0
+) cfe ON cdd.`code` = cfe.expert_code
+WHERE
+	cdd.type = 'ZJLY'
+AND cdd.is_delete = 0
+GROUP BY
+	cdd. CODE ORDER BY sort_num 
+
+
+</select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -57,6 +58,9 @@ public class FireExpertsController extends BaseController {
 
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
+    
+    @Autowired
+    DataDictionaryMapper dataDictionaryMapper;
 
     /**
      * 新增
@@ -167,12 +171,15 @@ public class FireExpertsController extends BaseController {
     @RequestMapping(value = "/getExpertsTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取专家领域树", notes = "获取专家领域树")
     public ResponseModel<Object> getExpertsTree() throws Exception {
-        String type = "ZJLY";
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
-
-        Collection<DataDictionary> list = dataDictionaryService.list(queryWrapper);
+//        String type = "ZJLY";
+//        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("type", type);
+//        queryWrapper.orderByAsc("sort_num");
+
+        Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount();
+        list.forEach(i->{
+        	i.setName(i.getName()+" ("+i.getCount()+")");
+        });
         List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
                 , "getParent",null);
         Menu menu = new Menu(-1L, "专家领域", -1L, menus,0);

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

@@ -53,8 +53,15 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
             MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
             companyId = company.getSequenceNbr();
         }
-        return queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
+        
+        //
+        Page<ContractDto>  resultPage= queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
                 signedDate);
+        List<ContractDto>  resultContractDtos=    resultPage.getRecords();
+        resultContractDtos.stream().forEach(i->{
+        	i.setAttachment(sourceFileServiceImpl.findBySourceId(i.getSequenceNbr()));
+        });
+        return   page.setRecords(resultContractDtos);
     }
 
     public Page<ContractDto> queryForContractPageByParam(Page<ContractDto> page, Boolean isDelete,