修改巡查报表列表查询接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/AnalysisReportLogMapper.java

@@ -20,8 +20,8 @@ import com.yeejoin.equipmanage.common.entity.AnalysisReportLog;
  */
 public interface AnalysisReportLogMapper extends BaseMapper<AnalysisReportLog> {
 	
-	IPage<AnalysisReportLogDto> allPage(Page<AnalysisReportLogDto> page, @Param("analysisReportLog")AnalysisReportLogDto analysisReportLog,
-										@Param("rootParentId") Long rootParentId);
+	IPage<AnalysisReportLogDto> allPage(Page<AnalysisReportLogDto> page, @Param("analysisReportLog")AnalysisReportLogDto analysisReportLog
+	);
 	
 	Map<String,Object> getStation(String stationCode);
 	

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

@@ -371,8 +371,8 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		analysisReportLog.setEndDate(endDate);
 		analysisReportLog.setReportType(reportType);
 		analysisReportLog.setStationCode(stationCode);
-		Long rootParentId = Long.valueOf(String.valueOf(analysisReportLogMapper.getRootOrgUsr().get("sequence_nbr")));
-		return analysisReportLogMapper.allPage(page, analysisReportLog, rootParentId);
+		//Long rootParentId = Long.valueOf(String.valueOf(analysisReportLogMapper.getRootOrgUsr().get("sequence_nbr")));
+		return analysisReportLogMapper.allPage(page, analysisReportLog);
 	}
 
 	@Override

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

@@ -250,8 +250,8 @@ public class FireAutoSysManageReportServiceImpl implements IFireAutoSysManageRep
         analysisReportLog.setEndDate(endDate);
         analysisReportLog.setReportType(reportType);
         analysisReportLog.setStationCode(stationCode);
-        Long rootParentId = Long.valueOf(String.valueOf(analysisReportLogMapper.getRootOrgUsr().get("sequence_nbr")));
-        return analysisReportLogMapper.allPage(page, analysisReportLog, rootParentId);
+        //Long rootParentId = Long.valueOf(String.valueOf(analysisReportLogMapper.getRootOrgUsr().get("sequence_nbr")));
+        return analysisReportLogMapper.allPage(page, analysisReportLog);
     }
 
     @Override

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -16,7 +16,7 @@
 		FROM
 			wl_analysis_report_log,cb_org_usr
 		<where>
-			 cb_org_usr.biz_org_type = 'COMPANY' AND cb_org_usr.is_delete = 0 AND cb_org_usr.parent_id = #{rootParentId}
+			 cb_org_usr.biz_org_type = 'COMPANY' AND cb_org_usr.is_delete = 0  AND LENGTH(cb_org_usr.biz_org_code)>12
 			 <if test="analysisReportLog.reportType != null">
 			 AND wl_analysis_report_log.report_type = #{analysisReportLog.reportType}
 			 </if>
@@ -27,7 +27,7 @@
 			 AND DATE_FORMAT(wl_analysis_report_log.end_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{analysisReportLog.endDate}, '%Y-%m-%d')   
 			 </if>
 			 <if test="analysisReportLog.stationCode != null">
-			 AND cb_org_usr.biz_org_code = #{analysisReportLog.stationCode} 
+			 AND cb_org_usr.biz_org_code like concat(#{analysisReportLog.stationCode},'%')
 			 </if>
 		</where>
 		ORDER BY