diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java index b462775b..30f2a027 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java @@ -397,6 +397,7 @@ public class SubConstructionUserController extends BaseController { vo.setUploadFile("部分上传"); } dataList.add(vo); + order++; } // 写入当前Sheet的数据 excelWriter.write(dataList, writeSheet); @@ -441,7 +442,9 @@ public class SubConstructionUserController extends BaseController { } else { vo.setUploadFile("部分上传"); } + vo.setTeamName(null); dataList.add(vo); + order++; } // 写入当前Sheet的数据 excelWriter.write(dataList, writeSheet); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java index 4c139790..1f6b045a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseRewardsPunishmentsController.java @@ -87,7 +87,7 @@ public class HseRewardsPunishmentsController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("safety:rewardsPunishments:query") +// @SaCheckPermission("safety:rewardsPunishments:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java index 0fba9fad..0ed4e43e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HseRewardsPunishmentsBo.java @@ -104,7 +104,7 @@ public class HseRewardsPunishmentsBo extends BaseEntity { /** * 对象信息 */ - private List persons; + private List rpObjects; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java index 47415a68..711e3880 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRewardsPunishmentsServiceImpl.java @@ -134,7 +134,7 @@ public class HseRewardsPunishmentsServiceImpl extends ServiceImpl hseRpObjects = new ArrayList<>(); - for (HseRpObjectBo item : bo.getPersons()) { + for (HseRpObjectBo item : bo.getRpObjects()) { HseRpObject hseRpObject = new HseRpObject(); hseRpObject.setRpId(add.getId()); hseRpObject.setObjectId(item.getObjectId()); @@ -158,6 +158,19 @@ public class HseRewardsPunishmentsServiceImpl extends ServiceImpl hseRpObjects = new ArrayList<>(); + for (HseRpObjectBo item : bo.getRpObjects()) { + HseRpObject hseRpObject = new HseRpObject(); + hseRpObject.setRpId(update.getId()); + hseRpObject.setObjectId(item.getObjectId()); + hseRpObject.setObjectName(item.getObjectName()); + hseRpObject.setAmount(item.getAmount()); + hseRpObjects.add(hseRpObject); + } + if (!hseRpObjects.isEmpty()) { + rpObjectService.saveBatch(hseRpObjects); + } return baseMapper.updateById(update) > 0; }