点状态确认

AmosBankService/src/main/java/com/yeejoin/amos/bank/controller/InspectionController.java

@@ -89,9 +89,9 @@ public class InspectionController extends BaseController{
 	    	java.util.HashMap<String, Object> map1  =new java.util.HashMap<>();
 			
 	    	if(map!=null){
-	    		int  status= Integer.valueOf(map.get("status").toString());
+	    		boolean  status= (boolean) map.get("status");
 	    		String  code= map.get("code").toString();
-	    		if(status==1){
+	    		if(status){
 	    			map1.put("pointtype", true);
 	    		}else{
 	    			map1.put("pointtype",false );
@@ -103,6 +103,26 @@ public class InspectionController extends BaseController{
                 if (code.indexOf(xianyang)!=-1){
                 	map1.put("cstype","xianyang" );
 	    		}
+	    	}else{
+	    		
+	    		java.util.HashMap<String, Object> mapp=inspectionService.getporintdate(pointid);
+	    		
+	    		if(mapp!=null){
+	    			String  code= mapp.get("code").toString();
+	    			 map1.put("pointtype",false );
+	    			if (code.indexOf(xian)!=-1){
+		    			map1.put("cstype","xian" );
+		    		}else if (code.indexOf(xianyang)!=-1){
+	                	map1.put("cstype","xianyang" );
+		    		}
+	    			
+	    			
+	    		}
+	    		
+	    		
+	    		
+	    		
+	    		
 	    	}
 				
 	        return CommonResponseUtil.success(map1);

AmosBankService/src/main/java/com/yeejoin/amos/bank/service/InspectionService.java

@@ -18,4 +18,6 @@ public interface InspectionService {
 	Map<String, Object> queryRightTopChartlist(Integer pageIndex, Integer pageSize, String deptId,String deptName);
 	
 	HashMap<String, Object> getporint(String pointid);
+	HashMap<String, Object> getporintdate(String pointid);
+	
 }

AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/InspectionServiceImpl.java

@@ -213,4 +213,10 @@ public class InspectionServiceImpl implements InspectionService {
 		HashMap<String, Object> listd = statisticsMapper.getporint(pointid);
 		return listd;
 	}
+
+	@Override
+	public HashMap<String, Object> getporintdate(String pointid) {
+		HashMap<String, Object> listd = statisticsMapper.getporintdate(pointid);
+		return listd;
+	}
 }

AmosBankService/src/main/java/com/yeejoin/amos/spc/business/dao/mapper/StatisticsMapper.java

@@ -27,6 +27,7 @@ public interface StatisticsMapper {
     List<Map<String, Object>> listByTaskNo(List<Long> taskNos);
     HashMap<String, Object> getporint(@Param("pointid")String pointid);
 	HashMap<String, Object> queryRightTopChartDataByDepId(@Param("deptId")String deptId);
+	HashMap<String, Object> getporintdate(@Param("pointid")String pointid);
 	
 	List<pointReturn> pointReturnlist(@Param("planTaskId")String planTaskId);
 	List<planTaskReturn> planTaskReturnliat(@Param("offset") Integer offset, @Param("limit") Integer limit,@Param("deptId")String deptId);

AmosBankStart/src/main/resources/db/mapper/dbTemplate_risk_statistics.xml

@@ -318,6 +318,17 @@
 		p_alarm_point.is_alarm  status
 		
 		from p_alarm_point  where p_alarm_point.point_type=3 and p_alarm_point.is_alarm=1  and p_alarm_point.point_id=#{pointid} 	
+   
+    </select>
+    
+    
+       <select id="getporintdate" resultType="java.util.Map">
+           	
+	      SELECT 
+      p_point.org_code code 
+	  from  p_point WHERE p_point.id=#{pointid} 	
+   
     </select>
     
+
 </mapper>
\ No newline at end of file