Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 公共附件
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AttachmentDto", description="附件dto")
+public class AttachmentDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "文件地址")
+    private String url;
+
+    @ApiModelProperty(value = "文件名称")
+    private String name;
+
+    @ApiModelProperty(value = "文件类型")
+    private String type;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/MaintenanceCompany.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+import java.util.Map;
+
 /**
 * 维保单位
 *
@@ -77,11 +78,11 @@ public class MaintenanceCompany extends BaseEntity {
 	@TableField("instance_id")
     private Long instanceId;
 	
-	//@Transient
 	@ApiModelProperty(value = "动态表单值")
 	@TableField(exist = false)
 	private List<DynamicFormInstance> dynamicFormValue;
 
-	
-	
+    @ApiModelProperty(value = "附件")
+    @TableField(exist = false)
+    private Map<String, List<AttachmentDto>> attachments;
 }

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * 维保单位 Mapper 接口
@@ -24,10 +24,9 @@ public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany>
 
     /**
      * 查询机场单位信息 (带分页)
-     * @param pageNum
-     * @param pageSize
+     * @param page
      * @param seq
      * @return
      */
-    public List<OrgUsrDto> selectOrgUsrPageList (@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("seq") Long seq);
+    public Page<OrgUsrDto> selectOrgUsrPageList(Page page, @Param("seq") Long seq);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java

@@ -8,7 +8,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
  * 维保单位接口类
@@ -29,10 +28,9 @@ public interface IMaintenanceCompanyService {
 	 * 添加保存维保单位人员基本信息
 	 * 
 	 * @param maintenanceCompany
-	 * @param sequenceNbr 主键
 	 * @return
 	 */
-	public boolean savePersonDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr);
+	public boolean savePersonDetail(MaintenanceCompany maintenanceCompany);
 
 	/**
 	 * 自定义假删除
@@ -52,10 +50,10 @@ public interface IMaintenanceCompanyService {
 	/**
 	 * 添加保存维保单位部门基本信息
 	 * 
-	 * @param MaintenanceCompany
+	 * @param maintenanceCompany
 	 * @return
 	 */
-	public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr);
+	public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany);
 
 	/**
 	 * 检查当前的员工编号是否已经存在
@@ -71,7 +69,7 @@ public interface IMaintenanceCompanyService {
 	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
 	 * @return
 	 */
-	List<Map<String, Object>> getAllMaintenanceList(String maintenanceType);
+	List<Map<String, Object>> getAllMaintenanceList(String maintenanceType, String amosUserId);
 
 	/**
 	 * 查询分页展示的维保人员/单位/部门列表信息
@@ -98,26 +96,26 @@ public interface IMaintenanceCompanyService {
 	/**
 	 * 修改维保单位
 	 * 
-	 * @param MaintenanceCompany
+	 * @param model
 	 * @return
 	 */
-	boolean updateMaintenanceCompanyDetail(MaintenanceCompany model, AgencyUserModel userInfo);
+	boolean updateMaintenanceCompanyDetail(MaintenanceCompany model);
 
 	/**
 	 * 修改维保部门
 	 * 
-	 * @param MaintenanceCompany
+	 * @param model
 	 * @return
 	 */
-	public boolean updateMaintenancDepartmentDetail(MaintenanceCompany model, AgencyUserModel userInfo);
+	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model);
 
 	/**
 	 * 修改维保人员
 	 * 
-	 * @param MaintenanceCompany
+	 * @param model
 	 * @return
 	 */
-	public boolean updateMaintenancePersonDetail(MaintenanceCompany model, AgencyUserModel userInfo);
+	public boolean updateMaintenancePersonDetail(MaintenanceCompany model);
 
 	/**
 	 * 查询所有的单位-部门树

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

@@ -35,6 +35,7 @@
         cb_dynamic_form_instance i
         where i.GROUP_CODE = #{groupCode}
         and i.APP_KEY = #{appKey}
+        and i.is_delete = 0
         GROUP by
         i.INSTANCE_ID)d
         <if test="params != null and  params.size() > 0">
@@ -80,6 +81,11 @@
         <if test="appKey != null and appKey !=''">
             and i.APP_KEY = #{appKey}
         </if>
+        <foreach collection="params" index="key" item="value" separator="">
+            <if test="key != null and key = 'instanceIds' ">
+                and find_in_set(i.instance_id, #{value}) > 0
+            </if>
+        </foreach>
         GROUP by
         i.INSTANCE_ID) d
         <if test="params != null and params.size() > 0">

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

@@ -28,7 +28,7 @@
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
-        a.is_delete=0 ORDER BY a.rec_date 
+        a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>
@@ -37,6 +37,8 @@
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+
+        ORDER BY a.rec_date
     </select>
 
 

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

@@ -36,6 +36,5 @@ WHERE
 	sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = #{seq} )
 	AND biz_org_type = "COMPANY"
 	AND is_delete = 0
-	    limit #{pageNum},#{pageSize}
     </select>
 </mapper>

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

@@ -105,7 +105,7 @@
         select distinct (case
                              when ISNULL(belong_fighting_system_id) = 0 and LENGTH(trim(belong_fighting_system_id)) > 0
                                  then belong_fighting_system_id
-                             else -1 end)   belong_fighting_system_id,
+                             else 0 end)   belong_fighting_system_id,
                         (case
                              when ISNULL(belong_fighting_system) = 0 and LENGTH(trim(belong_fighting_system)) > 0
                                  then belong_fighting_system

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerCarCountDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/23
+ */
+@Data
+@ApiModel(value = "PowerCarCountDto", description = "按车辆统计力量调派")
+public class PowerCarCountDto {
+
+    @ApiModelProperty(value = "车名称")
+    protected String carName;
+    @ApiModelProperty(value = "车数量")
+    protected int carNum;
+    @ApiModelProperty(value = "车牌号")
+    protected String plateNumber;
+}
+
+
+

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerCompanyCountDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/23
+ */
+@Data
+@ApiModel(value = "PowerCompanyCountDto", description = "按单位统计力量调派")
+public class PowerCompanyCountDto {
+    @ApiModelProperty(value = "单位id")
+    protected Long companyId;
+    @ApiModelProperty(value = "单位名称")
+    protected String companyName;
+    @ApiModelProperty(value = "车数量")
+    protected int carNum;
+    @ApiModelProperty(value = "人数量")
+    protected int userNum;
+    @ApiModelProperty(value = " 车辆信息")
+    List<PowerCarCountDto>  PowerCarCountDto;
+}
+
+
+

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,4 +63,17 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
     Map<String, Integer> getCompanyNum(@Param("id") Long id);
 
     List<PowerData> getPowerDataList(@Param("id") Long id);
+
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/23
+     * </PRE>
+     * 力量调派按单位统计
+     */
+    List<PowerCompanyCountDto> getPowerCompanyCountDtocount(@Param("id") Long id);
+
+    List<PowerCarCountDto> getPowerCarCountDtocount(@Param("alertCalledId") Long alertCalledId,@Param("companyId") Long companyId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
@@ -28,5 +29,5 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      * 获取力量调派资源树
      */
     List<FireBrigadeResourceDto> getPowerTree();
-
+    List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -44,7 +44,8 @@
     </select>
 
     <select id="getPowerTransferInfoCount" resultType="java.util.Map">
-        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count, 0
+        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count,
+        0
         no_return_car_count
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
@@ -121,23 +122,22 @@
     </select>
 
 
-
     <select id="getCompanyNum" resultType="Map">
       select COUNT(*) companyNum from
-(SELECT DISTINCT
+    (SELECT DISTINCT
         b.company_id
-FROM
+    FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
-WHERE
+    WHERE
         a.alert_called_id  = ${id} UNION ALL
-SELECT DISTINCT
+    SELECT DISTINCT
         b.company_id
-FROM
+    FROM
         jc_alert_submitted a
         LEFT JOIN jc_alert_submitted_object b ON a.sequence_nbr = b.alert_submitted_id
-WHERE
+    WHERE
         a.alert_called_id = ${id}) m
         </select>
 
@@ -147,13 +147,66 @@ WHERE
         c.resources_name carName,
         c.resources_num carNum
 
-FROM
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${id}
+    </select>
+
+
+
+
+
+
+
+    <select id="getPowerCompanyCountDtocount" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto">
+           SELECT
+        b.company_id companyId,
+        b.company_name companyName,
+        COUNT( c.resources_num ) carNum
+    FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
-WHERE
+    WHERE
         a.alert_called_id = ${id}
+    GROUP BY
+        b.company_id,
+        b.company_name
     </select>
 
+    <select id="getPowerCarCountDtocount" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto">
+         SELECT * from  (	  SELECT
+        COUNT( c.resources_num ) carNum,
+        c.resources_name carName,
+        GROUP_CONCAT( c.resources_num ) plateNumber
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${alertCalledId}
+        AND b.company_id = ${companyId}
+    GROUP BY
+        c.resources_name ) m where m.carNum>0
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +70,10 @@ public class CommandController extends BaseController {
     
     @Autowired
     IFirefightersService firefightersService;
+
+
+    @Autowired
+    IPowerTransferService powerTransferService;
     /**
      * 警情列表
      *
@@ -509,7 +514,7 @@ public class CommandController extends BaseController {
 
     /**
      *
-     * 当前灾情阶段
+     * 力量统计当前灾情阶段
      *
      * */
     @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
@@ -532,6 +537,20 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(list);
     }
 
-
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/22
+     * </PRE>
+     * 到场力量 列表统计
+     */
+    @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "getPowerCompanyCountDtocount/{id}")
+    @ApiOperation(httpMethod = "GET", value = "到场力量 列表统计", notes = "到场力量 列表统计")
+    public ResponseModel<Object> getPowerCompanyCountDtocount(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(powerTransferService.getPowerCompanyCountDtocount(id));
+    }
 
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -115,12 +116,14 @@ public class ContractController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "维保合同分页查询", notes = "维保合同分页查询")
     public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, Long companyId, String name, Long typeCode, Date signedDate) {
+            (value = "size") int size, Long companyId, Long signedCompanyId, String name, Long typeCode,
+                                                         Date signedDate) {
         Page<ContractDto> page = new Page<ContractDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page, false, companyId, name,
-                typeCode, signedDate));
+        AgencyUserModel amosUser = getUserInfo();
+        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page, false, companyId,
+                signedCompanyId, name, typeCode, signedDate, amosUser.getUserId()));
     }
 
     /**

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

@@ -5,6 +5,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,12 +62,11 @@ public class MaintenanceCompanyController extends BaseController {
 	 * 新增维保单位
 	 *
 	 * @return
-	 * @throws MyException
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/company/save")
-	@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保人员")
-	public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) throws MyException {
+	@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
+	public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) {
 		model.setType(COMPANY);
 		return ResponseHelper.buildResponse(maintenanceCompanyService.saveCompanyDetail(model));
 	}
@@ -74,14 +75,13 @@ public class MaintenanceCompanyController extends BaseController {
 	 * 新增维保单位人员基本信息
 	 *
 	 * @return
-	 * @throws MyException
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/person/save")
 	@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
-	public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompany model) throws Exception {
+	public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompany model) {
 		model.setType(PERSON);
-		return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model, model.getParentId()));
+		return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model));
 	}
 
 	/**
@@ -112,7 +112,24 @@ public class MaintenanceCompanyController extends BaseController {
 	@GetMapping(value = "/allList")
 	@ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门列表，不分页", notes = "所有维保人员列表")
 	public ResponseModel<List<Map<String, Object>>> getAllMaintenanceList(@RequestParam String maintenanceType) {
-		return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType));
+		AgencyUserModel amosUser = getUserInfo();
+		return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType,
+				amosUser.getUserId()));
+	}
+
+	/**
+	 * 查询当前登陆用户所在维保单位下的维保人员列表，不分页
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/simple/list")
+	@ApiOperation(httpMethod = "GET", value = "查询当前登陆用户所在维保单位下的维保人员列表部门列表，不分页", notes = "查询当前登陆用户所在维保单位下的维保人员列表，不分页")
+	public ResponseModel<List<Map<String, Object>>> getPersonListByCompanyId(@RequestParam(required = false) Long companyId) {
+		AgencyUserModel amosUser = getUserInfo();
+		List<Map<String, Object>> result = maintenanceCompanyServiceImpl.getPersonListByCompanyId(companyId,
+				amosUser.getUserId());
+		return ResponseHelper.buildResponse(result);
 	}
 
 	/**
@@ -123,12 +140,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/page/List")
 	@ApiOperation(httpMethod = "POST", value = "所有维保人员/单位/部门分页列表", notes = "所有维保人员列表")
-	public ResponseModel<IPage<Map<String, Object>>> getPageMaintenanceList(@RequestBody Map<String, Object> paramsMap
-//			@RequestParam(value = "current") int current, @RequestParam(value = "size") int size,
-//			
-//			@RequestParam String maintenanceType, @RequestParam String name, @RequestParam long parentId,
-//			@RequestParam String isWork
-	) throws Exception {
+	public ResponseModel<IPage<Map<String, Object>>> getPageMaintenanceList(@RequestBody Map<String, Object> paramsMap) {
 		return ResponseHelper.buildResponse(maintenanceCompanyService.getPageMaintenanceList(paramsMap));
 	}
 
@@ -141,10 +153,9 @@ public class MaintenanceCompanyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/department/save")
 	@ApiOperation(httpMethod = "POST", value = "新增维保部门", notes = "新增维保部门")
-	public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model,
-			@RequestParam long sequenceNbr) {
+	public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model) {
 		model.setType(DEPARTMENT);
-		return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model, sequenceNbr));
+		return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model));
 	}
 
 	/**
@@ -163,7 +174,7 @@ public class MaintenanceCompanyController extends BaseController {
 	/**
 	 * 根据sequenceNbr更新
 	 *
-	 * @param sequenceNbr 主键
+	 * @param model 主键
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -172,13 +183,13 @@ public class MaintenanceCompanyController extends BaseController {
 	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompany model
 			) {
 		return ResponseHelper
-				.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model, getUserInfo()));
+				.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model));
 	}
 
 	/**
 	 * 根据sequenceNbr更新
 	 *
-	 * @param sequenceNbr 主键
+	 * @param model 主键
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -186,13 +197,13 @@ public class MaintenanceCompanyController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位人员", notes = "根据sequenceNbr更新维保单位")
 	public ResponseModel<Boolean> updateBySequenceNbrMaintenancePerson(@RequestBody MaintenanceCompany model) {
 		return ResponseHelper
-				.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model, getUserInfo()));
+				.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model));
 	}
 
 	/**
 	 * 根据sequenceNbr更新
 	 *
-	 * @param sequenceNbr 主键
+	 * @param model 主键
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -201,7 +212,7 @@ public class MaintenanceCompanyController extends BaseController {
 	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceDepartment(@RequestBody MaintenanceCompany model
 			) {
 		return ResponseHelper
-				.buildResponse(maintenanceCompanyService.updateMaintenancDepartmentDetail(model, getUserInfo()));
+				.buildResponse(maintenanceCompanyService.updateMaintenanceDepartmentDetail(model));
 	}
 
 	/**
@@ -297,12 +308,15 @@ public class MaintenanceCompanyController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "queryCompanyPages/{sequenceNbr}")
+	@GetMapping(value = "queryCompanyPages")
 	@ApiOperation(httpMethod = "GET", value = "根据维保单位查询所有机场单位(带分页)", notes = "根据维保单位查询所有机场单位(带分页)")
-	public ResponseModel<List<Map<String, Object>>> seleteCompanyPages(@RequestParam(value = "pageNum") int pageNum,
-			@RequestParam(value = "pageSize") int pageSize, @PathVariable Long sequenceNbr) {
+	public ResponseModel<Page<Map<String, Object>>> selectCompanyPages(@RequestParam(defaultValue = "10", value =
+			"pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize,
+																	   @RequestParam(required = false) Long sequenceNbr) {
+		AgencyUserModel amosUser = getUserInfo();
 		return ResponseHelper
-				.buildResponse(maintenanceCompanyServiceImpl.queryOrgUsrMsgPage(pageNum, pageSize, sequenceNbr));
+				.buildResponse(maintenanceCompanyServiceImpl.queryOrgUsrMsgPage(pageNum, pageSize, sequenceNbr,
+						amosUser.getUserId()));
 	}
 
 	/**
@@ -313,7 +327,7 @@ public class MaintenanceCompanyController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "查询维保单位、业主单位信息", notes = "查询维保单位、业主单位信息")
-	@GetMapping(value = "/companyLlist")
+	@GetMapping(value = "/companyList")
 	public ResponseModel<List<Map<String, Object>>> selectCompanyList() {
 		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryCompanyMsg());
 	}

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

@@ -2,10 +2,10 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
-import com.yeejoin.amos.boot.module.common.api.entity.*;
+import com.yeejoin.amos.boot.module.common.api.entity.Contract;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IContractService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -24,10 +24,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
 import java.util.ArrayList;
-
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -42,15 +40,30 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
     @Autowired
     SourceFileServiceImpl sourceFileServiceImpl;
 
+    @Autowired
+    MaintenanceCompanyServiceImpl maintenanceCompanyService;
+
     /**
      * 分页查询
      */
