Merge remote-tracking branch 'origin/developer' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.alibaba.fastjson.JSONObject;
 
-import javax.servlet.http.HttpServletResponse;
+import feign.Response;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW-CHENZHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程
@@ -109,11 +109,11 @@ public interface WorkflowFeignService {
 /**
  * 流程图高亮
  * */
-	@RequestMapping(value = "/activitiHistory/gethighLineImg/{processInstanceId}",method = RequestMethod.GET)
-	JSONObject thighLineImg(@PathVariable("processInstanceId") String processInstanceId, HttpServletResponse resp) ;
+	@RequestMapping(value = "/activitiHistory/gethighLineImg/{processInstanceId}", method = RequestMethod.GET)
+	Response thighLineImg(@PathVariable("processInstanceId") String processInstanceId) ;
 /**
  * 流程图高亮图片
  * */
 	@RequestMapping(value = "/activitiHistory/gethighLine",method = RequestMethod.GET)
-	JSONObject thighLine(@RequestParam("instanceId") String instanceId);
+	Response thighLine(@RequestParam("instanceId") String instanceId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/FailureStatuEnum.java

 package com.yeejoin.amos.boot.module.common.api.enums;
 
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
 public enum FailureStatuEnum {
 
         WAITING_AUDIT(0,"待审核"),
@@ -27,5 +32,14 @@ public enum FailureStatuEnum {
             return name;
         }
 
+    public static List<HashMap<String,String>> getEnumList() {
+        List<HashMap<String, String>> list = new ArrayList<>();
+        for (FailureStatuEnum testEnum : EnumSet.allOf(FailureStatuEnum.class)) {
+            HashMap<String, String> map = new HashMap<>();
+            map.put(testEnum.name,testEnum.code.toString());
+            list.add(map);
+        }
+        return list;
     }
+}
 

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

@@ -26,8 +26,11 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
      * @param page
      * @return
      */
-    IPage<FailureDetails> selectAllPage(Page page);
-
+   // IPage<FailureDetails> selectAllPage(Page page);
+    IPage<FailureDetails> selectAllPage(Page<FailureDetails> page, Long currentStatus,
+                                        String startTime,String endTime, Integer submissionPid);
+    /*IPage<FailureDetails> selectAllPage(int current,int size, Long currentStatus,
+                                        String startTime,String endTime, Integer submissionPid);*/
     /**
      * 查询我发起的 分页
      * current 当前页

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 联动单位 Mapper 接口
@@ -58,7 +55,7 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
      * 查询包含特岗人数及的具体信息
      * @return
      */
-    Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
+    List<LinkageUnitDto> getEmergencyLinkageUnitList(String unitName,
 			 String linkageUnitTypeCode,  String emergencyLinkageUnitCode);
 
     List<LinkageUnitDto> exportToExcel();

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

@@ -37,7 +37,7 @@ public interface IDutyCommonService {
      * @param endDate   结束日期
      * @return ResponseModel
      */
-    List<Map<String, Object>> list(String beginDate, String endDate) throws ParseException;
+    List<Map<String, Object>> list(Long teamId,String beginDate, String endDate) throws ParseException;
 
     /**
      * 获取表单参数

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

@@ -16,177 +16,184 @@ import java.util.Map;
  * @date 2021-06-18
  */
 public interface IOrgUsrService {
-    /**
-     * 查询上级单位
-     *
-     * @param parent_id
-     * @return
-     */
-    String selectUpUnitByParam(String parent_id);
-
-    /**
-     * 获取父级
-     *
-     * @param topId
-     * @param entityList
-     * @param packageURL
-     * @param IDMethodName
-     * @param IDHierarchy
-     * @param NAMEMethodName
-     * @param PARENTIDMethodName
-     * @param OrgTypeMethodName
-     * @return
-     * @throws Exception
-     */
-    List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-                             String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+	/**
+	 * 查询上级单位
+	 *
+	 * @param parent_id
+	 * @return
+	 */
+	String selectUpUnitByParam(String parent_id);
 
-    /**
-     * 获取子数据集合
-     *
-     * @param topId
-     * @param entityList
-     * @param packageURL
-     * @param IDMethodName
-     * @param IDHierarchy
-     * @param NAMEMethodName
-     * @param PARENTIDMethodName
-     * @param OrgTypeMethodName
-     * @return
-     * @throws Exception
-     */
-    List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-                            String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+	/**
+	 * 获取父级
+	 *
+	 * @param topId
+	 * @param entityList
+	 * @param packageURL
+	 * @param IDMethodName
+	 * @param IDHierarchy
+	 * @param NAMEMethodName
+	 * @param PARENTIDMethodName
+	 * @param OrgTypeMethodName
+	 * @return
+	 * @throws Exception
+	 */
+	List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
-    /**
-     * 组装融合调度单位人员信息
-     *
-     * @param ids
-     * @return
-     * @throws Exception
-     */
-    List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
+	/**
+	 * 获取子数据集合
+	 *
+	 * @param topId
+	 * @param entityList
+	 * @param packageURL
+	 * @param IDMethodName
+	 * @param IDHierarchy
+	 * @param NAMEMethodName
+	 * @param PARENTIDMethodName
+	 * @param OrgTypeMethodName
+	 * @return
+	 * @throws Exception
+	 */
+	List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
-    /**
-     * 获取动态表单数据
-     *
-     * @param id
-     * @return
-     * @throws Exception
-     */
-    List<FormValue> getFormValue(Long id) throws Exception;
+	/**
+	 * 组装融合调度单位人员信息
+	 *
+	 * @param ids
+	 * @return
+	 * @throws Exception
+	 */
+	List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
 
-    /**
-     * 保存 机构/部门/人员基本信息
-     *
-     * @param
-     * @throws Exception
-     */
-    void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
+	/**
+	 * 获取动态表单数据
+	 *
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	List<FormValue> getFormValue(Long id) throws Exception;
 
-    /**
-     * 新增机构/部门/人员基本信息和动态表单数据
-     *
-     * @param orgUsr
-     * @param alertFromValuelist
-     */
-    void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
+	/**
+	 * 保存 机构/部门/人员基本信息
+	 *
+	 * @param
+	 * @throws Exception
+	 */
+	void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
 
-    /**
-     * 更新机构/部门/人员基本信息和动态表单数据
-     *
-     * @param instanceId    实例id
-     * @param fromValueList 动态表单数据列表
-     * @throws Exception
-     */
-    void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
+	/**
+	 * 新增机构/部门/人员基本信息和动态表单数据
+	 *
+	 * @param orgUsr
+	 * @param alertFromValuelist
+	 */
+	void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
 
-    /**
-     * @param id
-     * @throws Exception
-     */
-    Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
+	/**
+	 * 更新机构/部门/人员基本信息和动态表单数据
+	 *
+	 * @param instanceId    实例id
+	 * @param fromValueList 动态表单数据列表
+	 * @throws Exception
+	 */
+	void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
 
-    List<OrgUsr> selectCompanyDepartmentMsg();
+	/**
+	 * @param id
+	 * @throws Exception
+	 */
+	Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
 
-    void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
+	List<OrgUsr> selectCompanyDepartmentMsg();
 
-    void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
+	void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
 
-    void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
+	void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
 
-    void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
+	void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
 
-    OrgUsrFormDto selectCompanyById(Long id) throws Exception;
+	void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
 
-    IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
+	OrgUsrFormDto selectCompanyById(Long id) throws Exception;
 
-    void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
+	IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
 
-    void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
+	void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
 
-    OrgPersonFormDto selectPersonById(Long id) throws Exception;
+	void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
 
-    OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
+	OrgPersonFormDto selectPersonById(Long id) throws Exception;
 
-    List<OrgMenuDto> selectPersonTree() throws Exception;
+	OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
 
-    void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
+	List<OrgMenuDto> selectPersonTree() throws Exception;
 
-    void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
+	void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
 
-    void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
+	void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
-    OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
+	void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
 
-    List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
+	OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 
+	List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
 
-    /**
-     * * @param null
-     *
-     * @return <PRE>
-     * author tw
-     * date 2021/7/20
-     * </PRE>
-     * 列表
-     */
-    List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
+	/**
+	 * * @param null
+	 *
+	 * @return
+	 * 
+	 *         <PRE>
+	 * author tw
+	 * date 2021/7/20
+	 *         </PRE>
+	 * 
+	 *         列表
+	 */
+	List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
 
-    /**
-     * * @param null
-     *
-     * @return <PRE>
-     * author tw
-     * date 2021/7/20
-     * </PRE>
-     * 统计
-     */
-    Integer listContractDtoCount(RequestData par);
+	/**
+	 * * @param null
+	 *
+	 * @return
+	 * 
+	 *         <PRE>
+	 * author tw
+	 * date 2021/7/20
+	 *         </PRE>
+	 * 
+	 *         统计
+	 */
+	Integer listContractDtoCount(RequestData par);
 
-    /**
-     * * @param null
-     *
-     * @return <PRE>
-     * author tw
-     * date 2021/7/26
-     * </PRE>
-     */
+	/**
+	 * * @param null
+	 *
+	 * @return
+	 * 
+	 *         <PRE>
+	 * author tw
+	 * date 2021/7/26
+	 *         </PRE>
+	 */
 
-    List<OrgUsrzhDto> getOrgUsrzhDto(String name);
+	List<OrgUsrzhDto> getOrgUsrzhDto(String name);
 
-    List<ESOrgUsrDto> selectByIddata(String name);
+	List<ESOrgUsrDto> selectByIddata(String name);
 
-    List<Map<String, Object>> getparent();
+	List<Map<String, Object>> getparent();
 
-    List<OrgUsrExcelDto> exportToExcel();
+	List<OrgUsrExcelDto> exportToExcel();
 
-    UserUnitDto getUserUnit(String userId);
+	UserUnitDto getUserUnit(String userId);
 
 	/**
 	 * 根据登陆人获取公司部门人员树
 	 */
-	List<OrgMenuDto> companyUserTreeByUser (AgencyUserModel user);
+	List<OrgMenuDto> companyUserTreeByUser(AgencyUserModel user);
 
 	/**
 	 * 根据登陆人获取公司部门树
@@ -203,4 +210,6 @@ public interface IOrgUsrService {
      */
     List<Map<String, Object>> getLoginUserDetails(AgencyUserModel user);
 
+	List<OrgUsr> getPersonListByParentId(Long id);
+
 }

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

@@ -45,8 +45,17 @@
 		a.latitude,
 		a.longitude,
 		Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
-		AS distance
-		FROM cb_linkage_unit a
+		AS distance,
+		case when csps.person_number is null then 0 else
+		csps.person_number end as userNum,
+		case when cre.vehicle_number is null then 0 else cre.vehicle_number end as
+		carNum
+		FROM
+		cb_linkage_unit a
+		LEFT JOIN cb_special_position_staff csps ON a.sequence_nbr =
+		csps.company_id
+		LEFT JOIN cb_rescue_equipment cre on a.sequence_nbr = cre.company_id
+
 		where a.longitude is not null and
 		a.latitude is not null
 		<if test='par.distance!=null'>
@@ -87,46 +96,61 @@
 		emergency_linkage_unit_code
 	</select>
 
-	<select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
+	<select id="exportToExcel"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
 		select
 		a.unit_name unitName,
-		a.linkage_unit_type linkageUnitType,
+		a.linkage_unit_type
+		linkageUnitType,
 		a.address ,
 		a.latitude,
 		a.longitude,
 		a.agreement_start_date agreementStartDate,
-		a.agreement_end_date agreementEndDate,
+		a.agreement_end_date
+		agreementEndDate,
 		a.contact_user contactUser,
-		a.contact_phone contactPhone,
+		a.contact_phone
+		contactPhone,
 		b.*
 		from cb_linkage_unit a LEFT JOIN
 		(SELECT
 		m.instance_id,
-		max(case m.field_code when 'emergencyServiceContent' then m.field_value end)     emergencyServiceContent,
-		max(case m.field_code when 'fireRescueCapability' then m.field_value end)                     fireRescueCapability,
-		max(case m.field_code when 'responsibilitiesSituation' then m.field_value end)     responsibilitiesSituation,
-		max(case m.field_code when 'unitSituation' then m.field_value end)                     unitSituation
-		FROM cb_dynamic_form_instance m GROUP BY m.instance_id) b
+		max(case m.field_code when 'emergencyServiceContent' then
+		m.field_value end) emergencyServiceContent,
+		max(case m.field_code when
+		'fireRescueCapability' then m.field_value end) fireRescueCapability,
+		max(case m.field_code when 'responsibilitiesSituation' then
+		m.field_value end) responsibilitiesSituation,
+		max(case m.field_code
+		when 'unitSituation' then m.field_value end) unitSituation
+		FROM
+		cb_dynamic_form_instance m GROUP BY m.instance_id) b
 
-		on b.instance_id=a.instance_id  where a.unit_name is not null
+		on
+		b.instance_id=a.instance_id where a.unit_name is not null
 	</select>
 
 
 	<select id="getEmergencyLinkageUnitList"
-		resultType="java.util.Map">
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
 		SELECT
 		clu.sequence_nbr as sequenceNbr,
 		clu.unit_name as unitName,
 		clu.unit_code AS unitCode,
 		clu.parent_id AS parentId,
 		clu.linkage_unit_type AS linkageUnitType,
-		clu.linkage_unit_type_code AS linkageUnitTypeCode,
-		clu.administrative_divisions AS administrativeDivisions,
-		clu.administrative_divisions_code AS administrativeDivisionsCode,
+		clu.linkage_unit_type_code AS
+		linkageUnitTypeCode,
+		clu.administrative_divisions AS
+		administrativeDivisions,
+		clu.administrative_divisions_code AS
+		administrativeDivisionsCode,
 		clu.address AS address,
-		clu.longitude AS longitude,
+		clu.longitude AS
+		longitude,
 		clu.latitude AS latitude,
-		clu.agreement_start_date AS agreementStartDate,
+		clu.agreement_start_date AS
+		agreementStartDate,
 		clu.agreement_end_date AS agreementEndDate,
 		clu.emergency_linkage_unit AS emergencyLinkageUnit,
 		clu.emergency_linkage_unit_code AS emergencyLinkageUnitCode,
@@ -157,14 +181,16 @@
 		FROM
 		cb_linkage_unit clu
 		WHERE clu.is_delete=0
-	 <if test="unitName != null and unitName != ''">
-		AND clu.unit_name LIKE concat(#{unitName}, '%')
+		<if test="unitName != null and unitName != ''">
+			AND clu.unit_name LIKE concat(#{unitName}, '%')
 		</if>
-		 <if test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
-		AND clu.linkage_unit_type_code =#{linkageUnitTypeCode} 
+		<if
+			test="linkageUnitType != null and linkageUnitType != ''">
+			AND clu.linkage_unit_type =#{linkageUnitType}
 		</if>
-		 <if test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''">
-		AND  clu.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
+		<if
+			test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''">
+			AND clu.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
 		</if>
 	</select>
 </mapper>

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
 * 调派资源dto
 *

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+* 调派资源统计dto
+*
+* @author tb
+* @date 2021-08-20
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@ApiModel(value="ResourceStatisticsDto", description="调派资源统计dto")
+public class ResourceStatisticsDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "全部")
+    private Integer allCount = 0;
+
+    @ApiModelProperty(value = "到场")
+    private Integer arrived = 0;
+
+    @ApiModelProperty(value = "途中")
+    private Integer underway = 0;
+
+    public ResourceStatisticsDto(String type, Integer allCount) {
+        this.type = type;
+        this.allCount = allCount;
+        this.arrived = 0;
+        this.underway = 0;
+    }
+}

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

@@ -10,6 +10,7 @@ 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.PowerTransferResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import org.apache.ibatis.annotations.Param;
 
@@ -96,6 +97,15 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
                                                                  @Param("alertCalledId") Long alertCalledId);
 
     /**
+     * 根据类型查询力量调派统计
+     *
+     * @param alertCalledId
+     * @param type
+     * @return
+     */
+    List<ResourceStatisticsDto> getPowerTransferTeamResourceCount(Long alertCalledId, String type);
+
+    /**
      * 根据参数获取警情当前已调派车辆资源列表信息
      *
      * @param alertCalledId 警情id

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

@@ -8,6 +8,7 @@ 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.dto.PowerTransferResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 
@@ -43,4 +44,13 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      * @return
      */
     IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type, Page<PowerTransferResourceDto> page);
+
+    /**
+     * 根据参数查询力量调派资源统计信息
+     *
+     * @param alertCalledId 警情id
+     * @param type 查询类型
+     * @return
+     */
+    List<ResourceStatisticsDto> getPowerTransferStatistics(Long alertCalledId, String type);
 }

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

@@ -210,6 +210,32 @@
             transfer.alert_called_id = #{alertCalledId}
             AND is_distribution_agencies = 0
     </select>
+    <select id="getPowerTransferTeamResourceCount"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto">
+        SELECT
+            "team" type,
+            count( DISTINCT company.company_id ) allCount
+        FROM
+            jc_power_transfer_company company
+                LEFT JOIN jc_power_transfer transfer ON transfer.sequence_nbr = company.power_transfer_id
+        WHERE
+            transfer.alert_called_id = #{alertCalledId}
+          AND is_distribution_agencies = 0 UNION ALL
+        SELECT
+            "car" type,
+            count( DISTINCT car.resources_id ) allCount
+        FROM
+            jc_power_transfer_company_resources car
+                LEFT JOIN jc_power_transfer_company company ON company.sequence_nbr = car.power_transfer_company_id
+                LEFT JOIN jc_power_transfer transfer ON transfer.sequence_nbr = company.power_transfer_id
+        WHERE
+            transfer.alert_called_id = #{alertCalledId}
+          AND is_distribution_agencies = 0
+        UNION ALL
+        SELECT
+            "person" type,
+            0 allCount
+    </select>
     <select id="getPowerTransferCarResource"
             resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto">
         SELECT DISTINCT

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/CheckShot.java

