From 7ef372c6316798939cd24022ea2218e43ebf1f87 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 21 Mar 2024 14:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A4=E7=90=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=BF=94=E5=9B=9E=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/WxNursingLogMapper.xml         | 3 +++
 .../miniProgram/controller/WxNursingLogController.java       | 5 ++---
 .../miniProgram/service/impl/WxNursingLogServiceImpl.java    | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

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>
 
     <insert id="insertWxNursingLog" parameterType="WxNursingLog" useGeneratedKeys="true" keyProperty="id">
+        <selectKey keyProperty="id" resultType="Long" order="AFTER">
+            SELECT LAST_INSERT_ID()
+        </selectKey>
         insert into wx_nursing_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
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));
         }
     }