Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

娄高锋
2 parents fa0f958a 2ea4eec3
Showing 6 changed files with 63 additions and 16 deletions
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -35,11 +35,11 @@ public class Ylxxb {
 	private Date xgrq;
 	private String xgr;
 	private String fromgsdm;
-	private int nylx;
+	private Integer nylx;
 	@Transient
 	private String ldgh;
 	//0为接口数据，1为手工输入
-	private int jylx=0;
+	private Integer jylx=0;
 	@Transient
 	private String gsname;
 	@Transient
@@ -27,4 +27,12 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
+	@Transactional
+	@Modifying
+	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
+			+ "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
+	List<Ylxxb> queryListYlxxb(String clZbh,String date);
+	
+	
+	
 }
@@ -39,12 +39,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="select t.car_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
-			+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+	@Query(value="select t.inside_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
+			+ "  select equipment_code,inside_code  from bsth_c_cars where id in("
 			+ " select cl from bsth_c_s_ccinfo where  xl in ( "
 			+ " select id from bsth_c_line where line_code=?1 ))) t"
 			+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
-			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like %?4% ",nativeQuery=true)
+			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.inside_code like %?4% ",nativeQuery=true)
 	List<Object[]> historyMessage(String line,long d,long t,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
@@ -74,7 +74,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
+	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code like %?3%",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
@@ -15,6 +15,7 @@ import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -25,6 +26,7 @@ import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.realcontrol.SvgAttributeRepository;
@@ -99,6 +101,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     DutyEmployeeService dutyEmployeeService;
+    
+    @Autowired
+    YlxxbRepository ylxxbRepository;
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -2433,6 +2438,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						try {
 							scheduleRealInfo.setBcs(xyz);
 							xyz++;
+							Set<ChildTaskPlan> cs = scheduleRealInfo.getcTasks();
+							Double sjlc=0.0;
+							if(!cs.isEmpty()){
+								Iterator<ChildTaskPlan> it = cs.iterator();
+								while(it.hasNext()){
+									ChildTaskPlan c = it.next();
+										if(!c.isDestroy()){
+											sjlc += c.getMileage()==null?0:c.getMileage();
+										}
+									
+								}
+							}else{
+								if(scheduleRealInfo.getStatus() != -1){
+									sjlc =scheduleRealInfo.getJhlc();
+								}
+							}
+							scheduleRealInfo.setSjlc(format.format(sjlc));
 							map = rru.getMapValue(scheduleRealInfo);
 							String zdsj = scheduleRealInfo.getZdsj();
 							String zdsjActual = scheduleRealInfo.getZdsjActual();
@@ -2457,8 +2479,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			}
 		}
+		
+		List<Ylxxb> listYlxxb=ylxxbRepository.queryListYlxxb( clZbh, date);
+		Double jzl=0.0;
+		for(int t=0;t<listYlxxb.size();t++){
+			Ylxxb y=listYlxxb.get(t);
+			jzl += y.getJzl();
+		}
+		
 		//计算里程和班次数，并放入Map里
 		map = new HashMap<String, Object>();
+		map.put("jzl", jzl);
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
 		map.put("ssgl", format.format(remMileage));
@@ -2632,7 +2663,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				while(it.hasNext()){
 					ChildTaskPlan c = it.next();
 					if(c.getRemarks()!=null && c.getRemarks().length()>0){
-						remarks += c.getRemarks();
+						if(remarks.indexOf(c.getRemarks())==-1){
+							remarks += c.getRemarks();
+						}
 					}
 						if(!c.isDestroy()){
@@ -2664,7 +2697,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				String xlbm=s.getXlBm();
 				String fcrq=s.getScheduleDateStr();
-				
+				List<Ylxxb> listYlxxb=ylxxbRepository.queryListYlxxb( s.getClZbh(), fcrq);
+				Double jzl=0.0;
+				for(int t=0;t<listYlxxb.size();t++){
+					Ylxxb y=listYlxxb.get(t);
+					jzl += y.getJzl();
+				}
+				map.put("jzl", jzl);
 				map.put("xlName", s.getXlName());
 				map.put("clZbh", s.getClZbh());
 				map.put("fcsjActual", s.getFcsjActual());
@@ -158,31 +158,31 @@
 							<td colspan="40">&nbsp;</td>
 						</tr> -->
 						<tr>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
@@ -252,7 +252,7 @@
       </tr>
       <tr>
           <td colspan="2">出场存油 &nbsp;升</td>
-          <td colspan="3">加注油量 &nbsp;升</td>
+          <td colspan="3">加注油量 {{map.jzl}}升</td>
           <td colspan="2">进场存油 &nbsp;升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
           <td colspan="5">本日耗油 &nbsp;升</td>
@@ -350,8 +350,8 @@
 		<td>{{map.ljgl}}</td>
 		<td colspan="2">损失班次</td>
 		<td colspan="1">{{map.ssbc}}</td>
-		<td colspan="3">运送公里</td>
-		<td colspan="2">{{map.ysgl}}</td>
+		<td colspan="3"></td>
+		<td colspan="2"></td>
 	</tr>
 	<tr>