mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
王兴琳 6 months ago
parent
3bec455886 27ddf30551
commit
64cfe14dd6
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java

16
zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
View File

@ -420,14 +420,14 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService {
Map<String, Integer> map =accidentSectionAnalysis(dcSdhsEventQuery); Map<String, Integer> map =accidentSectionAnalysis(dcSdhsEventQuery);
// String direction = dcSdhsEventQuery.getDirection();//方向 // String direction = dcSdhsEventQuery.getDirection();//方向
String title="事故路段分布图"; String title="事故路段分布";
PoiUtil.createHeading2(doc, title);
// if ("广州方向".equals(direction)){ // if ("广州方向".equals(direction)){
// title="事故路段分布图-广州方向"; // title="事故路段分布图-广州方向";
// }else { // }else {
// title="事故路段分布图-济南方向"; // title="事故路段分布图-济南方向";
// } // }
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()){ if (map != null && map.size() != UniversalEnum.ZERO.getNumber()){
PoiUtil.createHeading2(doc, title);
XWPFTable table = doc.createTable(map.size()+1,2); XWPFTable table = doc.createTable(map.size()+1,2);
//列宽自动分割 //列宽自动分割
CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW(); CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW();
@ -481,14 +481,14 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService {
public void accidentTypeAnalysisExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) { public void accidentTypeAnalysisExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) {
Map<String, Integer> map =accidentTypeAnalysis(dcSdhsEventQuery); Map<String, Integer> map =accidentTypeAnalysis(dcSdhsEventQuery);
// String direction = dcSdhsEventQuery.getDirection();//方向 // String direction = dcSdhsEventQuery.getDirection();//方向
String title="事件类型分布图"; String title="事件类型分布";
// if ("广州方向".equals(direction)){ // if ("广州方向".equals(direction)){
// title="事件类型分布图-广州方向"; // title="事件类型分布图-广州方向";
// }else { // }else {
// title="事件类型分布图-济南方向"; // title="事件类型分布图-济南方向";
// } // }
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()) {
PoiUtil.createHeading2(doc, title); PoiUtil.createHeading2(doc, title);
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()) {
XWPFTable table = doc.createTable(map.size() + 1, 2); XWPFTable table = doc.createTable(map.size() + 1, 2);
//列宽自动分割 //列宽自动分割
CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW(); CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW();
@ -541,9 +541,9 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService {
@Override @Override
public void accidentCongestedTimeExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) { public void accidentCongestedTimeExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) {
Map<String, String> map =accidentCongestedTime(dcSdhsEventQuery); Map<String, String> map =accidentCongestedTime(dcSdhsEventQuery);
String title="事故拥堵时长分布图"; String title="事故拥堵时长分布";
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()) {
PoiUtil.createHeading2(doc, title); PoiUtil.createHeading2(doc, title);
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()) {
XWPFTable table = doc.createTable(map.size() + 1, 2); XWPFTable table = doc.createTable(map.size() + 1, 2);
//列宽自动分割 //列宽自动分割
CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW(); CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW();
@ -596,9 +596,9 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService {
@Override @Override
public void accidentCongestedLocationExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) { public void accidentCongestedLocationExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) {
Map<String, Integer> map =accidentCongestedLocation(dcSdhsEventQuery); Map<String, Integer> map =accidentCongestedLocation(dcSdhsEventQuery);
String title="事故拥堵地点分布图"; String title="事故拥堵地点分布";
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()) {
PoiUtil.createHeading2(doc, title); PoiUtil.createHeading2(doc, title);
if (map != null && map.size() != UniversalEnum.ZERO.getNumber()) {
XWPFTable table = doc.createTable(map.size() + 1, 2); XWPFTable table = doc.createTable(map.size() + 1, 2);
//列宽自动分割 //列宽自动分割
CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW(); CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW();

Write Preview
Loading…
Cancel
Save