Browse Source

fix:[试验管理][物资列表]试剂列表

master
HanLong 3 months ago
parent
commit
5054c60d00
2 changed files with 4 additions and 3 deletions
  1. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java
  2. +3
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java View File

@ -94,7 +94,7 @@ public class SjController extends BaseController
@RequiresPermissions("business:resource:sj:xq") @RequiresPermissions("business:resource:sj:xq")
public AjaxResult getInfo(Long id) public AjaxResult getInfo(Long id)
{ {
return AjaxResult.success(sjService.getById(id));
return AjaxResult.success(sjService.getInfo(id));
} }
/** /**

+ 3
- 2
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java View File

@ -626,6 +626,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
sj.setYxzqdw(studyFormFillResource.getYxzqdw()); sj.setYxzqdw(studyFormFillResource.getYxzqdw());
if(sj.getId() == null) { if(sj.getId() == null) {
this.save(sj); this.save(sj);
sjList.add(sj);
sjMap.put(sj.getBh(), sj);
// 稽查轨迹 // 稽查轨迹
SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed", SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed",
JcmcysEnum.green.getValue(), null, null, qmr); 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); SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr);
tzList.add(sjTz); tzList.add(sjTz);
} else { } else {
this.updateById(sj); this.updateById(sj);
} }

Loading…
Cancel
Save