Skip to content

K
klck
Commit b59bab67 authored by hehongwei's avatar hehongwei
Browse files
Options

清洗规则修改功能

parent ea14c1df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 391 additions and 357 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java
View file @ b59bab67
...@@ -335,7 +335,10 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat ...@@ -335,7 +335,10 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
actSuppliesImportCleaning.setDepartmentColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DepartmentColumn") - 1)].getV()); actSuppliesImportCleaning.setDepartmentColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DepartmentColumn") - 1)].getV());
actSuppliesImportCleaning.setNumberColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("NumberColumn") - 1)].getV()); actSuppliesImportCleaning.setNumberColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("NumberColumn") - 1)].getV());
actSuppliesImportCleaning.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("MoneyColumn") - 1)].getV()); actSuppliesImportCleaning.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("MoneyColumn") - 1)].getV());
actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DateColumn") - 1)].getV()); Object dateColumn = parse.getJSONObject(0).get("DateColumn");
if(parse.getJSONObject(0).get("DateColumn").hashCode()>0){
actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DateColumn") - 1)].getV());
}
//actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][JSON.parseObject(actOperation2s.get(i).getHistoryRole()).getInteger("DateColumn")].getV()); //actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][JSON.parseObject(actOperation2s.get(i).getHistoryRole()).getInteger("DateColumn")].getV());
//新增一条生成表数据 //新增一条生成表数据
actSuppliesCleaningRuleMapper.addActSuppliesImportCleaning(actSuppliesImportCleaning); actSuppliesCleaningRuleMapper.addActSuppliesImportCleaning(actSuppliesImportCleaning);
...@@ -351,48 +354,48 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat ...@@ -351,48 +354,48 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
for (int i = 0; i < actOperation2s.size(); i++) { // for (int i = 0; i < actOperation2s.size(); i++) {
//
//获取导入excel表数据存储到生成表实体类中 // //获取导入excel表数据存储到生成表实体类中
for (int x = 0; x < actOperation2s.get(i).getActOperation2().length; x++) { // for (int x = 0; x < actOperation2s.get(i).getActOperation2().length; x++) {
//判断数据是否为空，为空结束循环 // //判断数据是否为空，为空结束循环
if (actOperation2s.get(i).getActOperation2()[x] != null) { // if (actOperation2s.get(i).getActOperation2()[x] != null) {
ActSuppliesImportCleaning actSuppliesImportCleaning = new ActSuppliesImportCleaning(); // ActSuppliesImportCleaning actSuppliesImportCleaning = new ActSuppliesImportCleaning();
//
UUID uuid = UUID.randomUUID(); // UUID uuid = UUID.randomUUID();
String s = StringUtils.remove(uuid.toString(), '-'); // String s = StringUtils.remove(uuid.toString(), '-');
actSuppliesImportCleaning.setId(s); // actSuppliesImportCleaning.setId(s);
actSuppliesImportCleaning.setRoleId(actOperation2s.get(i).gethId()); // actSuppliesImportCleaning.setRoleId(actOperation2s.get(i).gethId());
actSuppliesImportCleaning.setDate(actOperation2s.get(i).gethDate()); // actSuppliesImportCleaning.setDate(actOperation2s.get(i).gethDate());
actSuppliesImportCleaning.setSskId(actOperation2s.get(i).getMining()); // actSuppliesImportCleaning.setSskId(actOperation2s.get(i).getMining());
//获取数组x行的真实非空长度 // //获取数组x行的真实非空长度
List<Object> actOperation2s1 = Arrays.asList(actOperation2s.get(i).getActOperation2()[x]); // List<Object> actOperation2s1 = Arrays.asList(actOperation2s.get(i).getActOperation2()[x]);
long count = Arrays.stream(actOperation2s.get(i).getActOperation2()[x]).filter(Objects::nonNull).count(); // long count = Arrays.stream(actOperation2s.get(i).getActOperation2()[x]).filter(Objects::nonNull).count();
//
//循环保存到实体类字段中 // //循环保存到实体类字段中
for (int y = 0; y < count; y++) { // for (int y = 0; y < count; y++) {
if (actOperation2s.get(i).getActOperation2()[x][y] != null) { // if (actOperation2s.get(i).getActOperation2()[x][y] != null) {
if (actOperation2s.get(i).getActOperation2()[x][y].getV() != null) { // if (actOperation2s.get(i).getActOperation2()[x][y].getV() != null) {
//[{"HeaderRow": 1, "CodeColumn": 6, "DateColumn": 5, "NameColumn": 7, "MoneyColumn": 12, "NumberColumn": 11, "DepartmentColumn": 2}] // //[{"HeaderRow": 1, "CodeColumn": 6, "DateColumn": 5, "NameColumn": 7, "MoneyColumn": 12, "NumberColumn": 11, "DepartmentColumn": 2}]
JSONArray parse = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole()); // JSONArray parse = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole());
actSuppliesImportCleaning.setNameColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("NameColumn")-1].getV()); // actSuppliesImportCleaning.setNameColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("NameColumn")-1].getV());
actSuppliesImportCleaning.setCodeColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("CodeColumn")-1].getV()); // actSuppliesImportCleaning.setCodeColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("CodeColumn")-1].getV());
actSuppliesImportCleaning.setDepartmentColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("DepartmentColumn")-1].getV()); // actSuppliesImportCleaning.setDepartmentColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("DepartmentColumn")-1].getV());
actSuppliesImportCleaning.setNumberColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("NumberColumn")-1].getV()); // actSuppliesImportCleaning.setNumberColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("NumberColumn")-1].getV());
actSuppliesImportCleaning.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("MoneyColumn")-1].getV()); // actSuppliesImportCleaning.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("MoneyColumn")-1].getV());
actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("DateColumn")-1].getV()); // actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][(int) parse.getJSONObject(0).get("DateColumn")-1].getV());
} // }
} // }
//
} // }
//新增一条生成表数据 // //新增一条生成表数据
actSuppliesCleaningRuleMapper.addActSuppliesImportCleaning(actSuppliesImportCleaning); // actSuppliesCleaningRuleMapper.addActSuppliesImportCleaning(actSuppliesImportCleaning);
} else { // } else {
break; // break;
} // }
//
} // }
} // }
String[] attributes = new String[200]; String[] attributes = new String[200];
......
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