潘钊 / bsth_control · Commits

Commit 9927000bf2469e38ce0b53251b355101da7cbdf9

Authored by 徐烜
1 parent 26ba4515

Update

Inline Side-by-side
Showing 3 changed files with 32 additions and 29 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @9927000
1 1 package com.bsth.service.report.impl;
2   -import java.sql.Connection;
3   -import java.sql.PreparedStatement;
4   -import java.sql.ResultSet;
5   -import java.sql.SQLException;
6   -import java.text.DecimalFormat;
7   -import java.text.ParseException;
8   -import java.text.SimpleDateFormat;
9   -import java.util.ArrayList;
10   -import java.util.Calendar;
11   -import java.util.Collections;
12   -import java.util.Date;
13   -import java.util.HashMap;
14   -import java.util.Iterator;
15   -import java.util.List;
16   -import java.util.Map;
17   -import java.util.Set;
18   -
19   -import org.apache.commons.lang.StringUtils;
20   -import org.dbunit.dataset.DataSetException;
21   -import org.slf4j.Logger;
22   -import org.slf4j.LoggerFactory;
23   -import org.springframework.beans.factory.annotation.Autowired;
24   -import org.springframework.jdbc.core.JdbcTemplate;
25   -import org.springframework.jdbc.core.RowMapper;
26   -import org.springframework.scheduling.commonj.ScheduledTimerListener;
27   -import org.springframework.stereotype.Service;
28   -
29 2 import com.bsth.data.BasicData;
30 3 import com.bsth.entity.Line;
31 4 import com.bsth.entity.Personnel;
32 5 import com.bsth.entity.StationRoute;
33 6 import com.bsth.entity.excep.ArrivalInfo;
34   -import com.bsth.entity.mcy_forms.Operationservice;
35 7 import com.bsth.entity.oil.Dlb;
36 8 import com.bsth.entity.oil.Ylb;
37 9 import com.bsth.entity.realcontrol.ChildTaskPlan;
38 10 import com.bsth.entity.realcontrol.ScheduleRealInfo;
39   -import com.bsth.entity.schedule.SchedulePlanInfo;
40 11 import com.bsth.repository.LineRepository;
41 12 import com.bsth.repository.StationRouteRepository;
42 13 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
... ... @@ -45,6 +16,22 @@ import com.bsth.service.report.ReportService;
45 16 import com.bsth.util.Arith;
46 17 import com.bsth.util.ComparableJob;
47 18 import com.bsth.util.db.DBUtils_MS;
  19 +import org.apache.commons.lang.StringUtils;
  20 +import org.slf4j.Logger;
  21 +import org.slf4j.LoggerFactory;
  22 +import org.springframework.beans.factory.annotation.Autowired;
  23 +import org.springframework.jdbc.core.JdbcTemplate;
  24 +import org.springframework.jdbc.core.RowMapper;
  25 +import org.springframework.stereotype.Service;
  26 +
  27 +import java.sql.Connection;
  28 +import java.sql.PreparedStatement;
  29 +import java.sql.ResultSet;
  30 +import java.sql.SQLException;
  31 +import java.text.DecimalFormat;
  32 +import java.text.ParseException;
  33 +import java.text.SimpleDateFormat;
  34 +import java.util.*;
48 35  
49 36 @Service
50 37 public class ReportServiceImpl implements ReportService{
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
  View file @9927000
... ... @@ -195,6 +195,10 @@ angular.module('ScheduleApp').directive('saSelect5', [
195 195 * 验证内部数据，更新外部model
196 196 */
197 197 scope[ctrlAs].$$internal_validate_model = function() {
  198 + // TODO：
  199 + console.log(scope[ctrlAs].$$internal_select_value);
  200 + console.log(scope[ctrlAs].$$data_real);
  201 +
198 202 if (scope[ctrlAs].$$internal_select_value) {
199 203 var select_value_temp = scope[ctrlAs].$$internal_select_value;
200 204 if (scope[ctrlAs].$$data_real && scope[ctrlAs].$$data_real.length > 0) {
... ... @@ -206,6 +210,9 @@ angular.module('ScheduleApp').directive('saSelect5', [
206 210 }
207 211 }
208 212 if (obj) { // 在data中判定有没有
  213 + // 初始化的时候，模拟选中uiselect
  214 + scope[ctrlAs].$$internal_select_fn(obj);
  215 +
209 216 for (var k = 0; k < scope[ctrlAs].$$data.length; k++) {
210 217 if (eval("scope[ctrlAs].$$data[k]" + "." + $icname_attr + " == obj." + $icname_attr)) {
211 218 obj = undefined;
... ... @@ -218,6 +225,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
218 225 // 更新内部model，用于外部验证
219 226 // 内部model的值暂时随意，以后再改
220 227 scope[ctrlAs].$$internalmodel = {desc: "ok"};
  228 +
221 229 } else {
222 230 scope[ctrlAs].$$internalmodel = undefined;
223 231 }
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @9927000
... ... @@ -1500,6 +1500,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
1500 1500 * 验证内部数据，更新外部model
1501 1501 */
1502 1502 scope[ctrlAs].$$internal_validate_model = function() {
  1503 + // TODO：
  1504 + console.log(scope[ctrlAs].$$internal_select_value);
  1505 + console.log(scope[ctrlAs].$$data_real);
  1506 +
1503 1507 if (scope[ctrlAs].$$internal_select_value) {
1504 1508 var select_value_temp = scope[ctrlAs].$$internal_select_value;
1505 1509 if (scope[ctrlAs].$$data_real && scope[ctrlAs].$$data_real.length > 0) {
... ... @@ -1511,6 +1515,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
1511 1515 }
1512 1516 }
1513 1517 if (obj) { // 在data中判定有没有
  1518 + // TODO：
  1519 + scope[ctrlAs].$$internal_select_fn(obj);
  1520 +
1514 1521 for (var k = 0; k < scope[ctrlAs].$$data.length; k++) {
1515 1522 if (eval("scope[ctrlAs].$$data[k]" + "." + $icname_attr + " == obj." + $icname_attr)) {
1516 1523 obj = undefined;
... ... @@ -1523,6 +1530,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
1523 1530 // 更新内部model，用于外部验证
1524 1531 // 内部model的值暂时随意，以后再改
1525 1532 scope[ctrlAs].$$internalmodel = {desc: "ok"};
  1533 +
1526 1534 } else {
1527 1535 scope[ctrlAs].$$internalmodel = undefined;
1528 1536 }
... ...