|
|
|
@ -215,25 +215,15 @@ public class ProductionReportServiceImpl implements ProductionReportService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, Object> getOrderRollDefectReport(OrderRollDefectReportQuery query) { |
|
|
|
if (query == null || query.getSite() == null || query.getSite().trim().isEmpty()) { |
|
|
|
throw new XJException("工厂编码不能为空"); |
|
|
|
} |
|
|
|
if (query.getStartDate() == null || query.getStartDate().trim().isEmpty() |
|
|
|
|| query.getEndDate() == null || query.getEndDate().trim().isEmpty()) { |
|
|
|
throw new XJException("请选择报告日期"); |
|
|
|
} |
|
|
|
query.setSite(query.getSite().trim()); |
|
|
|
query.setOrderNo(blankToEmpty(query.getOrderNo())); |
|
|
|
query.setSeqNo(blankToEmpty(query.getSeqNo())); |
|
|
|
query.setWorkCenter(blankToEmpty(query.getWorkCenter())); |
|
|
|
query.setResource(blankToEmpty(query.getResource())); |
|
|
|
query.setStartDate(normalizeReportDate(query.getStartDate(), false)); |
|
|
|
query.setEndDate(normalizeReportDate(query.getEndDate(), true)); |
|
|
|
|
|
|
|
prepareReportQuery(query); |
|
|
|
List<LinkedHashMap<String, Object>> rows = productionReportMapper.getOrderRollDefectReport(query); |
|
|
|
if (rows == null) { |
|
|
|
rows = new ArrayList<>(); |
|
|
|
} |
|
|
|
String procedureMessage = procedureRejectMessage(rows); |
|
|
|
if (procedureMessage != null) { |
|
|
|
throw new XJException(procedureMessage); |
|
|
|
} |
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
List<String> columns = new ArrayList<>(ORDER_ROLL_DEFECT_FIXED_COLUMNS); |
|
|
|
if (!rows.isEmpty()) { |
|
|
|
@ -262,25 +252,15 @@ public class ProductionReportServiceImpl implements ProductionReportService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, Object> getOrderDowntimeReport(OrderRollDefectReportQuery query) { |
|
|
|
if (query == null || query.getSite() == null || query.getSite().trim().isEmpty()) { |
|
|
|
throw new XJException("工厂编码不能为空"); |
|
|
|
} |
|
|
|
if (query.getStartDate() == null || query.getStartDate().trim().isEmpty() |
|
|
|
|| query.getEndDate() == null || query.getEndDate().trim().isEmpty()) { |
|
|
|
throw new XJException("请选择创建日期"); |
|
|
|
} |
|
|
|
query.setSite(query.getSite().trim()); |
|
|
|
query.setOrderNo(blankToEmpty(query.getOrderNo())); |
|
|
|
query.setSeqNo(blankToEmpty(query.getSeqNo())); |
|
|
|
query.setWorkCenter(blankToEmpty(query.getWorkCenter())); |
|
|
|
query.setResource(blankToEmpty(query.getResource())); |
|
|
|
query.setStartDate(normalizeReportDate(query.getStartDate(), false)); |
|
|
|
query.setEndDate(normalizeReportDate(query.getEndDate(), true)); |
|
|
|
|
|
|
|
prepareReportQuery(query); |
|
|
|
List<LinkedHashMap<String, Object>> rows = productionReportMapper.getOrderDowntimeReport(query); |
|
|
|
if (rows == null) { |
|
|
|
rows = new ArrayList<>(); |
|
|
|
} |
|
|
|
String procedureMessage = procedureRejectMessage(rows); |
|
|
|
if (procedureMessage != null) { |
|
|
|
throw new XJException(procedureMessage); |
|
|
|
} |
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
List<LinkedHashMap<String, Object>> normalizedRows = new ArrayList<>(); |
|
|
|
for (LinkedHashMap<String, Object> row : rows) { |
|
|
|
@ -332,11 +312,60 @@ public class ProductionReportServiceImpl implements ProductionReportService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<String> getAccessSiteList(String userName) { |
|
|
|
if (userName == null || userName.trim().isEmpty()) { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
List<String> siteList = productionReportMapper.getAccessSiteList(userName.trim()); |
|
|
|
return siteList == null ? new ArrayList<>() : siteList; |
|
|
|
} |
|
|
|
|
|
|
|
private void prepareReportQuery(OrderRollDefectReportQuery query) { |
|
|
|
if (query == null) { |
|
|
|
throw new XJException("查询条件不能为空"); |
|
|
|
} |
|
|
|
query.setSite(blankToEmpty(query.getSite())); |
|
|
|
query.setOrderNo(blankToEmpty(query.getOrderNo())); |
|
|
|
query.setSeqNo(blankToEmpty(query.getSeqNo())); |
|
|
|
query.setWorkCenter(blankToEmpty(query.getWorkCenter())); |
|
|
|
query.setResource(blankToEmpty(query.getResource())); |
|
|
|
query.setStartDate(normalizeReportDate(query.getStartDate(), false)); |
|
|
|
query.setEndDate(normalizeReportDate(query.getEndDate(), true)); |
|
|
|
} |
|
|
|
|
|
|
|
private String procedureRejectMessage(List<LinkedHashMap<String, Object>> rows) { |
|
|
|
if (rows == null || rows.isEmpty()) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
Object code = mapValue(rows.get(0), "resultCode"); |
|
|
|
if (code == null || !"400".equals(String.valueOf(code).trim())) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
Object message = mapValue(rows.get(0), "resultMsg"); |
|
|
|
return message == null || String.valueOf(message).trim().isEmpty() ? "请输入筛选条件后再试!" : String.valueOf(message); |
|
|
|
} |
|
|
|
|
|
|
|
private Object mapValue(Map<String, Object> row, String name) { |
|
|
|
if (row.containsKey(name)) { |
|
|
|
return row.get(name); |
|
|
|
} |
|
|
|
for (Map.Entry<String, Object> entry : row.entrySet()) { |
|
|
|
if (entry.getKey() != null && entry.getKey().equalsIgnoreCase(name)) { |
|
|
|
return entry.getValue(); |
|
|
|
} |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
private String blankToEmpty(String value) { |
|
|
|
return value == null ? "" : value.trim(); |
|
|
|
} |
|
|
|
|
|
|
|
private String normalizeReportDate(String value, boolean endOfDay) { |
|
|
|
if (value == null || value.trim().isEmpty()) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
String text = value.trim(); |
|
|
|
if (text.length() == 10) { |
|
|
|
return text + (endOfDay ? " 23:59:59" : " 00:00:00"); |
|
|
|
|