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

潘钊
2 parents 4e02e208 0dd766f0
Showing 17 changed files with 223 additions and 81 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/oil/CylRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/module.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
@@ -106,6 +106,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			@RequestParam(defaultValue = "DESC") String direction){
  
 		Direction d;
+		map.put("xlbm_like", map.get("xlbm_like").toString().trim());
 //		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
 package com.bsth.repository.oil;
  
  
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.bsth.entity.oil.Cyl;
 import com.bsth.repository.BaseRepository;
  
 @Repository
 public interface CylRepository extends BaseRepository<Cyl, Integer>{
-	
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_cyl ",nativeQuery=true)
+	List<Cyl> obtainCyl();
 }
@@ -39,8 +39,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
  
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 ",nativeQuery=true)
-	List<Ylb> queryListYlb(String rq,String nbbm);
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3",nativeQuery=true)
+	List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
 	/**
 	 * 查询当天总的加注量和总里程
 	 * @param rq
@@ -133,7 +133,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
  
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY realExecDate,fcsj,xlBm,clZbh")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
  
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
@@ -43,7 +43,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "group_concat(distinct info.s_name) spyName, " +
             "group_concat(info.fcno) fcno, " +
             "max(info.update_date) as updateDate, " +
-            "max(user.name) as updateUserName, " +
+            "max(user.user_name) as updateUserName, " +
             "max(info.tt_info_name) as ttInfoName " +
             "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
             "where info.xl = ?1 and " +
@@ -85,6 +85,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 		//前一天所有车辆最后进场班次信息
 		List<Ylb> ylListBe=repository.obtainYlbefore(rq);
+		List<Cyl> clyList=cylRepository.obtainCyl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("",rq);
  
@@ -106,13 +107,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			try {
 				//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
 				if(map.get("seqNumber").toString().equals("1")){
-					for (int y = 0; y < ylListBe.size(); y++) {
-						Ylb ylb=ylListBe.get(y);
-						if(map.get("clZbh").toString().equals(ylb.getNbbm())){
-							t.setCzyl(ylb.getJzyl());
+					for (int y = 0; y < clyList.size(); y++) {
+						Cyl cyl=clyList.get(y);
+						if(map.get("clZbh").toString().equals(cyl.getNbbm())){
+							t.setCzyl(cyl.getCyl());
 							break;
 						}else{
-							t.setCzyl(0.0);
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb=ylListBe.get(i);
+								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
+									t.setCzyl(ylb.getJzyl());
+									break;
+								}else{
+									t.setCzyl(0.0);
+								}
+							}
 						}
 					}
 				}
@@ -171,6 +180,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 		//前一天所有车辆最后进场班次信息
 		List<Ylb> ylListBe=repository.obtainYlbefore(rq);
+		List<Cyl> clyList=cylRepository.obtainCyl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq);
  
@@ -192,13 +202,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			try {
 				//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
 				if(map.get("seqNumber").toString().equals("1")){
-					for (int y = 0; y < ylListBe.size(); y++) {
-						Ylb ylb=ylListBe.get(y);
-						if(map.get("clZbh").toString().equals(ylb.getNbbm())){
-							t.setCzyl(ylb.getJzyl());
+					for (int y = 0; y < clyList.size(); y++) {
+						Cyl cyl=clyList.get(y);
+						if(map.get("clZbh").toString().equals(cyl.getNbbm())){
+							t.setCzyl(cyl.getCyl());
 							break;
 						}else{
-							t.setCzyl(0.0);
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb=ylListBe.get(i);
+								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
+									t.setCzyl(ylb.getJzyl());
+									break;
+								}else{
+									t.setCzyl(0.0);
+								}
+							}
 						}
 					}
 				}
@@ -67,6 +67,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
  
@@ -461,6 +462,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<ScheduleRealInfo> queryUserInfoPx(String line, String date, String state,String type) {
 //    	List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
     	state=state+"";
+    	String lpname=state;
+    	String px=type;
+    	if(state.equals("lpName")){
+    		state =state+"+1";
+    		type="asc";
+    	}
     	String sqlPlan="select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
     			+ " s.lp_Name as lpName,s.j_Name as jName,s.s_Gh as sGh,s.s_Name as sName"
     			+ " from bsth_c_s_sp_info_real s "
@@ -482,7 +489,60 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				 return t;
 			 }
 		});
+    	if(lpname.equals("lpName")){
+    		List<ScheduleRealInfo> listNew=new ArrayList<ScheduleRealInfo>();
+    		Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");  
+    		if(px.equals("desc")){
+    			int zt=0;
+    			for (int l = 0; l < 3; l++) {
+    				for (int i = 0; i < list.size(); i++) {
+       				      ScheduleRealInfo t=list.get(i);
+	       				  if(t.getLpName().indexOf("+")!=-1){
+	       					  if(zt==0){
+	       						listNew.add(t);
+	       					  }
+	       					  
+	       				  }else if(pattern.matcher(t.getLpName()).matches()){
+	       					  if(zt==1){
+	       						listNew.add(t);
+	       					  }
+	       				  }else{
+	       					 if(zt==2){
+	       						listNew.add(t);
+	       					  }
+	       				  }
+    				}
+    				zt++;
+				}
+    		}else{
+    				int zt=0;
+    				for (int l = 0; l < 3; l++) {
+	    				for (int i = 0; i < list.size(); i++) {
+	       				      ScheduleRealInfo t=list.get(i);
+		       				  if(t.getLpName().indexOf("+")!=-1){
+		       					  if(zt==2){
+		       						listNew.add(t);
+		       					  }
+		       					  
+		       				  }else if(pattern.matcher(t.getLpName()).matches()){
+		       					  if(zt==1){
+		       						listNew.add(t);
+		       					  }
+		       				  }else{
+		       					 if(zt==0){
+		       						listNew.add(t);
+		       					  }
+		       				  }
+	    				}
+	    				zt++;
+    				}
+    				
+    		}
+    		return listNew;
+    	}else{
     		return list;
+    	}
+    		
     }
  
     /**
@@ -1226,7 +1286,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 if (childTaskPlans.isEmpty()) {
                     if (scheduleRealInfo.getBcType().equals("in") ||
                             scheduleRealInfo.getBcType().equals("out")) {
-                        jcclc += tempJhlc;
+                    	if(scheduleRealInfo.getStatus() != -1){
+                    		jcclc += tempJhlc;
+                    	}
+                        
                     }
                     //主任务 放空班次属于营运
 //					else if(scheduleRealInfo.getBcType().equals("venting")){
@@ -2997,7 +3060,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					jzl += y.getJzl();
 				}
  
-				List<Ylb> listYlb=ylbRepository.queryListYlb( fcrq,s.getClZbh());
+				List<Ylb> listYlb=ylbRepository.queryListYlb( fcrq,s.getClZbh(),s.getjGh());
 				Double ccyl=0.0;
 				Double jcyl=0.0;
 				Double yh=0.0;
@@ -207,7 +207,7 @@
 			line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"(lpName+1)",type:type},function(result){
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
 				if(type=="desc"){
 					type ="asc";
 				}else{
@@ -82,7 +82,7 @@
                                	 线路:
                             </td>
                             <td colspan="3">
-                                <select class="form-control" name="xlbm_eq" id="xlbm" style="width: 120px;"></select>
+                                <select class="form-control" name="xlbm_like" id="xlbm" style="width: 120px;"></select>
                                 &nbsp;
                             </td>
                             <td >
@@ -231,7 +231,9 @@
                         }
                     }
                 });
+                var i = layer.load(2);
                 $get('/ylb/checkYl', params, function () {
+                	layer.close(i);
                     jsDoQuery(null, true);
                 });
             } else {
@@ -255,7 +257,9 @@
                         }
                     }
                 });
+                var i = layer.load(2);
                 $get('/ylb/outAndIn', params, function () {
+                	layer.close(i);
                     jsDoQuery(null, true);
                 });
             } else {
@@ -273,11 +277,12 @@
                     //获取输入的进场存油
                     var jzyl =  $('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
                    // $("#jzyl" + id).html();
-                   console.log(jzyl);
                     var params = {};
                     params['jzyl'] = jzyl;
                     params['id'] = id;
+                    var i = layer.load(2);
                     $get('/ylb/sort', params, function () {
+                    	layer.close(i);
                         jsDoQuery(null, true);
                     });
  
@@ -302,7 +307,9 @@
                         }
                     }
                 });
+                var i = layer.load(2);
                 $get('/ylb/obtain', params, function () {
+                	layer.close(i);
                     jsDoQuery(params, true);
                 });
             } else {
@@ -530,7 +537,7 @@
         //搜索线路
        	$.get('/basic/lineCode2Name',function(result){
 			var data=[];
-			
+			data.push({id: " ", text: "全部线路"});
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
@@ -55,17 +55,22 @@
                     </div>
                 </div>
  
-                <!-- TODO -->
                 <div class="form-group">
                     <label class="col-md-2 control-label">分公司：</label>
                     <div class="col-md-3">
-                        <select name="brancheCompanyCode" class="form-control">
-                            <option value="">请选择...</option>
-                            <option value="1">分公司1</option>
-                            <option value="2">分公司1</option>
-                            <option value="3">分公司1</option>
-                            <option value="4">分公司1</option>
-                        </select>
+                        <sa-Select5 name="fgs"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'brancheCompanyCode': 'businessCode', 'brancheCompany': 'businessName'}"
+                                    dcname="brancheCompanyCode"
+                                    icname="businessCode"
+                                    dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.businessName"
+                                    searchph="请选择所属分公司..."
+                                    searchexp="this.businessName"
+                                >
+                        </sa-Select5>
+
                     </div>
                 </div>
  
@@ -55,17 +55,22 @@
                     </div>
                 </div>
  
-                <!-- TODO -->
                 <div class="form-group">
                     <label class="col-md-2 control-label">分公司：</label>
                     <div class="col-md-3">
-                        <select name="brancheCompanyCode" class="form-control">
-                            <option value="">请选择...</option>
-                            <option value="1">分公司1</option>
-                            <option value="2">分公司1</option>
-                            <option value="3">分公司1</option>
-                            <option value="4">分公司1</option>
-                        </select>
+                        <sa-Select5 name="fgs"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'brancheCompanyCode': 'businessCode', 'brancheCompany': 'businessName'}"
+                                    dcname="brancheCompanyCode"
+                                    icname="businessCode"
+                                    dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.businessName"
+                                    searchph="请选择所属分公司..."
+                                    searchexp="this.businessName"
+                                >
+                        </sa-Select5>
+
                     </div>
                 </div>
  
@@ -101,6 +101,7 @@
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
                     <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
+                    <a ng-click="ctrl.deleteEmp(info.id)" class="btn btn-danger btn-sm"> 删除 </a>
                 </td>
             </tr>
             </tbody>
@@ -132,48 +132,56 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
  
-angular.module('ScheduleApp').controller('EmployInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) {
-    var self = this;
-
-    // 关闭窗口
-    self.close = function() {
-        $modalInstance.dismiss("cancel");
-    };
-
-    self.clearInputFile = function() {
-        angular.element("input[type='file']").val(null);
-    };
-
-    // 上传文件组件
-    self.uploader = new FileUploader({
-        url: "/ee/uploadAndImportFile",
-        filters: [] // 用于过滤文件，比如只允许导入excel
-    });
-    self.uploader.onAfterAddingFile = function(fileItem)
-    {
-        console.info('onAfterAddingFile', fileItem);
-        console.log(self.uploader.queue.length);
-        if (self.uploader.queue.length > 1)
-            self.uploader.removeFromQueue(0);
-    };
-    self.uploader.onSuccessItem = function(fileItem, response, status, headers)
-    {
-        if (response.status == "SUCCESS") {
-            console.info('onSuccessItem', fileItem, response, status, headers);
-        } else {
-            fileItem.isSuccess = false;
-            fileItem.isCancel = false;
-            fileItem.isError = true;
-
-            alert(response.msg);
-        }
-    };
-    self.uploader.onErrorItem = function(fileItem, response, status, headers)
-    {
-        console.info('onErrorItem', fileItem, response, status, headers);
-    };
+// dataImport.html控制
+angular.module('ScheduleApp').controller(
+    'EmployInfoManageToolsCtrl',
+    [
+        '$modalInstance',
+        'FileUploader',
+        function($modalInstance, FileUploader) {
+            var self = this;
  
-}]);
+            // 关闭窗口
+            self.close = function() {
+                $modalInstance.dismiss("cancel");
+            };
+
+            self.clearInputFile = function() {
+                angular.element("input[type='file']").val(null);
+            };
+
+            // 上传文件组件
+            self.uploader = new FileUploader({
+                url: "/ee/uploadAndImportFile",
+                filters: [] // 用于过滤文件，比如只允许导入excel
+            });
+            self.uploader.onAfterAddingFile = function(fileItem)
+            {
+                console.info('onAfterAddingFile', fileItem);
+                console.log(self.uploader.queue.length);
+                if (self.uploader.queue.length > 1)
+                    self.uploader.removeFromQueue(0);
+            };
+            self.uploader.onSuccessItem = function(fileItem, response, status, headers)
+            {
+                if (response.status == "SUCCESS") {
+                    console.info('onSuccessItem', fileItem, response, status, headers);
+                } else {
+                    fileItem.isSuccess = false;
+                    fileItem.isCancel = false;
+                    fileItem.isError = true;
+
+                    alert(response.msg);
+                }
+            };
+            self.uploader.onErrorItem = function(fileItem, response, status, headers)
+            {
+                console.info('onErrorItem', fileItem, response, status, headers);
+            };
+
+        }
+    ]
+);
  
 // list.html控制器
 angular.module('ScheduleApp').controller(
@@ -208,6 +216,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
  
+            self.deleteEmp = function(id) {
+                Employee.delete({id: id}, function(result) {
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
+                    } else {
+                        self.doPage();
+                    }
+                });
+            };
+
             self.doPage();
  
         }
@@ -89,7 +89,7 @@
                     <span ng-bind="info.ttInfoName"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.name"></span>
+                    <span ng-bind="info.updateBy.userName"></span>
                 </td>
                 <td>
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd'"></span>
@@ -90,7 +90,7 @@
                     <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.name"></span>
+                    <span ng-bind="info.updateBy.userName"></span>
                     /
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
@@ -240,6 +240,21 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
                 update: self.groupInfo
             };
  
+            // 处理工号，去除 -，如：55-33333，去除55-
+            var reg = /^(.*?)\-(.*?)$/;
+            if (self.groupInfo.jsy1Gh) {
+                self.groupInfo.jsy1Gh = self.groupInfo.jsy1Gh.replace(reg, '$2');
+            }
+            if (self.groupInfo.spy1Gh) {
+                self.groupInfo.spy1Gh = self.groupInfo.spy1Gh.replace(reg, '$2');
+            }
+            if (self.groupInfo.jsy2Gh) {
+                self.groupInfo.jsy2Gh = self.groupInfo.jsy2Gh.replace(reg, '$2');
+            }
+            if (self.groupInfo.spy2Gh) {
+                self.groupInfo.spy2Gh = self.groupInfo.spy2Gh.replace(reg, '$2');
+            }
+
             //console.log($scope);
             //console.log(param);
             schedulePlanReportManageService.updateDetail(param).then(
@@ -58,7 +58,7 @@
                     <span ng-bind="info.xl.name"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.name"></span>
+                    <span ng-bind="info.updateBy.userName"></span>
                     /
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>