|
@@ -126,10 +126,8 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
String[] split = date.split("-");
|
|
|
String year = split[0];
|
|
|
String monthStr = split[1];
|
|
|
- String month = "";
|
|
|
- if ("10".equals(month)) {
|
|
|
- month = "10";
|
|
|
- } else {
|
|
|
+ String month = monthStr;
|
|
|
+ if (Integer.valueOf(monthStr) < 10) {
|
|
|
month = monthStr.replace("0", "");
|
|
|
}
|
|
|
Integer total = deliveryValidMapper.getDesignDataTotal(year, month, designRole);
|
|
@@ -147,10 +145,8 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
String[] split = date.split("-");
|
|
|
String year = split[0];
|
|
|
String monthStr = split[1];
|
|
|
- String month = "";
|
|
|
- if ("10".equals(month)) {
|
|
|
- month = "10";
|
|
|
- } else {
|
|
|
+ String month = monthStr;
|
|
|
+ if (Integer.valueOf(monthStr) < 10) {
|
|
|
month = monthStr.replace("0", "");
|
|
|
}
|
|
|
List<JSONObject> data = deliveryValidMapper.getDesignData(year, month, designRole);
|
|
@@ -164,10 +160,8 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
String[] split = date.split("-");
|
|
|
String year = split[0];
|
|
|
String monthStr = split[1];
|
|
|
- String month = "";
|
|
|
- if ("10".equals(month)) {
|
|
|
- month = "10";
|
|
|
- } else {
|
|
|
+ String month = monthStr;
|
|
|
+ if (Integer.valueOf(monthStr) < 10) {
|
|
|
month = monthStr.replace("0", "");
|
|
|
}
|
|
|
Integer total = deliveryValidMapper.projectDataTotal(year, month);
|
|
@@ -184,10 +178,8 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
String[] split = date.split("-");
|
|
|
String year = split[0];
|
|
|
String monthStr = split[1];
|
|
|
- String month = "";
|
|
|
- if ("10".equals(month)) {
|
|
|
- month = "10";
|
|
|
- } else {
|
|
|
+ String month = monthStr;
|
|
|
+ if (Integer.valueOf(monthStr) < 10) {
|
|
|
month = monthStr.replace("0", "");
|
|
|
}
|
|
|
Integer total = deliveryValidMapper.getTotalDataSum(year, month);
|
|
@@ -232,7 +224,7 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
|
//每行数据对象,按照顺序从0到(lastCellNum-1)记录
|
|
|
JSONObject cellEntity = new JSONObject();
|
|
|
for (int j = 0; j < lastCellNum; j++) {
|
|
|
- cellEntity.put(String.valueOf(j), eeu.getCellValue2(row.getCell(j)).replace("\"",""));
|
|
|
+ cellEntity.put(String.valueOf(j), eeu.getCellValue2(row.getCell(j)).replace("\"", ""));
|
|
|
}
|
|
|
list.add(cellEntity);
|
|
|
}
|