修改上传体成分数据删除不掉bug

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java

@@ -32,7 +32,7 @@ public interface ExternalDao {
     /**
      * 查询是否已有主测试记录
      */
-    ExternalVo.UserInfo motionQueryMemberInfo(@Param("memberid") String memberid,
+    List<ExternalVo.UserInfo> motionQueryMemberInfo(@Param("memberid") String memberid,
                                               @Param("testData")Date testData,
                                               @Param("Title") String Title);
 

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java

@@ -233,12 +233,14 @@ public class ExternalServiceImpl implements ExternalService {
     @Override
     public int motionAdd(ExternalDto.RtcfInfo rtcfInfoDto) {
         //查询今日是否已有测试数据， 如有则删除后新增
-        ExternalVo.UserInfo userInfo = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle());
-        if (userInfo != null) {
+        List<ExternalVo.UserInfo> userInfos = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle());
+        if (CollectionUtil.isNotEmpty(userInfos)) {
             //删除数据
-            externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA");
-            externalDao.delData(userInfo.getTestID());
-            externalDao.delAdvice(userInfo.getTestID());
+            for (ExternalVo.UserInfo userInfo : userInfos) {
+                externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA");
+                externalDao.delData(userInfo.getTestID());
+                externalDao.delAdvice(userInfo.getTestID());
+            }
         }
 
         ExternalDto.RtcfInfo.Advice advice = rtcfInfoDto.getAdvice();
@@ -259,12 +261,14 @@ public class ExternalServiceImpl implements ExternalService {
     @Override
     public int motionAddTcf(ExternalDto.BcaData bcaData) {
         //查询今日是否已有测试数据， 如有则删除后新增
-        ExternalVo.UserInfo userInfo = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle());
-        if (userInfo != null) {
+        List<ExternalVo.UserInfo> userInfos = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle());
+        if (CollectionUtil.isNotEmpty(userInfos)) {
             //删除数据
-            externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA");
-            externalDao.delRecord(userInfo.getUID());
-            externalDao.delBcaAdvice(userInfo.getUID());
+            for (ExternalVo.UserInfo userInfo : userInfos) {
+                externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA");
+                externalDao.delRecord(userInfo.getUID());
+                externalDao.delBcaAdvice(userInfo.getUID());
+            }
         }
 
         if (bcaData.getData() != null) {

acupuncture-system/src/main/resources/mapper/dao/ExternalDao.xml

@@ -104,9 +104,9 @@
             <if test="memberid != null and memberid != ''">
                 and t.UID = #{memberid}
             </if>
-            <if test="testData != null">
-                and t.TestDate = #{testData}
-            </if>
+<!--            <if test="testData != null">-->
+<!--                and t.TestDate = #{testData}-->
+<!--            </if>-->
             <if test="Title != null">
                 and t.Title = #{Title}
             </if>