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

潘钊
2 parents 4295837d 95ca65ab
Showing 3 changed files with 32 additions and 29 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
 package com.bsth.service.report.impl;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.dbunit.dataset.DataSetException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.scheduling.commonj.ScheduledTimerListener;
-import org.springframework.stereotype.Service;
-
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
-import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -46,6 +17,22 @@ import com.bsth.util.Arith;
 import com.bsth.util.ComparableJob;
 import com.bsth.util.ReportUtils;
 import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class ReportServiceImpl implements ReportService{
@@ -195,6 +195,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                          * 验证内部数据，更新外部model
                          */
                         scope[ctrlAs].$$internal_validate_model = function() {
+                            // TODO：
+                            console.log(scope[ctrlAs].$$internal_select_value);
+                            console.log(scope[ctrlAs].$$data_real);
+
                             if (scope[ctrlAs].$$internal_select_value) {
                                 var select_value_temp = scope[ctrlAs].$$internal_select_value;
                                 if (scope[ctrlAs].$$data_real && scope[ctrlAs].$$data_real.length > 0) {
@@ -206,6 +210,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                         }
                                     }
                                     if (obj) { // 在data中判定有没有
+                                        // 初始化的时候，模拟选中uiselect
+                                        scope[ctrlAs].$$internal_select_fn(obj);
+
                                         for (var k = 0; k < scope[ctrlAs].$$data.length; k++) {
                                             if (eval("scope[ctrlAs].$$data[k]" + "." + $icname_attr + " == obj." + $icname_attr)) {
                                                 obj = undefined;
@@ -218,6 +225,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                         // 更新内部model，用于外部验证
                                         // 内部model的值暂时随意，以后再改
                                         scope[ctrlAs].$$internalmodel = {desc: "ok"};
+
                                     } else {
                                         scope[ctrlAs].$$internalmodel = undefined;
                                     }
@@ -1500,6 +1500,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                          * 验证内部数据，更新外部model
                          */
                         scope[ctrlAs].$$internal_validate_model = function() {
+                            // TODO：
+                            console.log(scope[ctrlAs].$$internal_select_value);
+                            console.log(scope[ctrlAs].$$data_real);
+
                             if (scope[ctrlAs].$$internal_select_value) {
                                 var select_value_temp = scope[ctrlAs].$$internal_select_value;
                                 if (scope[ctrlAs].$$data_real && scope[ctrlAs].$$data_real.length > 0) {
@@ -1511,6 +1515,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                         }
                                     }
                                     if (obj) { // 在data中判定有没有
+                                        // TODO：
+                                        scope[ctrlAs].$$internal_select_fn(obj);
+
                                         for (var k = 0; k < scope[ctrlAs].$$data.length; k++) {
                                             if (eval("scope[ctrlAs].$$data[k]" + "." + $icname_attr + " == obj." + $icname_attr)) {
                                                 obj = undefined;
@@ -1523,6 +1530,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                         // 更新内部model，用于外部验证
                                         // 内部model的值暂时随意，以后再改
                                         scope[ctrlAs].$$internalmodel = {desc: "ok"};
+
                                     } else {
                                         scope[ctrlAs].$$internalmodel = undefined;
                                     }