diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml index afd5547..ba64a2c 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml @@ -113,6 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + SELECT LAST_INSERT_ID() + insert into wx_nursing_log user_id, diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java index d9b77cd..2fef5d2 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java @@ -42,7 +42,7 @@ public class WxNursingLogController extends BaseController { } /** - * 查询用户护理记录的当月统计信息 + * 查询用户护理记录的当月统计信息(WL200仪器) */ @GetMapping("/statistics") public R statistics(@RequestParam(value = "instrumentId") Long instrumentId) { @@ -57,7 +57,6 @@ public class WxNursingLogController extends BaseController { public R add(@Validated @RequestBody WxNursingLogReq wxNursingLogReq) { // 防止前端传输数据进来 wxNursingLogReq.setCompletionPercentage(null); - wxNursingLogService.insertWxNursingLog(wxNursingLogReq); - return R.ok(); + return R.ok(wxNursingLogService.insertWxNursingLog(wxNursingLogReq)); } } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java index acba407..87696bf 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -128,7 +128,7 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { * 新增用户护理日志 */ @Override - public void insertWxNursingLog(WxNursingLogReq wxNursingLogReq) { + public Long insertWxNursingLog(WxNursingLogReq wxNursingLogReq) { /* 查询 同一仪器,同一模式 下,是否有相同的记录,如果有合并护理时间 */ WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(wxNursingLogReq.getInstrumentId()); if (wxInstrument == null) { @@ -243,6 +243,7 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { updateNursingLog.setUpdateBy(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); updateNursingLog.setUpdateTime(DateUtils.getNowDate()); wxNursingLogMapper.updateWxNursingLog(updateNursingLog); + return wxNursingLog.getId(); } else { // 不存在,新增 WxNursingLog wxNursingLog = new WxNursingLog(); @@ -344,7 +345,7 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { wxNursingLog.setNursingDaysMonth(1); wxNursingLog.setNursingDaysWeek(1); } - wxNursingLogMapper.insertWxNursingLog(wxNursingLog); + return Long.valueOf(wxNursingLogMapper.insertWxNursingLog(wxNursingLog)); } }