@@ -62,6 +62,11 @@ public class CheckShot extends BasicEntity {
 	private long checkInputId;
 
 	/**
+	 * 照片配置key(关联照片和拍照设置),来源picture_json
+	 */
+	private String photoConfKey;
+
+	/**
 	 * 扩展分类id
 	 */
 	@Column(name="classify_id")
@@ -113,6 +118,14 @@ public class CheckShot extends BasicEntity {
 		this.photoData = photoData;
 	}
 
+	public String getPhotoConfKey() {
+		return photoConfKey;
+	}
+
+	public void setPhotoConfKey(String photoConfKey) {
+		this.photoConfKey = photoConfKey;
+	}
+
 	public String getPointName() {
 		return this.pointName;
 	}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/InputItem.java

@@ -390,6 +390,32 @@ public class InputItem extends BasicEntity {
         return this.getId() == inputItem.getId();
     }
 
+    /**
+     * 维保公司id
+     */
+    private String companyId;
+
+    /**
+     * 维保公司名称
+     */
+    private String companyName;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getLevel() {
         return level;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Plan.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.maintenance.dao.entity;
 
 import java.sql.Time;
 import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
 import javax.persistence.*;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.LastModifiedDate;
 
 
@@ -65,6 +65,32 @@ public class Plan extends BasicEntity {
 
 	private String ownerId;
 
+	/**
+	 * 维保公司id
+	 */
+	private String companyId;
+
+	/**
+	 * 维保公司名称
+	 */
+	private String companyName;
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
 	@Transient
 	public String getOwnerId() {
 		return ownerId;

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Point.java

@@ -80,6 +80,32 @@ public class Point extends BasicEntity {
 	private String extendJson;
 
 	/**
+	 * 维保公司id
+	 */
+	private String companyId;
+
+	/**
+	 * 维保公司名称
+	 */
+	private String companyName;
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
 	 * 定点拍照数
 	 */
 	@Column(name="fixed_shot")

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Route.java

@@ -51,6 +51,16 @@ public class Route extends BasicEntity {
     private String orgCode;
 
     /**
+     * 维保公司id
+     */
+    private String companyId;
+
+    /**
+     * 维保公司名称
+     */
+    private String companyName;
+
+    /**
      * 备注说明
      */
     private String remark;
@@ -133,6 +143,22 @@ public class Route extends BasicEntity {
         return coordinates;
     }
 
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public void setCoordinates(String coordinates) {
         this.coordinates = coordinates;
     }

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

@@ -422,8 +422,10 @@ public class CommandController extends BaseController {
     @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/SY")
     @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
-    public ResponseModel<WaterResourceDto> selectOne( Long id) {
-        return ResponseHelper.buildResponse(iWaterResourceService.selectBySequenceNbr(id));
+    public ResponseModel<JSONObject> selectOne( Long id) {
+    	JSONObject jsonObject= 	JSONObject.parseObject(JSONObject.toJSONString(iWaterResourceService.selectBySequenceNbr(id)));
+    	jsonObject.remove("managementUnit");
+        return ResponseHelper.buildResponse(jsonObject);
     }
 
 
@@ -945,7 +947,7 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "app-根据警情id查询力量调派列表",   notes = "app-根据警情id查询力量调派列表")
     @GetMapping(value = "/app/transferList")
     public ResponseModel getPowerTransferList(@RequestParam String alertId,
-                                              @RequestParam(defaultValue = "company") String type,
+                                              @RequestParam(defaultValue = "team") String type,
                                               @RequestParam(value = "current") int current,
                                               @RequestParam(value = "size") int size) {
         Page page = new Page();
@@ -953,4 +955,12 @@ public class CommandController extends BaseController {
         page.setCurrent(current);
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferPageByParam(Long.valueOf(alertId), type, page));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "app-根据警情id查询力量调派资源统计",   notes = "app-根据警情id查询力量调派资源统计")
+    @GetMapping(value = "/app/transfer/statistics")
+    public ResponseModel getPowerTransferStatistics(@RequestParam String alertId,
+                                                    @RequestParam(defaultValue = "team") String type) {
+        return ResponseHelper.buildResponse(powerTransferService.getPowerTransferStatistics(Long.valueOf(alertId), type));
+    }
 }
\ 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/DutyCarController.java

@@ -63,7 +63,7 @@ public class DutyCarController extends BaseController {
     public ResponseModel list(
             @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
             @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
-        return ResponseHelper.buildResponse(iDutyCarService.list(beginDate, endDate));
+        return ResponseHelper.buildResponse(iDutyCarService.list(null,beginDate, endDate));
     }
 
 

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

@@ -61,8 +61,9 @@ public class DutyPersonController extends BaseController {
     @GetMapping(value = "/list")
     @ApiOperation(httpMethod = "GET", value = "值班列表视图-不分页", notes = "值班列表视图-不分页")
     public ResponseModel list(@ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
-                              @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
-        return ResponseHelper.buildResponse(iDutyPersonService.list(beginDate, endDate));
+                              @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+                             @RequestParam(required = false) Long teamId) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyPersonService.list(teamId,beginDate, endDate));
     }
 
 

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

@@ -123,12 +123,12 @@ public class LinkageUnitController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, String unitName, String linkageUnitTypeCode, String inAgreement, String emergencyLinkageUnitCode) {
+            (value = "size") int size, String unitName, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
     	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);
     	Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement);
+                unitName, linkageUnitType, emergencyLinkageUnitCode,inAgreement);
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }
 

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
+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.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.utils.MyException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,17 +27,9 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
-import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.utils.MyException;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 维保单位

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

@@ -84,11 +84,10 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         return page(pages, lambdaQueryWrapper);
 
     }
-
-    public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo,
-                                                            Integer type) {
+    public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo,Long currentStatus,
+                                                            String startTime,String endTime,Integer submissionPid,Integer type) {
         if (type.equals(SELECY_ALL)) {
-            return this.baseMapper.selectAllPage(page);
+            return this.baseMapper.selectAllPage(page,currentStatus,startTime ,endTime,submissionPid);
         }
         if (type.equals(SELECY_ISUBMIT)) {
             return baseMapper.selectISubPage(page, userInfo.getUserModel().getUserId());
@@ -96,6 +95,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         return this.queryForWaitManage(page, userInfo);
     }
 
+
+   /* public IPage<FailureDetails> queryForFailureDetailsPage(int current,int size, ReginParams userInfo,Long currentStatus,
+                                                            String startTime,String endTime,Integer submissionPid,Integer type) {
+        if (type.equals(SELECY_ALL)) {
+            return this.baseMapper.selectAllPage(current,size,currentStatus,startTime ,endTime,submissionPid);
+        }
+      *//*  if (type.equals(SELECY_ISUBMIT)) {
+            return baseMapper.selectISubPage(page, userInfo.getUserModel().getUserId());
+        }
+        return this.queryForWaitManage(page, userInfo);*//*
+        return null;
+    }*/
+
     /**
      * 我发起分页查询
      */

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

@@ -110,7 +110,7 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         Date processTime = model.getVerifyTime();
         String processDepartment = model.getVerifyDepartment();
         Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
-        String processAuditorCid = userInfo.getRole().getRoleName();
+        String processAuditorCid = userInfo.getUserModel().getRealName();
         Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
         Boolean repairlog = null;
         if (condition == AuditResultEnum.AGREE.getCode()) {

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -76,8 +75,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String unitName,
 			@Condition(Operator.eq) String linkageUnitTypeCode, @Condition(Operator.eq) String emergencyLinkageUnitCode,
 			String inAgreement) {
-		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitTypeCode, emergencyLinkageUnitCode);
-		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);
+		List<LinkageUnitDto>  linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(unitName, linkageUnitTypeCode, emergencyLinkageUnitCode);
+		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList), Map.class);
 		
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
 		linkageUnitListMap.forEach(i -> {
@@ -88,7 +87,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 				}
 			});
 		});
