Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 2cebdc7d 7f1b45f6
Showing 12 changed files with 166 additions and 76 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/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/resources/static/pages/forms/mould/waybill_qingpu.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail2.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
@@ -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());
@@ -502,6 +507,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				map = new HashMap<String, Object>();
 				try {
+					scheduleRealInfo.setjName(scheduleRealInfo.getjGh()+scheduleRealInfo.getjName());
+					scheduleRealInfo.setsName(scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
 					map = rru.getMapValue(scheduleRealInfo);
 					String zdsj = scheduleRealInfo.getZdsj();
 					String zdsjActual = scheduleRealInfo.getZdsjActual();
@@ -2433,6 +2440,25 @@ 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.setjName(scheduleRealInfo.getjGh()+scheduleRealInfo.getjName());
+							scheduleRealInfo.setsName(scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
+							scheduleRealInfo.setSjlc(format.format(sjlc));
 							map = rru.getMapValue(scheduleRealInfo);
 							String zdsj = scheduleRealInfo.getZdsj();
 							String zdsjActual = scheduleRealInfo.getZdsjActual();
@@ -2457,8 +2483,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 +2667,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 +2701,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());
@@ -280,7 +280,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                             FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
                             if (StringUtils.isNotEmpty(fzdname))
-                                headarrays[c + 1] = fzdname;
+                                headarrays[c] = fzdname;
                             fcInfos.add(fcInfo);
@@ -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>
@@ -307,8 +307,8 @@
 	{{each list as obj i}}
 		<tr>
 			<td>{{i+1}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{obj.sGh}}{{obj.sName}}</td>
 			<td>&nbsp;</td>
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</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>
@@ -298,8 +298,8 @@
 		<tr>
 			<td>{{i+1}}</td>
 			<td>{{obj.lpName}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{obj.sGh}}{{obj.sName}}</td>
 			<td>&nbsp;</td>
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</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>
@@ -229,9 +229,12 @@
                             <input type="text" class="form-control" name="fcsj"
                                    ng-model="ctrl.TimeTableDetailForSave.fcsj"
                                    ng-pattern="ctrl.time_regex"
-                                    />
+                                   required />
                         </div>
                         <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.required">
+                            发车时间必须填写
+                        </div>
                         <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern">
                             时间格式错误，应该是格式hh:mm，如：06:39
                         </div>
@@ -289,7 +292,7 @@
                                         dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}"
                                         iterobjname="item"
                                         iterobjexp="item.name"
-                                        searchph="请选择营运状态..."
+                                        searchph="请选择班次类型..."
                                         searchexp="this.name"
                                         required
                                     >
@@ -39,106 +39,123 @@
             <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
                 <div class="form-body">
-                    <div class="form-group has-success has-feedback">
+                    <div class="form-group">
                         <label class="col-md-3 control-label">方向：</label>
-                        <div class="col-md-7">
+                        <div class="col-md-5">
                             <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">起点站：</label>
-                        <div class="col-md-7">
-                            <sa-Select3 model="ctrl.TimeTableDetailForSave"
-                                        name="qdz"
-                                        placeholder="请输拼音..."
-                                        dcvalue="{{ctrl.TimeTableDetailForSave.qdz.id}}"
+                        <div class="col-md-5">
+                            <sa-Select5 name="qdz"
+                                        model="ctrl.TimeTableDetailForSave"
+                                        cmaps="{'qdz.id' : 'stationid'}"
                                         dcname="qdz.id"
                                         icname="stationid"
-                                        icnames="stationname"
-                                        datatype="zd"
-                                        dataassociate="true"
-                                        dataparam="{{ {'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"
-                                        mlp="true"
-                                    >
-                            </sa-Select3>
+                                        dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.stationname"
+                                        searchph="请输拼音..."
+                                        searchexp="this.stationname"
+                                        required >
+                            </sa-Select5>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">终点站：</label>
-                        <div class="col-md-7">
-                            <sa-Select3 model="ctrl.TimeTableDetailForSave"
-                                        name="zdz"
-                                        placeholder="请输拼音..."
-                                        dcvalue="{{ctrl.TimeTableDetailForSave.zdz.id}}"
+                        <div class="col-md-5">
+                            <sa-Select5 name="zdz"
+                                        model="ctrl.TimeTableDetailForSave"
+                                        cmaps="{'zdz.id' : 'stationid'}"
                                         dcname="zdz.id"
                                         icname="stationid"
-                                        icnames="stationname"
-                                        datatype="zd"
-                                        dataassociate="true"
-                                        dataparam="{{ {'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"
-                                        mlp="true"
-                                    >
-                            </sa-Select3>
+                                        dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.stationname"
+                                        searchph="请输拼音..."
+                                        searchexp="this.stationname"
+                                        required >
+                            </sa-Select5>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">停车场：</label>
-                        <div class="col-md-7">
-                            <sa-Select3 model="ctrl.TimeTableDetailForSave"
-                                        name="tcc"
-                                        placeholder="请输拼音..."
-                                        dcvalue="{{ctrl.TimeTableDetailForSave.tcc.id}}"
+                        <div class="col-md-5">
+                            <sa-Select5 name="tcc"
+                                        model="ctrl.TimeTableDetailForSave"
+                                        cmaps="{'tcc.id': 'id'}"
                                         dcname="tcc.id"
                                         icname="id"
-                                        icnames="parkName"
-                                        datatype="tcc"
-                                        mlp="true"
-                                    >
-                            </sa-Select3>
+                                        dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.parkName"
+                                        searchph="请输拼音..."
+                                        searchexp="this.parkName"
+                                        required >
+                            </sa-Select5>
                         </div>
                     </div>
-                    <div class="form-group has-success has-feedback">
+                    <div class="form-group">
                         <label class="col-md-3 control-label">发车时间：</label>
-                        <div class="col-md-7">
-                            <input type="text" class="form-control"
+                        <div class="col-md-5">
+                            <input type="text" class="form-control" name="fcsj"
                                    ng-model="ctrl.TimeTableDetailForSave.fcsj"
+                                   ng-pattern="ctrl.time_regex"
                                     />
                         </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern">
+                            时间格式错误，应该是格式hh:mm，如：06:39
+                        </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">计划里程：</label>
-                        <div class="col-md-7">
-                            <input type="text" class="form-control"
+                        <div class="col-md-5">
+                            <input type="text" class="form-control" name="jhlc"
                                    ng-model="ctrl.TimeTableDetailForSave.jhlc"
+                                   ng-pattern="ctrl.float_regex"
                                     />
                         </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.pattern">
+                            输入数字
+                        </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">班次历时：</label>
-                        <div class="col-md-7">
-                            <input type="text" class="form-control"
+                        <div class="col-md-5">
+                            <input type="text" class="form-control" name="bcsj"
                                    ng-model="ctrl.TimeTableDetailForSave.bcsj"
+                                   ng-pattern="ctrl.number_regex"
                                     />
                         </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.pattern">
+                            输入整数
+                        </div>
                     </div>
-                    <div class="form-group has-success has-feedback">
+                    <div class="form-group">
                         <label class="col-md-3 control-label">班次类型：</label>
-                        <div class="col-md-7">
-                            <sa-Select3 model="ctrl.TimeTableDetailForSave"
-                                        name="bcType"
-                                        placeholder="请选择班次类型..."
-                                        dcvalue="{{ctrl.TimeTableDetailForSave.bcType}}"
+                        <div class="col-md-5">
+                            <sa-Select5 name="bcType"
+                                        model="ctrl.TimeTableDetailForSave"
+                                        cmaps="{'bcType': 'code'}"
                                         dcname="bcType"
                                         icname="code"
-                                        icnames="name"
-                                        datatype="ScheduleType"
-                                        >
-                            </sa-Select3>
+                                        dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.name"
+                                        searchph="请选择班次类型..."
+                                        searchexp="this.name"
+                                        required
+                                    >
+                            </sa-Select5>
                         </div>
                     </div>
@@ -283,6 +283,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             if (id) {
                 TTInfoDetail.get({id: id}, function(value) {
                     self.TimeTableDetailForSave = value;
+                    if (!self.TimeTableDetailForSave.qdz) {
+                        self.TimeTableDetailForSave.qdz = {};
+                    }
+                    if (!self.TimeTableDetailForSave.zdz) {
+                        self.TimeTableDetailForSave.zdz = {};
+                    }
+                    if (!self.TimeTableDetailForSave.tcc) {
+                        self.TimeTableDetailForSave.tcc = {};
+                    }
+
                     self.title2 =
                         self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" +
                         "->路牌" + self.TimeTableDetailForSave.lp.lpName +
@@ -299,6 +309,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 //    delete $stateParams.id;
                 //}
+                // TODO:
+
                 if (self.TimeTableDetailForSave.tcc && !self.TimeTableDetailForSave.tcc.id)
                     delete self.TimeTableDetailForSave.tcc;
                 if (self.TimeTableDetailForSave.qdz && !self.TimeTableDetailForSave.qdz.id)
@@ -344,6 +356,13 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             var self = this;
             var TTInfoDetail = service.getQueryClass();
+            // 时间正则表达式（格式hh:mm，如：06:39）
+            self.time_regex = /^(([0-1]\d)|(2[0-4])):[0-5]\d$/;
+            // 整数
+            self.number_regex = /^-?\d+$/;
+            // 小数
+            self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
+
             // 欲保存的busInfo信息，绑定
             self.TimeTableDetailForSave = new TTInfoDetail;
             self.TimeTableDetailForSave.tcc = {};