diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java index c86af3d..1c62b9e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java @@ -94,7 +94,7 @@ public class SjController extends BaseController @RequiresPermissions("business:resource:sj:xq") public AjaxResult getInfo(Long id) { - return AjaxResult.success(sjService.getById(id)); + return AjaxResult.success(sjService.getInfo(id)); } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 848ce6b..fb7f226 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -626,6 +626,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi sj.setYxzqdw(studyFormFillResource.getYxzqdw()); if(sj.getId() == null) { this.save(sj); + sjList.add(sj); + sjMap.put(sj.getBh(), sj); + // 稽查轨迹 SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed", JcmcysEnum.green.getValue(), null, null, qmr); @@ -634,8 +637,6 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi // 台账 SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr); tzList.add(sjTz); - - } else { this.updateById(sj); }