地图上展示八项作业相关

src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java

@@ -397,5 +397,38 @@ public interface MapEightMapper {
 	List<PageData> findByHOISTINGAcceptuserId(PageData pd);
 
 	List<PageData> findByHOISTINGAcceptuserIds(PageData pd);
+
+	/**有限空间作业查询
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findByIdCONFINEDSPACEOrder(PageData pd);
+
+	/**有限空间作业措施查询
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAllMeasuresCONFINEDSPACEOrder(PageData pd);
+
+	/**
+	 * 有限空间
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> listAllCONFINEDSPACEOrder(PageData pd);
+
+	/**
+	 * 有限空间
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> findByIdCONFINEDSPACEAcceptuser(PageData pd);
+
+	/**
+	 * 有限空间
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> findByIdCONFINEDSPACEAcceptusers(PageData pd);
 }
 

src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java

@@ -352,7 +352,7 @@ public class MapEightServiceImpl implements MapEightService {
 		}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
 			pd.put("BLINDBOARD_ID",idStr);
 			pd = mapEightMapper.findByIdBLINDBOARDOrder(pd);
-            map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd));
+			map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd));
 			PageData Info =  mapEightMapper.findByIdJWDOrder(pd);
 			pd.put("TYPE",105);//盲板位置图
 			pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID"));
@@ -368,12 +368,12 @@ public class MapEightServiceImpl implements MapEightService {
 			map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd));
 			map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd));
 		}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
-			//没有有限空间作业
+			pd.put("CONFINEDSPACE_ID",idStr);
-			//pd.put("CONFINEDSPACE_ID",idStr);
+			pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd);	//根据ID读取
-			//pd = mapEightMapper.findByIdCONFINEDSPACE(pd);
+			map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd));
-			pd = new PageData();
+			map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd));
-			map.put("measuresList", null);
+			map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd));
-			map.put("gasList", null);
+			map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd));
 		}else if(StringUtils.equals(typeStr,"HOISTING")){
 			pd.put("HOISTING_ID",idStr);
 			pd = mapEightMapper.findByIdHOISTINGOrder(pd);
@@ -398,6 +398,7 @@ public class MapEightServiceImpl implements MapEightService {
 		return map;
 	}
 
+
 	private PageData shenpi(PageData pd,List<PageData> list){
 		List<PageData> specialUserList = new ArrayList<>();
 		for (PageData userPageData : list){

src/main/resources/mybatis/datasource/map/MapEightMapper.xml

@@ -2835,6 +2835,7 @@
 		left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
 		where
 		f.BLINDBOARD_ID = #{BLINDBOARD_ID}
+		GROUP BY f.BLINDBOARD_ID
 	</select>
 
 	<!--盲板作业根据id获取经纬度-->
@@ -3704,4 +3705,203 @@
 		f.HOISTING_ID = #{HOISTING_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}
 		order by f.ACCEPT_CONFESS_USER_SIGNER_TIME asc
 	</select>
+	<select id="findByIdCONFINEDSPACEOrder" parameterType="pd" resultType="pd">
+		select
+			f.CORPINFO_ID,
+			f.ISDELETE,
+			f.CREATTIME,
+			f.CREATOR,
+			f.OPERATTIME,
+			f.OPERATOR,
+			f.CHECK_NO,
+			f.WORK_CONTENT,
+			replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE,
+			replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE,
+			f.CONFIRM_DEPARTMENT_ID,
+			f.CONFIRM_USER_ID,
+			f.CONFIRM_USER_SIGNER_PATH,
+			f.CONFIRM_USER_SIGNER_TIME,
+			f.AUDIT_DEPARTMENT_ID,
+			f.AUDIT_USER_ID,
+			f.AUDIT_USER_SIGNER_PATH,
+			f.AUDIT_USER_SIGNER_TIME,
+			f.APPROVE_DEPARTMENT_ID,
+			f.APPROVE_USER_ID,
+			f.APPROVE_USER_SIGNER_PATH,
+			f.APPROVE_USER_SIGNER_TIME,
+			f.APPLY_STATUS,
+			IFNULL(f.CONFIRM_CONTENT,'无') as CONFIRM_CONTENT,
+			IFNULL(f.AUDIT_CONTENT,'无') as AUDIT_CONTENT,
+			IFNULL(f.APPROVE_CONTENT,'无') as APPROVE_CONTENT,
+			f.OTHER_PROTECTIVE_MEASURES,
+			f.ACCEPT_DEPARTMENT_ID,
+			f.ACCEPT_USER_ID,
+			f.ACCEPT_USER_SIGNER_PATH,
+			f.ACCEPT_USER_SIGNER_TIME,
+			IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT,
+			f.APPLY_DEPARTMENT_ID,
+			f.APPLY_USER_ID,
+			f.BELONG_CORP,
+			f.LIMITSPACE_ID,
+			f.WORK_USER,
+			IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK,
+			f.RISK_IDENTIFICATION,
+			f.MEDIUM_NAME,
+			f.EDUCATE_USER,
+			f.ANALYZE_DEPARTMENT_ID,
+			f.ANALYZE_USER_ID,
+			f.GUARDIAN_DEPARTMENT_ID,
+			f.GUARDIAN_USER_ID,
+			f.GUARDIAN_USER_SIGNER_PATH,
+			f.GUARDIAN_USER_SIGNER_TIME,
+			IFNULL(f.GUARDIAN_CONTENT,'无') as GUARDIAN_CONTENT,
+			f.CONFESS_USER,
+			f.ACCEPT_CONFESS_USER,
+			f.GUARDIAN_USER,
+			f.CONFINEDSPACE_ID,
+			f.CONFESS_DEPARTMENT_ID,
+			f.CONFESS_USER_ID,
+			f.CONFESS_USER_SIGNER_PATH,
+			f.CONFESS_USER_SIGNER_TIME,
+			f.ACCEPT_CONFESS_DEPARTMENT_ID,
+			f.ACCEPT_CONFESS_USER_ID,
+			f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+			f.ACCEPT_CONFESS_USER_SIGNER_TIME,
+			f.WORK_LATITUDE,
+			f.WORK_LONGITUDE,
+			(SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0'
+																				 AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
+			 ORDER BY
+				 a.ANALYZE_TIME DESC LIMIT 1) as ANALYZE_TIME,
+		sp.NAME as LIMITSPACE_NAME,
+
+		ad.NAME as APPLY_DEPARTMENT_NAME,
+		au.NAME as APPLY_USER_NAME,
+
+		cd.NAME as CONFIRM_DEPARTMENT_NAME,
+		cu.NAME as CONFIRM_USER_NAME,
+
+		gd.NAME as GUARDIAN_DEPARTMENT_NAME,
+		gu.NAME as GUARDIAN_USER_NAME,
+
+		aud.NAME as AUDIT_DEPARTMENT_NAME,
+		auu.NAME as AUDIT_USER_NAME,
+
+		apd.NAME as APPROVE_DEPARTMENT_NAME,
+		apu.NAME as APPROVE_USER_NAME,
+
+		acd.NAME as ACCEPT_DEPARTMENT_NAME,
+		acu.NAME as ACCEPT_USER_NAME,
+
+		anad.NAME as ANALYZE_DEPARTMENT_NAME,
+		anau.NAME as ANALYZE_USER_NAME,
+
+		ac.NAME as CONFESS_DEPARTMENT_NAME,
+		accu.NAME as CONFESS_USER_NAME,
+
+		aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
+		aacu.NAME as ACCEPT_CONFESS_USER_NAME
+		from
+			GF_CONFINEDSPACE f
+			left join GF_confinedspacegaswh b on b.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
+			left join GF_LIMITSPACE sp on sp.LIMITSPACE_ID=f.LIMITSPACE_ID
+
+			left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
+			left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
+
+			left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
+			left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
+
+			left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
+			left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID
+
+			left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID
+			left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID
+
+			left join OA_DEPARTMENT gd on gd.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
+			left join SYS_USER gu on gu.USER_ID = f.GUARDIAN_USER_ID
+
+			left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
+			left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
+
+			left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
+			left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
+
+			left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
+			left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
+
+			left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
+			left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
+		where
+			f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
+	</select>
+	<select id="listAllMeasuresCONFINEDSPACEOrder"  parameterType="pd" resultType="pd">
+		select
+			f.*
+			 ,eo.CONFIRM_NAME as CONFIRM_NAME
+			 ,eo.STATUS,eo.ANSWER1,eo.ANSWER2,eo.ANSWER3
+		from
+			GF_CONFINEDSPACE_MEASURES f
+				left join GF_CONFINEDSPACETOMEASURES eo on eo.BUS_CONFINEDSPACE_MEASURES_ID = f.BUS_CONFINEDSPACE_MEASURES_ID
+		where f.ISDELETE = '0'
+		  and eo.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
+		ORDER BY f.ORDER
+	</select>
+	<select id="listAllCONFINEDSPACEOrder" parameterType="pd" resultType="pd">
+		select
+			f.CONFINEDSPACE_ID,
+			f.ANALYZE_TIME,
+			f.ANALYZE_PLACE,
+			f.ANALYZE_USER,
+			f.HARMFUL_MATERIALS,
+			f.COMBUSTIBLE_GAS,
+			f.OXYGEN_CONTENT,
+			f.ISDELETE,
+			f.DATA1,
+			f.DATA2,
+			f.DATA3,
+			f.DATA4,
+			f.CONFINEDSPACEGAS_ID
+		from
+			GF_CONFINEDSPACEGAS f
+		where f.ISDELETE = '0' and f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
+		ORDER BY f.ANALYZE_TIME desc
+	</select>
+	<!-- 通过ID获取数据 -->
+	<select id="findByIdCONFINEDSPACEAcceptuser" parameterType="pd" resultType="pd">
+		select
+			f.ACCEPT_CONFESS_ID,
+			f.CONFINEDSPACE_ID,
+			f.CORPINFO_ID,
+			f.ISDELETE,
+			f.OPERATTIME,
+			f.OPERATOR,
+			f.ACCEPT_USER_ID,
+			f.ACCEPT_USER_SIGNER_PATH,
+			f.ACCEPT_USER_SIGNER_TIME,
+			f.ACCEPT_DEPARTMENT_ID
+		from
+			GF_CONFINEDSPACE_ACCEPTUSER f
+		where
+			f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_USER_ID = #{ACCEPT_USER_ID}
+		order by f.ACCEPT_USER_SIGNER_TIME ASC
+	</select>
+	<select id="findByIdCONFINEDSPACEAcceptusers" parameterType="pd" resultType="pd">
+		select
+			f.ACCEPT_CONFESS_ID,
+			f.CONFINEDSPACE_ID,
+			f.CORPINFO_ID,
+			f.ISDELETE,
+			f.OPERATTIME,
+			f.OPERATOR,
+			f.ACCEPT_CONFESS_DEPARTMENT_ID,
+			f.ACCEPT_CONFESS_USER_ID,
+			f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+			f.ACCEPT_CONFESS_USER_SIGNER_TIME
+		from
+			GF_CONFINEDSPACE_ACCEPTUSER f
+		where
+			f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}
+		order by f.ACCEPT_CONFESS_USER_SIGNER_TIME ASC
+	</select>
 </mapper>