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

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/BatchServiceImpl.java

@@ -226,10 +226,12 @@ public class BatchServiceImpl implements BatchService {
 
         log.info("写入新批次技术员、工单数据,  teamId:{}, day:{}, batchNo:{}", teamId, batchDay, batchNo);
 		String sqlEngineer = "INSERT INTO dispatch_engineer (group_id, team_id,  batch_no, engineer_code, engineer_name,  x, y, max_num, max_minute, max_distance, vehicle_type)\n"
-				+ "SELECT ?, o.team_id,?,o.engineer_code, a.name , b.x, b.y , max_num, max_minute, max_distance, b.vehicle  FROM `org_team_engineer` o,engineer_info a,engineer_business b \n"
+				+ "SELECT ?, o.team_id,?,o.engineer_code, a.name , b.x, b.y , max_num, max_minute, max_distance, b.vehicle  FROM `org_team_engineer` o\n"
+                + " join engineer_info a on o.engineer_code=a.engineer_code\n"
+                + " left join engineer_business b on a.engineer_code = b.engineer_code\n"
 				+ " WHERE o.team_id=? AND o.`status`=1\n"
-				+ " AND o.engineer_code=a.engineer_code AND a.engineer_code = b.engineer_code \n"
-				+ " AND  b.x IS NOT NULL AND b.x !=''" + " order by a.engineer_code asc";
+				//+ " AND  b.x IS NOT NULL AND b.x !=''"
+                + " order by a.engineer_code asc";
 		int engCount = jdbcTemplate.update(sqlEngineer, groupId, batchNo, teamId);
 
         // 未派过的工单(已派过PRE状态还可以再次派)