-		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()),
+		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList),
 				LinkageUnitDto.class);
 		List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
 			Date now = new Date();

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

@@ -579,6 +579,7 @@ public class MaintenanceCompanyServiceImpl
 		MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
 		if (ValidationUtil.isEmpty(seq)) {
 			maintenanceCompany = getMaintenanceCompany(amosUserId);
+			seq = maintenanceCompany.getSequenceNbr();
 		}
 		// 机场单位列表基本信息
 		if (pageNum == -1 || pageSize == -1) {
@@ -586,7 +587,7 @@ public class MaintenanceCompanyServiceImpl
 		}
 		Page page = new Page(pageNum, pageSize);
 		Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize);
-		Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, maintenanceCompany.getSequenceNbr());
+		Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, seq);
 		List<Map<String, Object>> finalResultMap = Lists.newArrayList();
 		// 机场组装单位动态表单数据
 		pageResult.getRecords().forEach(orgUsrDto -> {

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

@@ -21,6 +21,8 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1295,6 +1297,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return pid;
     }
 
+    /**
+     * 查询组织机构下面的人员信息
+     * @param id
+     * @return
+     */
+     public  List<OrgUsr> getPersonListByParentId(Long id) {
+    	 LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+    	 wrapper.eq(OrgUsr::getIsDelete, false);
+    	 wrapper.eq(OrgUsr::getParentId,id);
+    	 wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+    	 return this.baseMapper.selectList(wrapper);    	 
+     }
+    
+    
+    
+    
    @Override
    public List<Map<String, Object>> getLoginUserDetails (AgencyUserModel user) {
 

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

@@ -16,6 +16,7 @@ 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.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
 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;
@@ -372,8 +373,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         }
         IPage<PowerTransferResourceDto> resultPage = null;
         switch (type) {
-            case "company":
-                resultPage = powerTransferMapper.getPowerTransferTeamResource(page, alertCalledId);
+            case "team":
+                resultPage = getPowerTransferTeamResource(page, alertCalledId);
                 break;
             case "car":
                 resultPage = getPowerTransferCarResource(page, alertCalledId);
@@ -388,7 +389,28 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         return resultPage;
     }
 
-    private IPage<PowerTransferResourceDto> getPowerTransferCarResource(Page<PowerTransferResourceDto> page, Long alertCalledId) {
+    @Override
+    public List<ResourceStatisticsDto> getPowerTransferStatistics(Long alertCalledId, String type) {
+        List<ResourceStatisticsDto> result;
+        result = powerTransferMapper.getPowerTransferTeamResourceCount(alertCalledId, type);
+        if (ValidationUtil.isEmpty(result)) {
+            ResourceStatisticsDto team = new ResourceStatisticsDto("team", 0, 0, 0);
+            ResourceStatisticsDto car = new ResourceStatisticsDto("car", 0, 0, 0);
+            ResourceStatisticsDto person = new ResourceStatisticsDto("person", 0, 0, 0);
+            result.add(team);
+            result.add(car);
+            result.add(person);
+        }
+        return result;
+    }
+
+    public IPage<PowerTransferResourceDto> getPowerTransferTeamResource(Page<PowerTransferResourceDto> page,
+                                                                        Long alertCalledId) {
+        return powerTransferMapper.getPowerTransferTeamResource(page, alertCalledId);
+    }
+
+    private IPage<PowerTransferResourceDto> getPowerTransferCarResource(Page<PowerTransferResourceDto> page,
+                                                                        Long alertCalledId) {
         ResponseModel<Object> result = equipFeignClient.getFireCarListAll();
         Map<String, List<Map<String, Object>>> carInfoMap = Maps.newConcurrentMap();
         if (!ValidationUtil.isEmpty(result)) {
@@ -405,7 +427,6 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             String seq = car.getSequenceNbr().toString();
             car.setName((String) finalCarInfoMap.get(seq).get(0).get("name"));
             String carStateCode = (String) finalCarInfoMap.get(seq).get(0).get("carState");
-            FireCarStatusEnum.getEnum(carStateCode);
             car.setCarState(!ValidationUtil.isEmpty(FireCarStatusEnum.getEnum(carStateCode)) ?
                     FireCarStatusEnum.getEnum(carStateCode).getName() : "");
             List<String> images = (List<String>) finalCarInfoMap.get(seq).get(0).get("image");

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.maintenance.business.controller;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dto.CheckDto;
+import com.yeejoin.amos.maintenance.business.dto.CheckInputDto;
+import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
 import com.yeejoin.amos.maintenance.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.maintenance.business.param.CheckRecordParam;
 import com.yeejoin.amos.maintenance.business.param.CheckStatisticalParam;
@@ -11,7 +13,6 @@ import com.yeejoin.amos.maintenance.business.util.*;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
 import com.yeejoin.amos.maintenance.common.enums.CheckRecordOrderByEnum;
-import com.yeejoin.amos.maintenance.common.enums.PlanTaskOrderByEnum;
 import com.yeejoin.amos.maintenance.core.async.AsyncTask;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
@@ -19,7 +20,6 @@ import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.maintenance.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import com.yeejoin.amos.maintenance.core.util.StringUtil;
-import com.yeejoin.amos.maintenance.dao.entity.Check;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +36,8 @@ import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.*;
@@ -526,18 +528,25 @@ public class CheckController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "维保记录排序条件列表", notes = "维保记录排序条件列表")
     @RequestMapping(value = "/orderBy/list", method = RequestMethod.GET)
-    public CommonResponse getOrderByList() {
-        return CommonResponseUtil.success(CheckRecordOrderByEnum.getEnumList());
+    public ResponseModel getOrderByList() {
+        return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList());
     }
 
     @ApiOperation(value = "/设备设施维保记录分页列表",notes = "外部接口装备和者水源使用")
     @GetMapping(value = "page/{originalId}/list")
-    public CommonResponse getCheckListByOriginalId(
+    public ResponseModel getCheckListByOriginalId(
             @PathVariable String originalId,
             @RequestParam(value = "current") int pageNum,
             @RequestParam(value = "size") int pageSize
             ){
         CommonPageable pageable = new CommonPageable(pageNum,pageSize);
-        return CommonResponseUtil.success(checkService.getCheckListByOriginalId(originalId,pageable));
+        return ResponseHelper.buildResponse(checkService.getCheckListByOriginalId(originalId,pageable));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "web端维保记录详情")
+    @GetMapping(value = "input/{checkId}/detail")
+    public ResponseModel inputDetail(@ApiParam(value = "记录主表id") @PathVariable String checkId){
+        return ResponseHelper.buildResponse(checkService.getInputDetail(checkId));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/InputItemController.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -79,23 +81,20 @@ public class InputItemController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "新增检查项", notes = "新增检查项")
     @RequestMapping(value = "/addItem", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse addNewItem(@ApiParam(value = "检查项信息") @RequestBody InputItemParam param) {
-        if (ObjectUtils.isEmpty(param.getId())) {
-            return updateItem(param);
-        }
-        AgencyUserModel user = getUserInfo();
-        if (ObjectUtils.isEmpty(user)) {
-            return CommonResponseUtil.failure("用户session过期");
-        }
         try {
-            InputItem inputItem = new InputItem();
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);
+            InputItem inputItem = new InputItem();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             BeanUtils.copyProperties(param, inputItem);
+            inputItem.setCompanyId(personIdentity.getCompanyId());
+            inputItem.setCompanyName(personIdentity.getCompanyName());
             inputItem.setOrgCode(loginOrgCode);
-            inputItem.setCreateBy(user.getUserId());
+            inputItem.setCreateBy(RequestContext.getExeUserId());
             inputItemService.addNewInputItem(inputItem);
             return CommonResponseUtil.success();
         } catch (Exception e) {
@@ -122,19 +121,17 @@ public class InputItemController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "更新检查项", notes = "更新检查项")
+    @PersonIdentify
+    @ApiOperation(value = "更新检查项，没用到", notes = "更新检查项")
     @RequestMapping(value = "/updateItem", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse updateItem(@ApiParam(value = "检查项详情", required = false) @RequestBody InputItemParam param) {
-        if (ObjectUtils.isEmpty(param.getId())) {
-            return addNewItem(param);
-        }
-        AgencyUserModel user = getUserInfo();
-        if (ObjectUtils.isEmpty(user)) {
-            return CommonResponseUtil.failure("用户session过期");
-        }
         try {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             InputItem inputItem = new InputItem();
             BeanUtils.copyProperties(param, inputItem);
+            inputItem.setCompanyId(personIdentity.getCompanyId());
+            inputItem.setCompanyName(personIdentity.getCompanyName());
             inputItem.setId(param.getId());
             inputItemService.updateInputItem(inputItem);
             return CommonResponseUtil.success();

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.maintenance.business.controller;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -84,16 +86,19 @@ public class PlanController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
         try {
-            String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             String loginOrgCode = getOrgCode(reginParams);
             HashMap<String, Object> map = new HashMap<String, Object>();
+            param.setCompanyId(personIdentity.getCompanyId());
+            param.setCompanyName(personIdentity.getCompanyName());
             map.put("org_code", loginOrgCode);
-            map.put("user_id", userId);
+            map.put("user_id", RequestContext.getExeUserId());
             map.put("param", param);
             planService.addPlan(map);
             return CommonResponseUtil.success();
@@ -150,7 +155,7 @@ public class PlanController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "查询巡检计划明细", notes = "查询巡检计划明细")
+    @ApiOperation(value = "查询维保计划明细", notes = "查询维保计划明细")
     @RequestMapping(value = "/detail/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -9,9 +9,9 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
 import com.yeejoin.amos.maintenance.business.util.FileHelper;
 import com.yeejoin.amos.maintenance.business.util.PlanTaskPageParamUtil;
 import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
-import com.yeejoin.amos.maintenance.common.enums.PlanTaskOrderByEnum;
 import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
 import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum;
+import com.yeejoin.amos.maintenance.common.enums.PlanTaskOrderByEnum;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
 import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
@@ -27,6 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
@@ -47,6 +49,7 @@ public class PlanTaskController extends AbstractBaseController {
 
     /**
      * 计划执行查询
+     *
      * @param queryRequests
      * @param commonPageable
      * @return
@@ -196,16 +199,16 @@ public class PlanTaskController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保任务查询-mobile", notes = "根据用户条件查询所有计划任务-mobile")
     @RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse qryLoginUserPlanTask(
+    public ResponseModel<Page<Map<String, Object>>> qryLoginUserPlanTask(
             @ApiParam(value = "人员") @RequestParam(value = "userId", required = false) Long userId,
-            @ApiParam(value = "开始日期", required = true) @RequestParam(value = "startDate") String startTime,
-            @ApiParam(value = "结束日期", required = true) @RequestParam(value = "endDate") String endTime,
+            @ApiParam(value = "开始日期") @RequestParam(value = "startDate", required = false) String startTime,
+            @ApiParam(value = "结束日期") @RequestParam(value = "endDate", required = false) String endTime,
             @ApiParam(value = "维保状态") @RequestParam(value = "finishStatus", required = false) Integer finishStatus,
             @ApiParam(value = "排序条件") @RequestParam(value = "orderBy", defaultValue = "1") String orderBy,
             @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
             @ApiParam(value = "当前页", required = true) @RequestParam(value = "pageNumber") int pageNumber,
             @ApiParam(value = "页大小", required = true) @RequestParam(value = "pageSize") int pageSize) throws Exception {
-        HashMap<String, Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
         Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
@@ -218,13 +221,13 @@ public class PlanTaskController extends AbstractBaseController {
         params.put("finishStatus", finishStatus);
         params.put("orderBy", PlanTaskOrderByEnum.getEumByCode(orderBy).getOderBy());
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
-        return CommonResponseUtil.success(planTaskService.getPlanTasks(params, pageable));
+        return ResponseHelper.buildResponse(planTaskService.getPlanTasks(params, pageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保设施分页列表-mobile", notes = "维保设施分页列表-mobile")
     @RequestMapping(value = "/point/{planTaskId}/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse qryPlanTaskById(
+    public ResponseModel qryPlanTaskById(
             @ApiParam(value = "巡检计划任务ID", required = true) @PathVariable Long planTaskId,
             @ApiParam(value = "建筑id", required = true) @RequestParam(value = "buildingId", required = false) String buildingId,
             @ApiParam(value = "维保状态", required = true) @RequestParam(value = "isFinish", required = false) String isFinish,
@@ -239,39 +242,37 @@ public class PlanTaskController extends AbstractBaseController {
         param.put("systemId", systemId);
         param.put("pointNo", pointNo);
         param.put("pointName", pointName);
-        return CommonResponseUtil.success(planTaskService.getPlanTaskPoints(param));
+        return ResponseHelper.buildResponse(planTaskService.getPlanTaskPoints(param));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "查询维保设施，检查内容详情")
     @GetMapping(value = "/task-point-detail")
-    public CommonResponse planTaskPointDetail(
+    public ResponseModel planTaskPointDetail(
             @RequestParam(value = "routePointId") String routePointId,
             @RequestParam(value = "id") String planTaskDetailId
     ) {
-        return CommonResponseUtil.success(planTaskService.planTaskPointDetail(planTaskDetailId, routePointId));
+        return ResponseHelper.buildResponse(planTaskService.planTaskPointDetail(planTaskDetailId, routePointId));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保设施完成状态下拉列表")
     @GetMapping(value = "/taskDetail/finishStatus/list")
-    public CommonResponse planTaskPointDetail() {
-        return CommonResponseUtil.success(PlanTaskDetailIsFinishEnum.getEnumList());
+    public ResponseModel planTaskPointDetail() {
+        return ResponseHelper.buildResponse(PlanTaskDetailIsFinishEnum.getEnumList());
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "计划任务完成状态列表", notes = "计划任务完成状态列表")
     @RequestMapping(value = "/finishStatus/list", method = RequestMethod.GET)
-    public CommonResponse getPlanTaskFinishStatus() {
-        return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList());
+    public ResponseModel getPlanTaskFinishStatus() {
+        return ResponseHelper.buildResponse(PlanTaskFinishStatusEnum.getEnumList());
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "维保任务排序条件", notes = "维保任务排序条件")
     @RequestMapping(value = "/orderBy/list", method = RequestMethod.GET)
-    public CommonResponse getOrderByList() {
-        return CommonResponseUtil.success(PlanTaskOrderByEnum.getEnumList());
+    public ResponseModel getOrderByList() {
+        return ResponseHelper.buildResponse(PlanTaskOrderByEnum.getEnumList());
     }
-
-
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PointController.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.maintenance.business.vo.PointInputItemVo;
 import com.yeejoin.amos.maintenance.business.vo.PointVo;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import com.yeejoin.amos.maintenance.dao.entity.Point;
 import com.yeejoin.amos.maintenance.dao.entity.PointClassify;
 import io.swagger.annotations.Api;
@@ -27,6 +28,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -53,14 +55,17 @@ public class PointController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "新增巡检点", notes = "新增巡检点")
     @PostMapping(value = "/addPoint", produces = "application/json;charset=UTF-8")
     public CommonResponse addPoint(@ApiParam(value = "巡检点", required = true) @RequestBody PointParam pointParam) {
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
-        //点归属于公司
+        ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+        pointParam.getPoint().setCompanyId(personIdentity.getCompanyId());
+        pointParam.getPoint().setCompanyName(personIdentity.getCompanyName());
         pointParam.getPoint().setOrgCode(loginOrgCode);
-        pointParam.getPoint().setCreatorId(getUserId());
+        pointParam.getPoint().setCreatorId(RequestContext.getExeUserId());
         Point point = iPointService.addPoint(pointParam);
         return CommonResponseUtil.success(point);
 
@@ -92,14 +97,19 @@ public class PointController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "更新巡检点", notes = "更新巡检点")
     @PutMapping(value = "/updatePoint", produces = "application/json;charset=UTF-8")
     public CommonResponse updatePoint(@ApiParam(value = "巡检点", required = true) @RequestBody PointParam pointParam) {
         try {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            pointParam.getPoint().setCompanyId(personIdentity.getCompanyId());
+            pointParam.getPoint().setCompanyName(personIdentity.getCompanyName());
+            pointParam.getPoint().setCreatorId(RequestContext.getExeUserId());
             iPointService.updatePoint(pointParam);
             return CommonResponseUtil.success();
         } catch (Exception e) {
-            e.printStackTrace();
             log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("更新巡检点失败");
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/RouteController.java

@@ -7,8 +7,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -58,18 +61,22 @@ public class RouteController extends AbstractBaseController {
      * @return CommonResponse
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "新增巡检路线", notes = "新增巡检路线")
     @PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8")
     public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             String loginOrgCode = getOrgCode(reginParams);
             route.setOrgCode(loginOrgCode);
             route.setIsDelete(false);
             if (routeService.existRouteName(loginOrgCode, route.getName())) {
                 return CommonResponseUtil.failure("巡检路线名称重复");
             }
-            route.setCreatorId(getUserId());
+            route.setCompanyId(personIdentity.getCompanyId());
+            route.setCompanyName(personIdentity.getCompanyName());
+            route.setCreatorId(RequestContext.getExeUserId());
             routeService.addRoute(route);
             return CommonResponseUtil.success();
         } catch (Exception e) {
@@ -85,14 +92,18 @@ public class RouteController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "更新巡检路线", notes = "更新巡检路线")
     @PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8")
     public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             String orgCode = getOrgCode(reginParams);
+            route.setCompanyId(personIdentity.getCompanyId());
+            route.setCompanyName(personIdentity.getCompanyName());
             route.setOrgCode(orgCode);
-            route.setCreatorId(getUserId());
+            route.setCreatorId(RequestContext.getExeUserId());
             routeService.updateRoute(route);
             return CommonResponseUtil.success();
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/CheckMapper.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.maintenance.business.dto.CheckInputDto;
 import com.yeejoin.amos.maintenance.business.param.CheckStatisticalParam;
 import com.yeejoin.amos.maintenance.business.util.CheckDetailInputPageParam;
 import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,6 @@ import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckUserBo;
 import com.yeejoin.amos.maintenance.business.param.CheckInfoListPageParam;
 import com.yeejoin.amos.maintenance.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.maintenance.business.param.CheckRecordParam;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
 import com.yeejoin.amos.maintenance.core.common.response.PointCheckInfoBusinessRespone;
@@ -283,4 +283,11 @@ public interface CheckMapper extends BaseMapper {
 
 	Map<String, Object> getCheckDetail(@Param(value = "id") String id);
 
+	/**
+	 * 检查项结果列表
+	 * @param checkId 检查记录主表id
+	 * @param fileUrl 文件服务器前缀
+	 * @return List<CheckInputDto>
+	 */
+    List<CheckInputDto> queryCheckInputDetail(@Param("checkId") String checkId, @Param("fileUrl") String fileUrl);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/PlanTaskMapper.java

@@ -68,7 +68,7 @@ public interface PlanTaskMapper extends BaseMapper {
 	 * @param params
 	 * @return
 	 */
-	List<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params);
+	List<Map<String, Object>> getPlanTasks(Map<String, Object> params);
 	/**
 	 *	 通过计划任务Id获得计划任务信息
 	 * @param planTaskId
@@ -120,7 +120,13 @@ public interface PlanTaskMapper extends BaseMapper {
 	 * @return
 	 */
 	List<CheckChkExListBo> getChkExList(CheckPtListPageParam param);
-	long getPlanTasksCount(HashMap<String, Object> params);
+
+	/**
+	 * 数量统计
+	 * @param params
+	 * @return
+	 */
+	long getPlanTasksCount(Map<String, Object> params);
 
 	Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dto/CheckInputDto.java

+package com.yeejoin.amos.maintenance.business.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+@Data
+public class CheckInputDto {
+	private Long checkInputId;
+	private Long inputId;
+	private String inputName;
+	private Integer orderNo;
+	private String inputValue;
+	private String isOk;
+	private String isOkDesc;
+	private String pictureJson;
+	private String dataJson;
+	private String remark;
+	private List<CheckShotDto> checkInputShot;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dto/CheckShotDto.java

@@ -7,6 +7,19 @@ import lombok.Data;
  */
 @Data
 public class CheckShotDto {
+
+    private Long checkShotId;
+
+    /**
+     * 照片类型：1-检查项照片；2-不合格照片
+     */
     private String shotType;
+    /**
+     * 照片路径
+     */
     private String fileUrl;
+    /**
+     * 照片配置key，用来照片和具体的拍照配置对应
+     */
+    private String photoConfKey;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dto/PictureJsonConfig.java

+package com.yeejoin.amos.maintenance.business.dto;
+
+import lombok.Data;
+
+/**
+ * @author DELL
+ */
+@Data
+public class PictureJsonConfig {
+    /**
+     * 是否必输
+     */
+    private String isMust;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 排序
+     */
+    private Integer orderNo;
+    /**
+     * 拍照数量
+     */
+    private String picNumber;
+
+    /**
+     * 配置key
+     */
+    private String photoConfKey;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckRecordParam.java

@@ -21,7 +21,7 @@ public class CheckRecordParam {
 	@ApiModelProperty(value = "点id",required = true)
 	private Long pointId;
 
-    @ApiModelProperty(value = "组织机构",required = false)
+    @ApiModelProperty(value = "组织机构")
     private String orgCode;
 
 	@ApiModelProperty(value = "备注")

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/action/AcceptEquipmentRules.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.maintenance.business.service.action;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.maintenance.business.dao.repository.ICheckInputDao;
 import com.yeejoin.amos.maintenance.business.dao.repository.IInputItemDao;
 import com.yeejoin.amos.maintenance.business.entity.mybatis.EquipmentInputItemRo;
@@ -37,6 +38,8 @@ public class AcceptEquipmentRules {
     private ICheckInputDao checkInputDao;
     @Value("${input.statute.prefix}")
     private String statutePre;
+    @Autowired
+    private Sequence sequence;
 
 
     public void getContent(
@@ -71,6 +74,7 @@ public class AcceptEquipmentRules {
             pictureObject.put("name", "拍照");
             pictureObject.put("orderNo", "0");
             pictureObject.put("picNumber", 0);
+            pictureObject.put("photoConfKey",String.valueOf(sequence.nextId()));
             pictureArray.add(pictureObject);
             item.setPictureJson(pictureArray.toJSONString());
         } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.RouteMapper;
 import com.yeejoin.amos.maintenance.business.dao.repository.*;
 import com.yeejoin.amos.maintenance.business.dto.CheckDto;
+import com.yeejoin.amos.maintenance.business.dto.CheckInputDto;
 import com.yeejoin.amos.maintenance.business.dto.CheckRecordDto;
 import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
 import com.yeejoin.amos.maintenance.business.entity.mybatis.*;
@@ -210,6 +211,7 @@ public class CheckServiceImpl implements ICheckService {
                     img.setPointName(check.getPointName());
                     img.setShotType(shotDto.getShotType());
                     img.setPhotoData(shotDto.getFileUrl());
+                    img.setPhotoConfKey(shotDto.getPhotoConfKey());
                     checkShots.add(img);
                 }
                 checkInput.setCheckShotList(checkShots);
@@ -236,7 +238,7 @@ public class CheckServiceImpl implements ICheckService {
             Check finalCheck = check;
             //4.检查项入库
             checkItemList.forEach(checkInput -> checkInput.setCheckId(finalCheck.getId()));
-            if(!checkItemList.isEmpty()){
+            if (!checkItemList.isEmpty()) {
                 checkInputDao.saveAll(checkItemList);
             }
             List<CheckShot> allShot = new ArrayList<>();
@@ -255,11 +257,11 @@ public class CheckServiceImpl implements ICheckService {
 
             planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), recordParam.getPointId(), recordParam.getPlanTaskId(), mtUserSeq);
             //6.消息广播最近维保日期
-            if(StringUtil.isNotEmpty(point.getOriginalId())){
+            if (StringUtil.isNotEmpty(point.getOriginalId())) {
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("fireFacilityId",point.getOriginalId());
-                jsonObject.put("maintenanceTime",check.getCheckTime());
-                mqttGateway.publish(CHECK_UPDATE_TOPIC,jsonObject.toJSONString());
+                jsonObject.put("fireFacilityId", point.getOriginalId());
+                jsonObject.put("maintenanceTime", check.getCheckTime());
+                mqttGateway.publish(CHECK_UPDATE_TOPIC, jsonObject.toJSONString());
             }
             //7.返回不合格记录
             return new CheckDto(check.getId(), unqualifiedCheckItemList);
@@ -271,7 +273,7 @@ public class CheckServiceImpl implements ICheckService {
     private void checkCanFinishTask(String mtUserSeq, PlanTask planTask, Long pointId) throws Exception {
         int status;
         int count = checkService.checkHasRecord(planTask.getId(), pointId);
-        if(count > 0){
+        if (count > 0) {
             throw new RuntimeException("任务已执行，不能重复执行");
         }
         if (!ToolUtils.transBeanList(planTask.getUserId()).contains(mtUserSeq)) {
@@ -414,7 +416,7 @@ public class CheckServiceImpl implements ICheckService {
     @Override
     public Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable) {
         Point point = iPointDao.findByOriginalId(originalId);
-        if(point == null){
+        if (point == null) {
             throw new RuntimeException("不存在该设备设施");
         }
         List<DaoCriteria> criterias = new ArrayList<>();
@@ -429,7 +431,19 @@ public class CheckServiceImpl implements ICheckService {
         orders.add(idOrder);
         Sort sort = Sort.by(orders);
         pageable.setSort(sort);
-        return checkDao.findAll(spec,pageable);
+        return checkDao.findAll(spec, pageable);
+    }
+
+    @Override
+    public List<CheckInputDto> getInputDetail(String checkId) {
+        List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId,fileUrl);
+        list.forEach(input->{
+            CheckStatusEnum statusEnum = CheckStatusEnum.getEnum(input.getIsOk());
+            if(statusEnum != null){
+                input.setIsOkDesc(statusEnum.getName());
+            }
+        });
+        return list;
     }
 
     @Override
@@ -674,12 +688,12 @@ public class CheckServiceImpl implements ICheckService {
         Map<String, Object> charData = checkMapper.pieChartData(param);
         List<Map<String, Object>> calendarData = checkMapper.calendarData(param);
         Map<String, Object> result = new HashMap<>();
-        Map<String,List<CalendarStatusCountRespone>> calendarMap = calendarData.stream().collect(Collectors.groupingBy(map -> map.get("time").toString(),Collectors.mapping(c->{
+        Map<String, List<CalendarStatusCountRespone>> calendarMap = calendarData.stream().collect(Collectors.groupingBy(map -> map.get("time").toString(), Collectors.mapping(c -> {
             CalendarStatusCountRespone countRespone = new CalendarStatusCountRespone();
             countRespone.setCount(Long.parseLong(c.get("count").toString()));
             countRespone.setStatus(c.get("status").toString());
             return countRespone;
-        },Collectors.toList())));
+        }, Collectors.toList())));
         result.put("charData", charData);
         result.put("calendarData", calendarMap);
         return result;
@@ -1077,7 +1091,7 @@ public class CheckServiceImpl implements ICheckService {
         params.put("pageSize", page.getPageSize());
         content = checkMapper.getChecks(params);
         if (0 < content.size()) {
-            for(HashMap<String, Object> map : content) {
+            for (HashMap<String, Object> map : content) {
                 if (map.containsKey("isOk")) {
                     map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName());
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/InputItemServiceImpl.java

 package com.yeejoin.amos.maintenance.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.RouteMapper;
 import com.yeejoin.amos.maintenance.business.dao.repository.IInputItemDao;
 import com.yeejoin.amos.maintenance.business.dao.repository.IPointInputItemDao;
+import com.yeejoin.amos.maintenance.business.dto.PictureJsonConfig;
 import com.yeejoin.amos.maintenance.business.param.CheckInputParam;
 import com.yeejoin.amos.maintenance.business.param.InputItemPageParam;
 import com.yeejoin.amos.maintenance.business.service.intfc.ICatalogTreeService;
@@ -15,6 +18,7 @@ import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
 import com.yeejoin.amos.maintenance.business.vo.InputItemTemplateVo;
 import com.yeejoin.amos.maintenance.business.vo.InputItemVo;
 import com.yeejoin.amos.maintenance.business.vo.PointInputItemVo;
+import com.yeejoin.amos.maintenance.core.util.StringUtil;
 import com.yeejoin.amos.maintenance.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.maintenance.dao.entity.CheckInput;
 import com.yeejoin.amos.maintenance.dao.entity.InputItem;
@@ -28,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.*;
 
@@ -42,17 +47,26 @@ public class InputItemServiceImpl implements IInputItemService {
     RouteMapper routeMapper;
     @Autowired
     InputItemMapper inputItemMapper;
-    @Autowired
-    private ICatalogTreeService iCatalogTreeService;
+
     @Value("${input.custom.prefix}")
     private String customPre;
 
     @Autowired
     private RemoteSecurityService remoteSecurityService;
 
+    @Autowired
+    private Sequence sequence;
+
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public long addNewInputItem(InputItem param) {
+        List<PictureJsonConfig> pictureJsonConfigs = JSON.parseArray(param.getPictureJson(), PictureJsonConfig.class);
+        for(PictureJsonConfig p: pictureJsonConfigs){
+            if(StringUtils.isEmpty(p.getPhotoConfKey())){
+                p.setPhotoConfKey(String.valueOf(sequence.nextId()));
+            }
+        }
+        param.setPictureJson(JSONObject.toJSONString(pictureJsonConfigs));
         if (param.getId() > 0) {
             inputItemMapper.updateInputItem(param);
         } else {
@@ -200,7 +214,7 @@ public class InputItemServiceImpl implements IInputItemService {
     public Boolean uploadListByTemplate(List<InputItemTemplateVo> itemTemplateVoList, String orgCode, String userId) throws Exception {
         List<InputItem> list = new ArrayList<>();
         if (!CollectionUtils.isEmpty(itemTemplateVoList)) {
-            itemTemplateVoList.stream().forEach(x -> {
+            itemTemplateVoList.forEach(x -> {
                 InputItem inputItem = new InputItem();
                 BeanUtils.copyProperties(x, inputItem);
                 inputItem.setOrgCode(orgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

 package com.yeejoin.amos.maintenance.business.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.beust.jcommander.internal.Sets;
-import com.google.common.base.Joiner;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.PlanMapper;
@@ -13,20 +8,17 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskDetailMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.maintenance.business.dao.repository.*;
 import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
-import com.yeejoin.amos.maintenance.business.entity.mybatis.PointCheckDetailBo;
 import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
 import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
-import com.yeejoin.amos.maintenance.business.util.Toke;
 import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
-import com.yeejoin.amos.maintenance.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
+import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
+import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
-import com.yeejoin.amos.maintenance.core.common.response.AppCheckInputRespone;
-import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.maintenance.core.util.DateUtil;
 import com.yeejoin.amos.maintenance.core.util.StringUtil;
 import com.yeejoin.amos.maintenance.dao.entity.*;
@@ -42,7 +34,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -503,8 +494,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
 
     @Override
-    public Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable pageParam) {
-        List<HashMap<String, Object>> content = Lists.newArrayList();
+    public Page<Map<String, Object>> getPlanTasks(Map<String, Object> params, CommonPageable pageParam) {
+        List<Map<String, Object>> content = Lists.newArrayList();
         long total = planTaskMapper.getPlanTasksCount(params);
         if (total == 0) {
             return new PageImpl<>(content, pageParam, total);
@@ -512,12 +503,25 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         params.put("offset", pageParam.getOffset());
         params.put("pageSize", pageParam.getPageSize());
         content = planTaskMapper.getPlanTasks(params);
+        content.forEach(c -> {
+            if (c.containsKey("finishStatus")) {
+                String finishStatusDesc = PlanTaskFinishStatusEnum.getName(Integer.parseInt(c.get("finishStatus").toString()));
+                c.put("finishStatusDesc", finishStatusDesc);
+            }
+        });
         return new PageImpl<>(content, pageParam, total);
     }
 
     @Override
-    public List getPlanTaskPoints(Map<String, Object> param) {
-        return planTaskMapper.getPlanTaskPoints(param);
+    public List<Map<String,Object>> getPlanTaskPoints(Map<String, Object> param) {
+        List<Map<String,Object>> result = planTaskMapper.getPlanTaskPoints(param);
+        result.forEach(r->{
+            if(r.containsKey("isFinish")){
+                String isFinishDesc = PlanTaskDetailIsFinishEnum.getName(Integer.parseInt(r.get("isFinish").toString()));
+                r.put("isFinishDesc",isFinishDesc);
+            }
+        });
+        return result;
     }
 
     @Override
@@ -656,10 +660,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
 
-
-
-
-
     @Override
     public String getCumulativePlanCountByOrgCode(String loginOrgCode) {
         return planTaskMapper.getCumulativePlanCountByOrgCode(loginOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/RouteServiceImpl.java

@@ -76,7 +76,7 @@ public class RouteServiceImpl implements IRouteService {
 
     @Override
     @Transactional
-    public Route addRoute(Route route) {
+    public Route  addRoute(Route route) {
         String creatorId = route.getCreatorId();
         String orgCode = route.getOrgCode();
         route = iRouteDao.saveAndFlush(route);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.maintenance.business.service.intfc;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.dto.CheckDto;
+import com.yeejoin.amos.maintenance.business.dto.CheckInputDto;
 import com.yeejoin.amos.maintenance.business.dto.CheckRecordDto;
 import com.yeejoin.amos.maintenance.business.entity.mybatis.*;
 import com.yeejoin.amos.maintenance.business.param.*;
@@ -269,4 +270,11 @@ public interface ICheckService {
     int checkHasRecord(Long planTaskId, Long pointId);
 
     Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable);
+
+    /**
+     * 维保检查项详情
+     * @param checkId 记录ID
+     * @return List<CheckInputDto>
+     */
+    List<CheckInputDto> getInputDetail(String checkId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IPlanTaskService.java

@@ -66,7 +66,7 @@ public interface IPlanTaskService {
      * @param page
      * @return
      */
-    Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page);
+    Page<Map<String, Object>> getPlanTasks(Map<String, Object> params, CommonPageable page);
 
 
     /**
@@ -75,7 +75,7 @@ public interface IPlanTaskService {
      * @param param
      * @return
      */
-    List getPlanTaskPoints(Map<String, Object> param);
+    List<Map<String,Object>> getPlanTaskPoints(Map<String, Object> param);
 
     /**
      * 今日执行情况

amos-boot-system-maintenance/pom.xml

@@ -12,10 +12,6 @@
 		<groupId>com.amosframework.boot</groupId>
 		<artifactId>amos-boot-module-maintenance-biz</artifactId>
 		<version>${amos-biz-boot.version}</version>
-	</dependency>
-     <dependency>
-         <artifactId>mysql-connector-java</artifactId>
-         <groupId>mysql</groupId>
      </dependency>
   </dependencies>
  <build>

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -47,4 +47,125 @@
             ALTER TABLE p_check_shot modify `org_code` varchar(100) DEFAULT NULL COMMENT '权限系统org code';
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check_shot" columnName="photo_conf_key"/>
+            </not>
+        </preConditions>
+        <comment>p_check_shot add COLUMN photo_conf_key 增加项和照片关联</comment>
+        <sql>
+            ALTER TABLE p_check_shot add COLUMN `photo_conf_key` varchar(32) DEFAULT NULL COMMENT '照片配置key(关联照片和拍照设置)';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item add COLUMN company_id 维保公司id</comment>
+        <sql>
+            ALTER TABLE p_input_item add COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '维保公司id';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item add COLUMN company_name '维保公司名称'</comment>
+        <sql>
+            ALTER TABLE p_input_item add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_point" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_point add COLUMN company_id 维保公司id</comment>
+        <sql>
+            ALTER TABLE p_point add COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '维保公司id';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_point" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_point add COLUMN company_name '维保公司名称'</comment>
+        <sql>
+            ALTER TABLE p_point add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-6">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_route" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_route add COLUMN company_id 维保公司id</comment>
+        <sql>
+            ALTER TABLE p_route add COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '维保公司id';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-7">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_route" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_route add COLUMN company_name '维保公司名称'</comment>
+        <sql>
+            ALTER TABLE p_route add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-8">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_plan add COLUMN company_id 维保公司id</comment>
+        <sql>
+            ALTER TABLE p_plan add COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '维保公司id';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-9">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_plan add COLUMN company_name '维保公司名称'</comment>
+        <sql>
+            ALTER TABLE p_plan add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-10">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN company_id 维保公司id</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '维保公司id';
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1629788256095-11">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN company_name '维保公司名称'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2063,4 +2063,41 @@
         WHERE
             pc.id = #{id}
     </select>
+    <select id="queryCheckInputDetail" resultMap="checkInputWithPhotoMap">
+        select
+           ci.id,
+           ci.input_id,
+           ci.input_name,
+           ci.input_value,
+           ci.is_ok,
+           ci.remark,
+           ci.order_no,
+           #{fileUrl} as prefix,
+           ii.picture_json,
+           ii.data_json
+        from p_check_input ci
+         left join p_input_item ii on ci.input_id = ii.id
+        where ci.check_id=#{checkId}
+        order by order_no
+    </select>
+    <resultMap id="checkInputWithPhotoMap" type="com.yeejoin.amos.maintenance.business.dto.CheckInputDto">
+        <result column="id" property="checkInputId"/>
+        <collection
+            property="checkInputShot"
+            ofType="com.yeejoin.amos.maintenance.business.dto.CheckShotDto"
+            select="queryCheckShot"
+            column="{checkInputId=id,prefix=prefix}"
+        />
+    </resultMap>
+    <select id="queryCheckShot" resultType="com.yeejoin.amos.maintenance.business.dto.CheckShotDto">
+        select
+           id as checkShotId,
+           check_input_id,
+           shot_type,
+           photo_conf_key,
+           concat(#{prefix},photo_data) as fileUrl
+        from
+            p_check_shot
+        where check_input_id = #{checkInputId}
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -26,6 +26,8 @@
 			 <if test="testRequirement != null ">test_requirement=#{testRequirement},</if>
 			 <if test="inputClassify != null ">input_classify=#{inputClassify},</if>
 			 <if test="unit != null ">unit=#{unit},</if>
+			 <if test="companyId != null ">company_id=#{companyId},</if>
+			 <if test="companyName != null ">company_name=#{companyName}</if>
  		</trim>
  		WHERE id=#{id}
 	</update>

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -214,7 +214,7 @@
 	<sql id="mobile-plan-task-where">
 		<where>
 			<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0</if>
-			<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
+			<if test="finishStatus != null and finishStatus!=''"> and a.finishStatus = #{finishStatus}</if>
 			<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
 				AND (
 				(
@@ -238,7 +238,7 @@
 			<choose>
 				<when test="identityType==1">
 					And (a.orgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.orgCode= #{orgCode} )
-					<if test="companyId != null"> and a.owner_id = #{companyId}</if>
+					<if test="companyId != null and companyId != ''"> and a.owner_id = #{companyId}</if>
 				</when>
 				<when test="identityType==2">
 					And a.owner_id = #{companyId}