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

operation_manager/src/main/java/com/huaxu/common/ConvertXY.java

@@ -118,7 +118,7 @@ public class ConvertXY {
 	 */
 	public static MyPoint ConvertXian80ToXY(String x, String y,String moveXY) {
 		MyPoint pPoint = new MyPoint();
-		double dx = Double.parseDouble(x), dy = Double.parseDouble(y);
+		double dx = Double.parseDouble(x)+196600, dy = Double.parseDouble(y)-270;
 		int moveX=0,moveY=0;
 		if(!StringUtils.isEmpty(moveXY)){
 			moveX=Integer.parseInt(moveXY.split(",")[0]);
@@ -133,8 +133,6 @@ public class ConvertXY {
 		double X84 = Double.parseDouble(String.format("%.6f", Double.parseDouble(dblLon.toString())));
 		double Y84 = Double.parseDouble(String.format("%.6f", Double.parseDouble(dblLat.toString())));
 
-		X84 +=  2.001201;
-		Y84 +=  0.000155;
 		pPoint.X =X84;
 		pPoint.Y =Y84;
 		return pPoint;

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -792,7 +792,7 @@
   </select>
   <!--维修列表-工单情况（未派单，处理中）-->
   <select id="selectMaintainOrder" resultMap="BaseResultMap" >
-    select t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
+    select t1.id ,t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
     case when t1.order_status=0 then '未派单' when t1.order_status =1 or t1.order_status=4 then '处理中' end order_status_name,
     case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
     geo