-    public Page<ContractDto> queryForContractPage(Page<ContractDto> page, Boolean isDelete,
+    public Page<ContractDto> queryForContractPage(Page<ContractDto> page, Boolean isDelete, Long companyId,
+                                                  Long signedCompanyId, String name, Long typeCode, Date signedDate,
+                                                  String amosUserId) {
+        if (ValidationUtil.isEmpty(companyId)) {
+            MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
+            companyId = company.getSequenceNbr();
+        }
+        return queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
+                signedDate);
+    }
+
+    public Page<ContractDto> queryForContractPageByParam(Page<ContractDto> page, Boolean isDelete,
                                                   @Condition(Operator.eq) Long companyId,
+                                                  @Condition(Operator.eq) Long signedCompanyId,
                                                   @Condition(Operator.like) String name,
                                                   @Condition(Operator.eq) Long typeCode,
                                                   @Condition(Operator.likeLeft) Date signedDate) {
-        return this.queryForPage(page, null, false, isDelete, companyId, name, typeCode, signedDate);
+        return this.queryForPage(page, null, false, isDelete, companyId, signedCompanyId, name, typeCode, signedDate);
     }
 
     /**
@@ -254,6 +267,5 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
         contractDto.setAttachment(sourceFiles);
         return contractDto;
     }
-
 }
 

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

@@ -160,3 +160,4 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         return params;
     }
 }
+

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

@@ -251,6 +251,7 @@ public class MaintenanceCompanyServiceImpl
 		List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type);
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
 		List<MaintenanceCompany> mintenanceCompany = this.list(wrapper);
 
 		Map<Long, MaintenanceCompany> mintenanceCompanyMap = mintenanceCompany.stream()

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,11 +24,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
@@ -70,6 +66,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     @Autowired
     FireTeamServiceImpl fireTeamService;
 
+    @Autowired
+    PowerTransferMapper powerTransferMapper;
     @Override
     public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
         List<PowerTransferCompanyResourcesDto> powerTransferList =
@@ -183,6 +181,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         return fireBrigadeResourceList;
     }
 
+
+
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
         ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
         PowerTransferCompanyResources powerTransferCompanyResources;
@@ -319,4 +319,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         return transferInfo;
     }
+
+    @Override
+    public List<PowerCompanyCountDto> getPowerCompanyCountDtocount(Long id) {
+        List<PowerCompanyCountDto> list= powerTransferMapper.getPowerCompanyCountDtocount(id);
+        if(list!=null&&list.size()>0){
+            list.stream().forEach(powerCompanyCountDto->{
+                List<PowerCarCountDto> li= powerTransferMapper.getPowerCarCountDtocount(id,powerCompanyCountDto.getCompanyId());
+                powerCompanyCountDto.setPowerCarCountDto(li);
+            });
+        }
+        return list;
+    }
 }