lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
@@ -62,9 +62,6 @@ /**列表 保养项明细*/ @ApiModelProperty(value = "列表 保养项明细") private List<EamMaintenanceStandardDetail> tableDetailList; /**删除 保养项明细*/ @ApiModelProperty(value = "删除 保养项明细") private List<EamMaintenanceStandardDetail> removeDetailList; /** * Excel导入时使用 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -211,25 +211,17 @@ //处理详情 if (CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) { List<EamMaintenanceStandardDetail> addList = new ArrayList<>(); List<EamMaintenanceStandardDetail> updateList = new ArrayList<>(); //先删除原有 LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardRequest.getId()); eamMaintenanceStandardDetailService.remove(queryWrapper); standardRequest.getTableDetailList().forEach(tableDetail -> { tableDetail.setStandardId(entity.getId()); if (tableDetail.getId() == null) { addList.add(tableDetail); } else { updateList.add(tableDetail); } EamMaintenanceStandardDetail eamMaintenanceStandardDetail=new EamMaintenanceStandardDetail(); BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail); eamMaintenanceStandardDetail.setStandardId(entity.getId()); addList.add(eamMaintenanceStandardDetail); }); if (CollectionUtil.isNotEmpty(addList)) { eamMaintenanceStandardDetailService.saveBatch(addList); } if (CollectionUtil.isNotEmpty(updateList)) { eamMaintenanceStandardDetailService.updateBatchById(updateList); } } if (CollectionUtil.isNotEmpty(standardRequest.getRemoveDetailList())) { List<String> ids = standardRequest.getRemoveDetailList().stream().map(EamMaintenanceStandardDetail::getId).collect(Collectors.toList()); eamMaintenanceStandardDetailService.removeBatchByIds(ids); } return true; } @@ -1176,7 +1168,6 @@ // 创建保养项目 EamMaintenanceStandardDetail item = new EamMaintenanceStandardDetail(); item.setItemCategory("THIRD_MAINTENANCE"); item.setStandardId(standardId); int colCount = row.getTableCells().size(); lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -89,7 +89,7 @@ - classpath:/templates # 设置静态文件路径,js,css等 mvc: static-path-pattern: /** static-path-pattern: C:\Users\root\Desktop\** #Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher pathmatch: matching-strategy: ant_path_matcher @@ -132,11 +132,11 @@ connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_430 url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_430_NEW # url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_430 # url: jdbc:sqlserver://192.168.124.118:1433;databasename=EAM_430_TEST username: sa password: 123 password: driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver # 多数据源配置 #multi-datasource1: @@ -149,7 +149,7 @@ database: 0 host: 127.0.0.1 port: 6379 password: password: "123456" #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml