Skip to content

H
hzsomms
Commit b213ca98 authored by hkl's avatar hkl
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev-hkl

parents 462ff938 9861a138
Show whitespace changes
Inline Side-by-side
Showing with 537 additions and 13 deletions
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementRecordsMasterController.java
View file @ b213ca98
......@@ -327,7 +327,6 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
ExcelReader reader = ExcelUtil.getReader(file.getInputStream(), 0);
//读取Excel中所有的数据，以行保存
List<List<Object>> rowRecords = reader.read();
// 获取excel的列数
int column = rowRecords.get(0).size();
//初始化列的索引
......@@ -779,12 +778,13 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
*
* @param id 动静态几何尺寸数据id
* @param type 查询类型
* @param overType 轨检车->超限查询子类型
* @return
*/
@AutoLog(value = "轨检车详情查询")
@ApiOperation(value = "轨检车详情查询", notes = "轨检车详情查询")
@GetMapping(value = "/getTrackInfo")
public Result<Map<String, Object>> getTrackInfo(@ApiParam(name = "动静态几何尺寸数据id") String id, @ApiParam(name = "查询类型") String type) {
public Result<Map<String, Object>> getTrackInfo(@ApiParam(name = "动静态几何尺寸数据id") String id, @ApiParam(name = "查询类型") String type,@ApiParam(name = "轨检车->超限查询子类型") String overType) {
Map<String, Object> map = new HashMap<>();
if ("1".equals(type)) {
//轨检车-》轨道动态几何尺寸容许值差管理值
......@@ -794,10 +794,11 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
.orderByAsc(MovementDiferenceManager::getSort)
.list();
map.put("movementDiference", list);
} else if ("2".equals(type)) {
} else if ("2".equals(type) && ObjectUtil.isNotEmpty(overType)) {
//轨检车-》超限记录报告
List<MovementOverReport> list = movementOverReportService.lambdaQuery()
.eq(MovementOverReport::getMovementMasterId, id)
.eq(MovementOverReport::getOverrunLevel, overType)
.eq(MovementOverReport::getDelFlag, "0")
.orderByAsc(MovementOverReport::getSort)
.list();
......@@ -879,8 +880,16 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
List<MovementTqiKilometerReport> movementTqiKilometerReportList = new ArrayList<>();
//初始化TQI总结报告表集合
List<MovementTqiReport> movementTqiReportList = new ArrayList<>();
//初始化区段总结报告集合
List<MovementSectionReport> movementSectionReportList = new ArrayList<>();
//初始化超限记录报告集合
List<MovementOverReport> movementOverReportList = new ArrayList<>();
//初始化轨道动态几何尺寸容许值差管理值集合
List<MovementDiferenceManager> movementDiferenceManagertList = new ArrayList<>();
//初始化200m区段轨道不平顺质量指数TQI管理标准(单位：mm)集合
List<MovementTqiStandardManager> movementTqiStandardManagerList = new ArrayList<>();
//初始化TQI公里状态评定标准集合
List<MovementTqiKilometerStandardManager> movementTqiKilometerStandardManagerList = new ArrayList<>();
for (int i = 0; i < rowRecords.size(); i++) {
List<Object> list = rowRecords.get(i);
if (list == null || list.size() <= 0) {
......@@ -890,11 +899,23 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
if (str.equals("")) {
continue;
}
if (str.equals("四级缺陷记录报告表")|| str.equals("三级缺陷记录报告表") || str.equals("二级缺陷记录报告表") || str.equals("一级缺陷记录报告表")) {
if (str.equals("轨道动态几何尺寸容许值差管理值")) {
//处理轨道动态几何尺寸容许值差管理值解析封装逻辑
int dataOne = this.uploadMovementDiferenceManager(movementDiferenceManagertList, i, sort, realname, rowRecords, id);
i = i + dataOne;
} else if (str.equals("200m区段轨道不平顺质量指数TQI管理标准(单位：mm)")) {
//处理200m区段轨道不平顺质量指数TQI管理标准(单位：mm)解析封装逻辑
int dataOne = this.uploadMovementTqiStandardManager(movementTqiStandardManagerList, i, sort, realname, rowRecords, id);
i = i + dataOne;
}else if (str.equals("TQI公里状态评定标准")) {
//处理TQI公里状态评定标准解析封装逻辑
int dataOne = this.uploadMovementTqiKilometerStandardManager(movementTqiKilometerStandardManagerList, i, sort, realname, rowRecords, id);
i = i + dataOne;
}else if (str.equals("四级缺陷记录报告表") || str.equals("三级缺陷记录报告表") || str.equals("二级缺陷记录报告表") || str.equals("一级缺陷记录报告表")) {
//处理超限记录报告解析封装逻辑
int dataOne = this.uploadMovementOverReport(movementOverReportList, i, sort, realname, rowRecords, id);
i = i + dataOne;
}else if (str.equals("TQI总结报告表")) {
} else if (str.equals("TQI总结报告表")) {
//处理TQI总结报告表解析封装逻辑
int dataOne = this.uploadMovementTqiReport(movementTqiReportList, i, sort, realname, rowRecords, id);
i = i + dataOne;
......@@ -906,6 +927,10 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
//处理公里总结报告表解析封装逻辑
int dataOne = this.uploadMovementSummaryReport(movementSummaryReportList, i, sort, realname, rowRecords, id);
i = i + dataOne;
} else if (str.equals("区段总结报告表")) {
//处理区段总结报告表解析封装逻辑
int dataOne = this.uploadMovementSectionReport(movementSectionReportList, i, sort, realname, rowRecords, id);
i = i + dataOne;
} else {
if (i != rowRecords.size() - 1) {
continue;
......@@ -931,6 +956,23 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
if (movementOverReportList != null && movementOverReportList.size() > 0) {
movementOverReportService.saveBatch(movementOverReportList);
}
//维护区段总结报告
if (movementSectionReportList != null && movementSectionReportList.size() > 0) {
movementSectionReportService.saveBatch(movementSectionReportList);
}
//维护轨道动态几何尺寸容许值差管理值
if (movementDiferenceManagertList != null && movementDiferenceManagertList.size() > 0) {
movementDiferenceManagerService.saveBatch(movementDiferenceManagertList);
}
//维护200m区段轨道不平顺质量指数TQI管理标准(单位：mm)
if (movementTqiStandardManagerList != null && movementTqiStandardManagerList.size() > 0) {
movementTqiStandardManagerService.saveBatch(movementTqiStandardManagerList);
}
//维护TQI公里状态评定标准
if (movementTqiKilometerStandardManagerList != null && movementTqiKilometerStandardManagerList.size() > 0) {
movementTqiKilometerStandardManagerService.saveBatch(movementTqiKilometerStandardManagerList);
}
//释放资源
in.close();
} catch (Exception e) {
......@@ -941,6 +983,487 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
//************************************公共方法封装******************************************************
/**
* @param movementTqiStandardManagerList 最终的TQI公里状态评定标准集合
* @param i 当前行坐标
* @param sort 顺序
* @param realname 当前登录人姓名
* @param rowRecords 总行列数据集合
* @param id 主表id
*/
public int uploadMovementTqiKilometerStandardManager(List<MovementTqiKilometerStandardManager> movementTqiStandardManagerList, int i, int sort, String realname, List<List<Object>> rowRecords, String id) {
String regEx ="[^0-9 .]";
Pattern p = Pattern.compile(regEx);
int dataOne = 0;
for (int j = i + 2; j < rowRecords.size(); j++) {
List<Object> list1 = rowRecords.get(j);
if (list1 == null || list1.size() <= 0) {
return dataOne;
}
String str = list1.get(0).toString().trim();
if (str.equals("")) {
return dataOne;
}
dataOne++;
sort++;
//初始化TQI公里状态评定标准
MovementTqiKilometerStandardManager model = new MovementTqiKilometerStandardManager();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
model.setMovementMasterId(id);
model.setCreateTime(new Date());
model.setUpdateTime(new Date());
model.setCreateBy(realname);
model.setUpdateBy(realname);
model.setSort(sort);
//评价定义
String evaluate = "";
evaluate = rowRecords.get(j).get(0).toString().trim();
if (ObjectUtil.isNotEmpty(evaluate)) {
model.setEvaluate(evaluate);
}
//均衡
String balanced = "";
String str1 = rowRecords.get(j).get(23).toString().trim();
if (ObjectUtil.isNotEmpty(str1)) {
Matcher m = p.matcher(str1);
balanced = m.replaceAll("").trim();
model.setBalanced(balanced);
}
//计划最小值
String minPlan = "";
//计划最大值
String maxPlan = "";
String plan = rowRecords.get(j).get(60).toString().trim();
if (ObjectUtil.isNotEmpty(plan)) {
String[] vs = plan.split("T");
String start = vs[0];
Matcher m = p.matcher(start);
minPlan = m.replaceAll("").trim();
model.setMinPlan(minPlan);
String end = vs[1];
Matcher m1 = p.matcher(end);
maxPlan = m1.replaceAll("").trim();
model.setMaxPlan(maxPlan);
}
//优先值
String first = "";
String data = rowRecords.get(j).get(96).toString().trim();
if (ObjectUtil.isNotEmpty(data)) {
Matcher m = p.matcher(data);
first = m.replaceAll("").trim();
model.setFirst(first);
}
movementTqiStandardManagerList.add(model);
}
return dataOne;
}
/**
* @param movementTqiStandardManagerList 最终的200m区段轨道不平顺质量指数TQI管理标准(单位：mm)集合
* @param i 当前行坐标
* @param sort 顺序
* @param realname 当前登录人姓名
* @param rowRecords 总行列数据集合
* @param id 主表id
*/
public int uploadMovementTqiStandardManager(List<MovementTqiStandardManager> movementTqiStandardManagerList, int i, int sort, String realname, List<List<Object>> rowRecords, String id) {
String regEx ="[^0-9 .]";
Pattern p = Pattern.compile(regEx);
int dataOne = 0;
for (int j = i + 3; j < rowRecords.size(); j++) {
List<Object> list1 = rowRecords.get(j);
if (list1 == null || list1.size() <= 0) {
return dataOne;
}
String str = list1.get(0).toString().trim();
if (str.equals("")) {
return dataOne;
}
dataOne++;
sort++;
//初始化区段总结报告表
MovementTqiStandardManager model = new MovementTqiStandardManager();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
model.setMovementMasterId(id);
model.setCreateTime(new Date());
model.setUpdateTime(new Date());
model.setCreateBy(realname);
model.setUpdateBy(realname);
model.setSort(sort);
//最小速度等级
String minSpendLevel = "";
//最大速度等级
String maxSpendLevel = "";
String spendLevel = rowRecords.get(j).get(0).toString().trim();
if (ObjectUtil.isNotEmpty(spendLevel)) {
String[] vs = spendLevel.split("V");
String start = vs[0];
Matcher m = p.matcher(start);
minSpendLevel = m.replaceAll("").trim();
model.setMinSpendLevel(minSpendLevel);
String end = vs[1];
Matcher m1 = p.matcher(end);
maxSpendLevel = m1.replaceAll("").trim();
model.setMaxSpendLevel(maxSpendLevel);
}
//高低（mm）
String height = "";
height = rowRecords.get(j).get(9).toString().trim();
if (ObjectUtil.isNotEmpty(height)) {
model.setHeight(height);
}
//轨向（mm）
String trackAlignment = "";
trackAlignment = rowRecords.get(j).get(19).toString().trim();
if (ObjectUtil.isNotEmpty(trackAlignment)) {
model.setTrackAlignment(trackAlignment);
}
//轨距（mm）
String trackGauge = "";
trackGauge = rowRecords.get(j).get(27).toString().trim();
if (ObjectUtil.isNotEmpty(trackGauge)) {
model.setTrackGauge(trackGauge);
}
//水平（mm）
String level = "";
level = rowRecords.get(j).get(36).toString().trim();
if (ObjectUtil.isNotEmpty(level)) {
model.setLevel(level);
}
//三角坑（mm）
String triangularPit = "";
triangularPit = rowRecords.get(j).get(46).toString().trim();
if (ObjectUtil.isNotEmpty(triangularPit)) {
model.setTriangularPit(triangularPit);
}
//TQI
String tqiValue = "";
tqiValue = rowRecords.get(j).get(58).toString().trim();
if (ObjectUtil.isNotEmpty(tqiValue)) {
model.setTqiValue(tqiValue);
}
//超标<=10%->TQI最小值
String minTqiExceedTen = "";
//超标<=10%->TQI最大值
String maxTqiExceedTen = "";
String tqiExceedTen = rowRecords.get(j).get(70).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedTen)) {
String[] vs = tqiExceedTen.split("T");
String start = vs[0];
Matcher m = p.matcher(start);
minTqiExceedTen = m.replaceAll("").trim();
model.setMinTqiExceedTen(minTqiExceedTen);
String end = vs[1];
Matcher m1 = p.matcher(end);
maxTqiExceedTen = m1.replaceAll("").trim();
model.setMaxTqiExceedTen(maxTqiExceedTen);
}
//超标<=10%->扣分
String tqiExceedTenDeduct = "";
tqiExceedTenDeduct = rowRecords.get(j).get(84).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedTenDeduct)) {
model.setTqiExceedTenDeduct(tqiExceedTenDeduct);
}
//超标<=20%->TQI最小值
String minTqiExceedTwenty = "";
//超标<=20%->TQI最大值
String maxTqiExceedTwenty = "";
String tqiExceedTwenty = rowRecords.get(j).get(92).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedTwenty)) {
String[] vs = tqiExceedTwenty.split("T");
String start = vs[0];
Matcher m = p.matcher(start);
minTqiExceedTwenty = m.replaceAll("").trim();
model.setMinTqiExceedTwenty(minTqiExceedTwenty);
String end = vs[1];
Matcher m1 = p.matcher(end);
maxTqiExceedTwenty = m1.replaceAll("").trim();
model.setMaxTqiExceedTwenty(maxTqiExceedTwenty);
}
//超标<=20%->扣分
String tqiExceedTwentyDeduct = "";
tqiExceedTwentyDeduct = rowRecords.get(j).get(107).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedTwentyDeduct)) {
model.setTqiExceedTwentyDeduct(tqiExceedTwentyDeduct);
}
//超标>20%->TQI最小值
String minTqiExceedPassTwenty = "";
String tqiExceedPassTwenty = rowRecords.get(j).get(113).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedPassTwenty)) {
String[] vs = tqiExceedPassTwenty.split("T");
String start = vs[0];
Matcher m = p.matcher(start);
minTqiExceedPassTwenty = m.replaceAll("").trim();
model.setMinTqiExceedPassTwenty(minTqiExceedPassTwenty);
}
//超标>20%->TQI扣分
String tqiExceedPassTwentyDeduct = "";
tqiExceedPassTwentyDeduct = rowRecords.get(j).get(126).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedPassTwentyDeduct)) {
model.setTqiExceedPassTwentyDeduct(tqiExceedPassTwentyDeduct);
}
movementTqiStandardManagerList.add(model);
}
return dataOne;
}
/**
* @param movementDiferenceManagerList 最终的轨道动态几何尺寸容许值差管理值集合
* @param i 当前行坐标
* @param sort 顺序
* @param realname 当前登录人姓名
* @param rowRecords 总行列数据集合
* @param id 主表id
*/
public int uploadMovementDiferenceManager(List<MovementDiferenceManager> movementDiferenceManagerList, int i, int sort, String realname, List<List<Object>> rowRecords, String id) {
String regEx = "[^0-9]";
Pattern p = Pattern.compile(regEx);
int dataOne = 0;
for (int j = i + 2; j < rowRecords.size(); j++) {
List<Object> list1 = rowRecords.get(j);
if (list1 == null || list1.size() <= 0) {
return dataOne;
}
String str = list1.get(0).toString().trim();
if (str.equals("")) {
return dataOne;
}
dataOne++;
sort++;
//初始化区段总结报告表
MovementDiferenceManager model = new MovementDiferenceManager();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
model.setMovementMasterId(id);
model.setCreateTime(new Date());
model.setUpdateTime(new Date());
model.setCreateBy(realname);
model.setUpdateBy(realname);
model.setSort(sort);
//最小速度等级
String minSpendLevel = "";
//最大速度等级
String maxSpendLevel = "";
String spendLevel = rowRecords.get(j).get(0).toString().trim();
if (ObjectUtil.isNotEmpty(spendLevel)) {
String[] vs = spendLevel.split("V");
String start = vs[0];
Matcher m = p.matcher(start);
minSpendLevel = m.replaceAll("").trim();
model.setMinSpendLevel(minSpendLevel);
String end = vs[1];
Matcher m1 = p.matcher(end);
maxSpendLevel = m1.replaceAll("").trim();
model.setMaxSpendLevel(maxSpendLevel);
}
//超限等级
String exceedLevel = "";
exceedLevel = rowRecords.get(j).get(7).toString().trim();
if (ObjectUtil.isNotEmpty(exceedLevel)) {
model.setExceedLevel(exceedLevel);
}
//高低（mm）
String height = "";
height = rowRecords.get(j).get(18).toString().trim();
if (ObjectUtil.isNotEmpty(height)) {
model.setHeight(height);
}
//轨向（mm）
String trackAlignment = "";
trackAlignment = rowRecords.get(j).get(27).toString().trim();
if (ObjectUtil.isNotEmpty(trackAlignment)) {
model.setTrackAlignment(trackAlignment);
}
//大轨距（mm）
String maxTrackGauge = "";
maxTrackGauge = rowRecords.get(j).get(36).toString().trim();
if (ObjectUtil.isNotEmpty(maxTrackGauge)) {
model.setMaxTrackGauge(maxTrackGauge);
}
//小轨距（mm）
String minTrackGauge = "";
minTrackGauge = rowRecords.get(j).get(47).toString().trim();
if (ObjectUtil.isNotEmpty(minTrackGauge)) {
model.setMinTrackGauge(minTrackGauge);
}
//水平（mm）
String level = "";
level = rowRecords.get(j).get(59).toString().trim();
if (ObjectUtil.isNotEmpty(level)) {
model.setLevel(level);
}
//三角坑（mm）
String triangularPit = "";
triangularPit = rowRecords.get(j).get(69).toString().trim();
if (ObjectUtil.isNotEmpty(triangularPit)) {
model.setTriangularPit(triangularPit);
}
//垂直加速度（g）
String verticalSpend = "";
verticalSpend = rowRecords.get(j).get(79).toString().trim();
if (ObjectUtil.isNotEmpty(verticalSpend)) {
model.setVerticalSpend(verticalSpend);
}
//横向加速度（g）
String transverseSpend = "";
transverseSpend = rowRecords.get(j).get(89).toString().trim();
if (ObjectUtil.isNotEmpty(transverseSpend)) {
model.setTransverseSpend(transverseSpend);
}
//轨距变化率
String gaugeChange = "";
gaugeChange = rowRecords.get(j).get(98).toString().trim();
if (ObjectUtil.isNotEmpty(gaugeChange)) {
model.setGaugeChange(gaugeChange);
}
//曲率变化率
String curvatureChange = "";
curvatureChange = rowRecords.get(j).get(111).toString().trim();
if (ObjectUtil.isNotEmpty(curvatureChange)) {
model.setCurvatureChange(curvatureChange);
}
//扣分标准
String deductStandard = "";
deductStandard = rowRecords.get(j).get(122).toString().trim();
if (ObjectUtil.isNotEmpty(deductStandard)) {
model.setDeductStandard(deductStandard);
}
movementDiferenceManagerList.add(model);
}
return dataOne;
}
/**
* @param movementSectionReportList 最终的区段总结报告集合
* @param i 当前行坐标
* @param sort 顺序
* @param realname 当前登录人姓名
* @param rowRecords 总行列数据集合
* @param id 主表id
*/
public int uploadMovementSectionReport(List<MovementSectionReport> movementSectionReportList, int i, int sort, String realname, List<List<Object>> rowRecords, String id) {
int dataOne = 0;
for (int j = i + 5; j < rowRecords.size(); j++) {
List<Object> list1 = rowRecords.get(j);
if (list1 == null || list1.size() <= 0) {
return dataOne;
}
String str = list1.get(0).toString().trim();
if (str.equals("")) {
return dataOne;
}
dataOne++;
sort++;
//初始化区段总结报告表
MovementSectionReport model = new MovementSectionReport();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
model.setMovementMasterId(id);
model.setCreateTime(new Date());
model.setUpdateTime(new Date());
model.setCreateBy(realname);
model.setUpdateBy(realname);
model.setSort(sort);
//项目名称
String projectName = "";
projectName = rowRecords.get(j).get(0).toString().trim();
if (ObjectUtil.isNotEmpty(projectName)) {
model.setProjectName(projectName);
}
//个数->一级
String numberOne = "";
numberOne = rowRecords.get(j).get(5).toString().trim();
if (ObjectUtil.isNotEmpty(numberOne)) {
model.setNumberOne(numberOne);
}
//个数->二级
String numberTwo = "";
numberTwo = rowRecords.get(j).get(13).toString().trim();
if (ObjectUtil.isNotEmpty(numberTwo)) {
model.setNumberTwo(numberTwo);
}
//个数->三级
String numberThree = "";
numberThree = rowRecords.get(j).get(21).toString().trim();
if (ObjectUtil.isNotEmpty(numberThree)) {
model.setNumberThree(numberThree);
}
//个数->四级
String numberFour = "";
numberFour = rowRecords.get(j).get(28).toString().trim();
if (ObjectUtil.isNotEmpty(numberFour)) {
model.setNumberFour(numberFour);
}
//个数->总数
String numberSum = "";
numberSum = rowRecords.get(j).get(35).toString().trim();
if (ObjectUtil.isNotEmpty(numberSum)) {
model.setNumberSum(numberSum);
}
//个数->个数/公里
String numberAve = "";
numberAve = rowRecords.get(j).get(45).toString().trim();
if (ObjectUtil.isNotEmpty(numberAve)) {
model.setNumberAve(numberAve);
}
//个数->百分比
String numberPer = "";
String data = rowRecords.get(j).get(57).toString().trim();
if (ObjectUtil.isNotEmpty(data)) {
numberPer = data.replace("%", "").trim();
model.setNumberPer(numberPer);
}
//扣分->扣分总计
String deductSum = "";
deductSum = rowRecords.get(j).get(71).toString().trim();
if (ObjectUtil.isNotEmpty(deductSum)) {
model.setDeductSum(deductSum);
}
//扣分->扣分/公里
String deductAve = "";
deductAve = rowRecords.get(j).get(81).toString().trim();
if (ObjectUtil.isNotEmpty(deductAve)) {
model.setDeductAve(deductAve);
}
//扣分->扣分百分比
String deductPer = "";
String data1 = rowRecords.get(j).get(90).toString().trim();
if (ObjectUtil.isNotEmpty(data1)) {
deductPer = data1.replace("%", "").trim();
model.setDeductPer(deductPer);
}
//TQI->平均指数
String tqiAve = "";
tqiAve = rowRecords.get(j).get(100).toString().trim();
if (ObjectUtil.isNotEmpty(tqiAve)) {
model.setTqiAve(tqiAve);
}
//TQI->超标段数
String tqiExceedNum = "";
tqiExceedNum = rowRecords.get(j).get(110).toString().trim();
if (ObjectUtil.isNotEmpty(tqiExceedNum)) {
model.setTqiExceedNum(tqiExceedNum);
}
//TQI->超标百分比
String tqiExceedPer = "";
String data2 = rowRecords.get(j).get(122).toString().trim();
if (ObjectUtil.isNotEmpty(data2)) {
tqiExceedPer = data2.replace("%", "").trim();
model.setTqiExceedPer(tqiExceedPer);
}
movementSectionReportList.add(model);
}
return dataOne;
}
/**
* @param movementOverReportList 最终的超限总结报告集合
* @param i 当前行坐标
......@@ -1052,6 +1575,7 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
}
return dataOne;
}
/**
* @param movementTqiReportList 最终的TQI总结报告集合
* @param i 当前行坐标
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/MovementSectionReportDTO.java
View file @ b213ca98
......@@ -48,7 +48,7 @@ public class MovementSectionReportDTO {
private String projectName;
@ApiModelProperty("个数->一级")
private BigDecimal numberOne;
private String numberOne;
@ApiModelProperty("个数->二级")
private String numberTwo;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/MovementSectionReport.java
View file @ b213ca98
......@@ -64,7 +64,7 @@ public class MovementSectionReport implements Serializable {
@ApiModelProperty("个数->一级")
@TableField("number_one")
private BigDecimal numberOne;
private String numberOne;
@ApiModelProperty("个数->二级")
@TableField("number_two")
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/MovementSectionReportVO.java
View file @ b213ca98
......@@ -48,7 +48,7 @@ public class MovementSectionReportVO {
private String projectName;
@ApiModelProperty("个数->一级")
private BigDecimal numberOne;
private String numberOne;
@ApiModelProperty("个数->二级")
private String numberTwo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment