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

@@ -9,6 +9,7 @@ import com.skua.core.context.BaseContextHandler;
 import com.skua.core.query.QueryGenerator;
 import com.skua.modules.equipment.entity.EquipmentInfo;
 import com.skua.modules.equipment.service.IEquipmentInfoService;
+import com.skua.modules.equipment.vo.EquipmentInfoForMonitorVO;
 import com.skua.modules.equipment.vo.EquipmentNewMaintenancePlanVO;
 import com.skua.modules.erp.entity.ErpProblem;
 import com.skua.modules.statistics.entity.EquipmentInfoDuration;
@@ -18,6 +19,8 @@ import com.skua.modules.statistics.service.IEquipmentStatisticsService;
 import com.skua.modules.statistics.vo.EquipmentOperationRecordVO;
 import com.skua.modules.statistics.vo.EquipmentRepairMaintainTaskCostDetailVO;
 import com.skua.modules.statistics.vo.EquipmentRepairMaintainTaskCostVO;
+import com.skua.modules.system.service.ISysDepartService;
+import com.skua.modules.system.service.impl.SysDepartServiceImpl;
 import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +51,8 @@ public class EquipmentStatisticsController {
     private IEquipmentInfoService  equipmentInfoService;
     @Autowired
     private IEquipmentInfoDurationService equipmentInfoDurationService;
+    @Autowired
+    private ISysDepartService departService;
     //
     @ApiOperation(value = "设备看板-维修维护费用列表", notes = "设备看板-维修维护费用列表")
     @GetMapping(value = "/repairMaintainTaskCostList")
@@ -92,6 +97,13 @@ public class EquipmentStatisticsController {
             if(StringUtils.isNotEmpty(equipmentFailurelVO.getEndTime())){
                 equipmentFailurelVO.setEndTime( equipmentFailurelVO.getEndTime()+" 23:59:59");
             }*/
+           String departIds = BaseContextHandler.getDeparts();
+           if(StringUtils.isNotEmpty(equipmentFailurelVO.getDepartId())){
+
+               departIds = departService.getChildDepartId(equipmentFailurelVO.getDepartId());
+               equipmentFailurelVO.setDepartId(null);//排查departid的查询
+           }
+            equipmentFailurelVO.setDepartIds(JSUtils.quoteEach(departIds,","));
             IPage<EquipmentFailurelVO> dataList = equipmentStatisticsService.queryEquipmentFailurePage(page,equipmentFailurelVO);
             result.setSuccess(true);
             result.setResult(dataList);
@@ -134,25 +146,51 @@ public class EquipmentStatisticsController {
     @AutoLog(value = "A类设备运行情况-健康度")
     @ApiOperation(value = "A类设备运行情况-健康度", notes = "A类设备运行情况-健康度")
     @GetMapping(value = "/queryEquipmentInfoByPage")
-    public Result<IPage<EquipmentInfo>> queryEquipmentInfoByPage(EquipmentInfo equipmentInfo,	  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+    public Result<IPage<EquipmentInfoForMonitorVO>> monitorIndexEquipmentPage(EquipmentInfoForMonitorVO equipmentInfoForMonitorVO,
+                                                                              @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                              @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                              HttpServletRequest req) throws Exception {
+
+        Result<IPage<EquipmentInfoForMonitorVO>> result = new Result<IPage<EquipmentInfoForMonitorVO>>();
+        Page<EquipmentInfoForMonitorVO> pageList = new Page<EquipmentInfoForMonitorVO>(pageNo,pageSize);
+
+        String departIds = null;
+        if( StringUtils.isNotEmpty( equipmentInfoForMonitorVO.getDepartId() ) ){
+            departIds = departService.getChildDepartId(equipmentInfoForMonitorVO.getDepartId());
+            equipmentInfoForMonitorVO.setDepartId(null);
+        }else{
+            departIds = BaseContextHandler.getDeparts();
+        }
+        equipmentInfoForMonitorVO.setDepartIds(JSUtils.quoteEach(departIds,","));
+        pageList = equipmentInfoService.queryCustomPageList(pageList,equipmentInfoForMonitorVO);//自定义查询
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+   /* public Result<IPage<EquipmentInfo>> queryEquipmentInfoByPage(EquipmentInfo equipmentInfo,	  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize ,HttpServletRequest req ) throws Exception {
         Result<IPage<EquipmentInfo>> result = new Result<IPage<EquipmentInfo>>();
-        QueryWrapper<EquipmentInfo> queryWrapper = QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
+        String departId  = equipmentInfo.getDepartId();
+        equipmentInfo.setDepartId(null);
+        QueryWrapper<EquipmentInfo> queryWrapper = new QueryWrapper();// QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
         // queryWrapper.eq("depart_id", BaseContextHandler.getRealDepartId());
-      /*  if(equipmentInfo.getDepartId()==null){
+      *//*  if(equipmentInfo.getDepartId()==null){
             equipmentInfo.setDepartId(BaseContextHandler.getDeparts());
-        }*/
-       /* if(model==1){
+        }*//*
+       *//* if(model==1){
             queryWrapper.isNotNull("digital_twins_struct_code");
             queryWrapper.last(" and digital_twins_struct_code != ''");
-        }*/
+        }*//*
+       if(StringUtils.isNotEmpty(departId)){
+           queryWrapper.in("depart_id",JSUtils.quoteEach( departService.getChildDepartId(departId) ,","));
+       }
         Page<EquipmentInfo> page = new Page<EquipmentInfo>(pageNo, pageSize);
         //  queryWrapper.orderByDesc("create_time");
         IPage<EquipmentInfo> pageList = equipmentInfoService.page(page,queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
-    }
+    }*/
 
 
     @AutoLog(value = "A类设备运行情况-运行时长")
@@ -161,18 +199,15 @@ public class EquipmentStatisticsController {
     public Result<IPage<EquipmentInfoDuration>> queryEquipmentInfoDurationByPage(EquipmentInfoDuration equipmentInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize , HttpServletRequest req ) throws Exception {
         Result<IPage<EquipmentInfoDuration>> result = new Result<IPage<EquipmentInfoDuration>>();
-        QueryWrapper<EquipmentInfoDuration> queryWrapper = QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
-        // queryWrapper.eq("depart_id", BaseContextHandler.getRealDepartId());
-      /*  if(equipmentInfo.getDepartId()==null){
-            equipmentInfo.setDepartId(BaseContextHandler.getDeparts());
-        }*/
-       /* if(model==1){
-            queryWrapper.isNotNull("digital_twins_struct_code");
-            queryWrapper.last(" and digital_twins_struct_code != ''");
-        }*/
+        QueryWrapper<EquipmentInfoDuration> queryWrapper =  new QueryWrapper();//QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
+        String departIds = BaseContextHandler.getDeparts();
+        if( StringUtils.isNotEmpty(equipmentInfo.getDepartId())){
+            departIds = departService.getChildDepartId(equipmentInfo.getDepartId());
+        }
+        equipmentInfo.setDepartIds(departIds);
         Page<EquipmentInfoDuration> page = new Page<EquipmentInfoDuration>(pageNo, pageSize);
         //  queryWrapper.orderByDesc("create_time");
-        IPage<EquipmentInfoDuration> pageList = equipmentInfoDurationService.queryPageList(page,queryWrapper);
+        IPage<EquipmentInfoDuration> pageList = equipmentInfoDurationService.queryPageList(page,equipmentInfo);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

@@ -60,4 +60,16 @@ public class EquipmentInfoDuration {
 	@TableField(exist=false)
 	@ApiModelProperty(value = "设备运行比例")
 	private String sbyxRate;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "厂站集合")
+	private String departIds;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "开始时间")
+	private String startTime;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "结束时间")
+	private String endTime;
 }

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.ajh.vo.AjhPlanScheduleDataVO;
+import com.skua.tool.annotation.Anonymous;
 import org.apache.ibatis.annotations.Param;
 import com.skua.modules.statistics.entity.EquipmentInfoDuration;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,8 +18,6 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface EquipmentInfoDurationMapper extends BaseMapper<EquipmentInfoDuration> {
 
-
-    @Select("select eid.*,ei.equipment_type,ei.equipment_name from equipment_info_duration eid " +
-            " left join equipment_info ei on ei.id = eid.info_id  ${ew.customSqlSegment}")
-    IPage<EquipmentInfoDuration> queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+    @Anonymous
+    IPage<EquipmentInfoDuration> queryPageList(Page page, @Param("param") EquipmentInfoDuration equipmentInfoDuration);
 }

@@ -18,5 +18,5 @@ public interface EquipmentStatisticsMapper {
      * @return
      */
     @Anonymous
-    IPage<EquipmentFailurelVO> queryEquipmentFailurePage(Page<EquipmentFailurelVO> page, @Param("param") EquipmentFailurelVO equipmentFailurelVO, @Param("startTime") String startTime);
+    IPage<EquipmentFailurelVO> queryEquipmentFailurePage(Page<EquipmentFailurelVO> page, @Param("param") EquipmentFailurelVO equipmentFailurelVO);
 }

@@ -2,4 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.skua.modules.statistics.mapper.EquipmentInfoDurationMapper">
 
-</mapper>
\ No newline at end of file
+    <select id="queryPageList" resultType="com.skua.modules.statistics.entity.EquipmentInfoDuration">
+        select eid.*,ei.equipment_type,ei.equipment_name from equipment_info_duration eid
+        left join equipment_info ei on ei.id = eid.info_id
+        where 1 =1
+        <if test="param.departIds !=null and param.departIds !=''">
+            and eid.depart_id in(${param.departIds})
+        </if>
+        <if test="param.startTime !=null and param.startTime !=''">
+            AND eid.data_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime !=null and param.endTime !=''">
+            AND eid.data_time &lt;= #{param.endTime}
+        </if>
+
+    </select>
+
+</mapper>

@@ -9,11 +9,11 @@
         left join (
         select t.equipment_id ,  count(t.id) 'count'  from alarm_record_history  t
         where t.alarm_rule_type = 'B001B001'
-        <if test="startTime != null and startTime !=''">
-            and t.record_time  &gt;= #{startTime}
+        <if test="param.startTime != null and param.startTime !=''">
+            and DATE_FORMAT(t.record_time,'%Y-%m-%d')  &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null and param.endTime !=''">
-            and t.record_time &lt;= #{param.endTime}
+            and DATE_FORMAT(t.record_time,'%Y-%m-%d') &lt;= #{param.endTime}
         </if>
         <if test="param.createCmpy != null and param.createCmpy !=''">
             and t.create_cmpy = #{param.createCmpy}
@@ -21,16 +21,19 @@
         <if test="param.departId != null and param.departId !=''">
             and t.depart_id  =  #{param.departId}
         </if>
+        <if test="param.departIds != null and param.departIds !=''">
+            and t.depart_id  in(${param.departIds})
+        </if>
           group by t.equipment_id
         )aaa on aaa.equipment_id = ei.id
 
         left join (select  info_id,count(1) 'count'  from equipment_repair
         <where>
-        <if test="startTime != null and startTime !=''">
-            and repair_date  &gt;= #{startTime}
+        <if test="param.startTime != null and param.startTime !=''">
+            and DATE_FORMAT(repair_date,'%Y-%m-%d')  &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null and param.endTime !=''">
-            and repair_date &lt;= #{param.endTime}
+            and DATE_FORMAT(repair_date,'%Y-%m-%d') &lt;= #{param.endTime}
         </if>
             <if test="param.createCmpy != null and param.createCmpy !=''">
                 and create_cmpy = #{param.createCmpy}
@@ -38,8 +41,16 @@
             <if test="param.departId != null and param.departId !=''">
                 and depart_id  =  #{param.departId}
             </if>
+            <if test="param.departIds != null and param.departIds !=''">
+                and depart_id  in(${param.departIds})
+            </if>
         </where>
         group by info_id ) bbb  on bbb.info_id  = ei.id
+
+        where 1=1
+        <if test="param.departIds != null and param.departIds !=''">
+            AND ei.depart_id IN (${param.departIds})
+        </if>
         order by bbb.count desc
     </select>
 

@@ -13,8 +13,8 @@ public interface IEquipmentInfoDurationService extends IService<EquipmentInfoDur
     /***
      *  分页列表
      * @param page
-     * @param queryWrapper
+     * @param
      * @return
      */
-    IPage<EquipmentInfoDuration> queryPageList(Page page, QueryWrapper queryWrapper);
+    IPage<EquipmentInfoDuration> queryPageList(Page page, EquipmentInfoDuration equipmentInfo);
 }

@@ -19,10 +19,10 @@ public class EquipmentInfoDurationServiceImpl extends ServiceImpl<EquipmentInfoD
     /***
      *  分页列表
      * @param page
-     * @param queryWrapper
+     * @param equipmentInfoDuration
      * @return
      */
-    public IPage<EquipmentInfoDuration> queryPageList(Page page, QueryWrapper queryWrapper){
-        return this.baseMapper.queryPageList(page,queryWrapper);
+    public IPage<EquipmentInfoDuration> queryPageList(Page page, EquipmentInfoDuration equipmentInfoDuration){
+        return this.baseMapper.queryPageList(page,equipmentInfoDuration);
     }
 }

@@ -98,7 +98,7 @@ public class EquipmentStatisticsServiceImpl  implements IEquipmentStatisticsServ
      * @return
      */
     public IPage<EquipmentFailurelVO> queryEquipmentFailurePage(Page<EquipmentFailurelVO> page,EquipmentFailurelVO equipmentFailurelVO){
-        return   equipmentStatisticsMapper.queryEquipmentFailurePage(page,equipmentFailurelVO,equipmentFailurelVO.getStartTime());
+        return   equipmentStatisticsMapper.queryEquipmentFailurePage(page,equipmentFailurelVO);
     }
     /**
      * A类设备 故障情况列表

@@ -22,6 +22,9 @@ public class EquipmentFailurelVO {
     @ApiModelProperty(value = "机构ID")
     private String departId;
 
+    @ApiModelProperty(value = "机构ID集合")
+    private String departIds;
+
     @ApiModelProperty(value = "机构名称")
     private String departName;
 

@@ -81,18 +81,16 @@ public class EquipmentInfoMonthReportController {
     @GetMapping(value = "/maintainRepairReport")
     public Result<List<EquipmentMaintainRepairReportVO>> maintainRepairReport(String departId,String startDate,String endDate ) throws Exception {
         Result<List<EquipmentMaintainRepairReportVO>> result = new Result<>();
-        String departIds = BaseContextHandler.getDeparts();
+       /* String departIds = BaseContextHandler.getDeparts();
         if(StringUtils.isNotEmpty(departId)){
             departIds = departService.getChildDepartId(departId);
         }
         List<EquipmentMaintainRepairReportVO>  dataList = new ArrayList<>();
-        EquipmentMaintainRepairReportVO  maintainRepairReportVO  = null;
+
         String[] departIdList = departIds.split(",");
         SysDepart depart = null;
-        EquipmentMaintainTaskForm  taskForm = new EquipmentMaintainTaskForm();
-        EquipmentRepairForm equipmentRepairForm = new EquipmentRepairForm();
-        List<EquipmentMaintainTaskForm>  taskFormList = null;
-        List<EquipmentRepairForm> repairFormList = null;
+
+
 
         for( String departIdTemp : departIdList){
             depart =  departService.getById(departIdTemp);
@@ -112,6 +110,47 @@ public class EquipmentInfoMonthReportController {
             dataList.add(maintainRepairReportVO );
         }
 
+        */
+        Map<String,EquipmentMaintainRepairReportVO> dataMap = new HashMap<>();
+        EquipmentMaintainTaskForm  taskForm = new EquipmentMaintainTaskForm();
+        EquipmentRepairForm equipmentRepairForm = new EquipmentRepairForm();
+        EquipmentMaintainRepairReportVO  maintainRepairReportVO  = null;
+
+        taskForm.setStartTime(startDate);
+        taskForm.setEndTime(endDate);
+        taskForm.setDepartIds(JSUtils.quoteEach(BaseContextHandler.getDeparts(),","));
+        List<EquipmentMaintainTaskForm>   taskFormList = equipmentMaintainTaskService.queryMaintainTaskFormByList(taskForm);
+
+        if(taskFormList != null && !taskFormList.isEmpty()){
+            for(EquipmentMaintainTaskForm   maintainTaskForm:  taskFormList){
+                maintainRepairReportVO = dataMap.get(maintainTaskForm.getDepartId());
+                if(maintainRepairReportVO == null){
+                    maintainRepairReportVO = new EquipmentMaintainRepairReportVO();
+                    maintainRepairReportVO.setDepartId(maintainTaskForm.getDepartId());
+                    maintainRepairReportVO.setDepartName(maintainTaskForm.getDepartName());
+                    dataMap.put(maintainTaskForm.getDepartId(),maintainRepairReportVO);
+                }
+                maintainRepairReportVO.setMaintainTaskFormList(taskFormList);
+            }
+        }
+        equipmentRepairForm.setRepairDate_begin(startDate);
+        equipmentRepairForm.setRepairDate_end(endDate);
+        equipmentRepairForm.setDepartIds(JSUtils.quoteEach(BaseContextHandler.getDeparts(),","));
+        List<EquipmentRepairForm>   repairFormList =  equipmentRepairService.queryRepairFormList(equipmentRepairForm);
+        if(taskFormList != null && !repairFormList.isEmpty()){
+            for(EquipmentRepairForm   repairForm:  repairFormList){
+                maintainRepairReportVO = dataMap.get(repairForm.getDepartId());
+                if(maintainRepairReportVO == null){
+                    maintainRepairReportVO = new EquipmentMaintainRepairReportVO();
+                    maintainRepairReportVO.setDepartId(repairForm.getDepartId());
+                    maintainRepairReportVO.setDepartName(repairForm.getDepartName());
+                    dataMap.put(repairForm.getDepartId(),maintainRepairReportVO);
+                }
+                maintainRepairReportVO.setEquipmentRepairFormList(repairFormList);
+            }
+        }
+        List<EquipmentMaintainRepairReportVO>   dataList = new ArrayList<>(dataMap.values());
+
         result.setSuccess(true);
         result.setResult(dataList);
         return result;

@@ -8,6 +8,7 @@ import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
 import com.skua.modules.equipment.service.IEquipmentRepairService;
 import com.skua.modules.equipment.vo.EquipmentMaintainTaskForm;
 import com.skua.modules.equipment.vo.EquipmentRepairForm;
+import com.skua.modules.system.service.ISysDepartService;
 import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,9 @@ public class EquipmentRepairReportController {
     @Autowired
     private IEquipmentMaintainTaskService  maintainTaskService;
 
+    @Autowired
+    private ISysDepartService departService;
+
     @AutoLog(value = "维修维护报表-维修工单列表")
     @ApiOperation(value = "维修维护报表-维修工单列表", notes = "维修维护报表-维修工单列表")
     @GetMapping(value = "/repairList")
@@ -48,6 +52,10 @@ public class EquipmentRepairReportController {
         if(StringUtils.isNotEmpty(equipmentRepairForm.getFinishFlag())){
             equipmentRepairForm.setFinishFlag(JSUtils.quoteEach(equipmentRepairForm.getFinishFlag(),","));
         }
+        if(StringUtils.isNotEmpty(equipmentRepairForm.getDepartId())){
+            equipmentRepairForm.setDepartIds(JSUtils.quoteEach(departService.getChildDepartId(equipmentRepairForm.getDepartId()),",")  );
+        }
+
         IPage<EquipmentRepairForm> pageList = equipmentRepairService.queryRepairFormByPage(page, equipmentRepairForm);
         result.setSuccess(true);
         result.setResult(pageList);
@@ -64,6 +72,9 @@ public class EquipmentRepairReportController {
         Result<IPage<EquipmentMaintainTaskForm>> result = new Result<IPage<EquipmentMaintainTaskForm>>();
         Page<EquipmentMaintainTaskForm> page = new Page<EquipmentMaintainTaskForm>(pageNo, pageSize);
 
+        if(StringUtils.isNotEmpty(maintainTaskForm.getDepartId())){
+            maintainTaskForm.setDepartIds(JSUtils.quoteEach(departService.getChildDepartId(maintainTaskForm.getDepartId()),",")  );
+        }
         IPage<EquipmentMaintainTaskForm> pageList = maintainTaskService.queryMaintainTaskFormByPage(page, maintainTaskForm);
         result.setSuccess(true);
         result.setResult(pageList);

@@ -15,6 +15,9 @@
 		<if test="equipmentInfoForMonitorVO.departId!=null and equipmentInfoForMonitorVO.departId!=''">
 			and a.depart_id =#{equipmentInfoForMonitorVO.departId}
 		</if>
+		<if test="equipmentInfoForMonitorVO.departIds!=null and equipmentInfoForMonitorVO.departIds!=''">
+			and a.depart_id  in (${equipmentInfoForMonitorVO.departIds})
+		</if>
 		<if test="equipmentInfoForMonitorVO.structures!=null and equipmentInfoForMonitorVO.structures!=''">
 			and a.structures =#{equipmentInfoForMonitorVO.structures}
 		</if>

@@ -217,9 +217,6 @@
         left join equipment_category ec on ei.equipment_type = ec.id
         )aaa
         <where>
-            <if test=" param.departId != null and param.departId !=''">
-                and aaa.depart_id  =  #{param.departId}
-            </if>
             <if test=" param.departIds != null and param.departIds !=''">
                 and aaa.depart_id  in(${param.departIds})
             </if>
@@ -255,9 +252,6 @@
         left join equipment_category ec on ei.equipment_type = ec.id
         )aaa
         <where>
-            <if test="departId != null and departId !=''">
-                and aaa.depart_id  =  #{departId}
-            </if>
             <if test="departIds != null and departIds !=''">
                 and aaa.depart_id  in(${departIds})
             </if>
@@ -267,11 +261,11 @@
             <if test="maintenanceType != null and maintenanceType !=''">
                 and aaa.maintenance_type = #{maintenanceType}
             </if>
-            <if test=" param.startTime != null and param.startTime !=''">
-                and  DATE_FORMAT(aaa.start_time,'%Y-%m-%d') &gt;= #{param.startTime}
+            <if test=" startTime != null and startTime !=''">
+                and  DATE_FORMAT(aaa.start_time,'%Y-%m-%d') &gt;= #{startTime}
             </if>
-            <if test=" param.endTime != null and param.endTime !=''">
-                and  DATE_FORMAT(aaa.end_time,'%Y-%m-%d') &lt;= #{param.endTime}
+            <if test=" endTime != null and endTime !=''">
+                and  DATE_FORMAT(aaa.end_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
         </where>
 

@@ -133,9 +133,9 @@
 		left join sys_dict_item di  on di.item_value = er.maintenance_type
 		)aaa
 		<where>
-			<if test="param.departId != null and param.departId !=''">
+			<!--<if test="param.departId != null and param.departId !=''">
 				and aaa.depart_id  =  #{param.departId}
-			</if>
+			</if>-->
 			<if test="param.departIds != null and param.departIds !=''">
 				and aaa.depart_id  in(${param.departIds})
 			</if>

@@ -19,4 +19,11 @@ public class EquipmentInfoForMonitorVO extends EquipmentInfo {
 	private String departName;
 	@ApiModelProperty(value = "构筑物名称")
 	private String structName;
+
+	@ApiModelProperty(value = "开始时间")
+	private String startTime;
+	@ApiModelProperty(value = "结束时间")
+	private String endTime;
+	@ApiModelProperty(value = "部门集合")
+	private String departIds;
 }

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,11 +25,11 @@ public class EquipmentMaintainRepairReportVO {
     private java.lang.String departName;
 
     @ApiModelProperty(value = "月度计划性维修维护内容")
-    private List<EquipmentMaintainTaskForm>  maintainTaskFormList; //月度计划性维修维护内容
+    private List<EquipmentMaintainTaskForm>  maintainTaskFormList = new ArrayList<>(); //月度计划性维修维护内容
 
 
     @ApiModelProperty(value = "设备报修维修工单")
-    private List<EquipmentRepairForm>  equipmentRepairFormList; //设备报修维修工单
+    private List<EquipmentRepairForm>  equipmentRepairFormList = new ArrayList<>(); //设备报修维修工单
 
 
 }

@@ -985,7 +985,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
         Map<String,Object> map = new HashMap<>();
         String departIds = BaseContextHandler.getDeparts();
         //查询时间内已巡检任务信息
-        String sql = " select ei.depart_id  ,d.depart_name,d.parent_id , p.depart_name 'parent_name' ,ei.equipment_name,ec.des 'equipType'   from (";
+        String sql = " select ei.depart_id  ,d.depart_name,d.parent_id , p.depart_name 'parent_name' ,ei.equipment_name as  'equipName',ec.des 'equipType'   from (";
         sql += getCheckedInspectionEquipIds(departIds ,startDate,  endDate,"0");
         sql += " )  ddd ";
         sql += " left join equipment_info ei on ddd.equip_info_id = ei.id  ";
@@ -996,7 +996,7 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
         if(falutList == null ) falutList =   new ArrayList<>();
 
         //未检测设备
-        sql = " select ei.depart_id  ,d.depart_name,d.parent_id , p.depart_name 'parent_name' ,ei.equipment_name,ec.des 'equipType'   from (";
+        sql = " select ei.depart_id  ,d.depart_name,d.parent_id , p.depart_name 'parent_name' ,ei.equipment_name as 'equipName',ec.des 'equipType'   from (";
         sql += " select aaaaa.equip_info_id  from ( " +getInspectionEquipIdsSql(departIds,startDate,endDate)+" ) aaaaa";
         sql += " left join (" +getCheckedInspectionEquipIds(departIds,startDate,endDate,null) +")bbbbb on bbbbb.equip_info_id  = aaaaa.equip_info_id where bbbbb.equip_info_id is null ";
         sql += " )  ddd ";