boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -1,9 +1,11 @@
 package com.boman.web.core.controller;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
 import com.boman.common.core.utils.SecurityUtils;
+import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.core.web.page.TableDataInfo;
@@ -78,6 +80,10 @@ public class VaccineInfoController extends BaseController {
     @Log(title = "疫苗信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody VaccineInfoOperation vaccineInfo) {
+        String msg = this.validate(vaccineInfo);
+        if(StringUtils.isNotEmpty(msg)) {
+            return AjaxResult.error(msg);
+        }
         vaccineInfo.setCreateBy(SecurityUtils.getUsername());
         return toAjax(vaccineInfoService.insertVaccineInfo(vaccineInfo));
     }
@@ -89,8 +95,14 @@ public class VaccineInfoController extends BaseController {
     @Log(title = "疫苗信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody VaccineInfoOperation vaccineInfo) {
+      /*  vaccineInfo.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(vaccineInfoService.updateVaccineInfo(vaccineInfo));*/
+        String msg = this.validate(vaccineInfo);
+        if(StringUtils.isNotEmpty(msg)) {
+            return AjaxResult.error(msg);
+        }
         vaccineInfo.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(vaccineInfoService.updateVaccineInfo(vaccineInfo));
+        return vaccineInfoService.updateVaccineInfo(vaccineInfo);
     }
 
     /**
@@ -140,4 +152,32 @@ public class VaccineInfoController extends BaseController {
         vaccineInfoUserService.syncData();
         return AjaxResult.success();
     }
+
+    private String validate(VaccineInfoOperation vaccineInfo) {
+        List<VaccineInfoUser> vaccineInfoUserList = vaccineInfo.getVaccineInfoUserList();
+        String msg = "";
+        for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+            String vaccineName = vaccineInfoUser.getVaccineName();
+            Date vaccinationTime =  vaccineInfoUser.getVaccinationTime();
+            String vaccinationPlace = vaccineInfoUser.getVaccinationPlace();
+            String jici = vaccineInfoUser.getJici();
+            String progress = vaccineInfoUser.getProgress();
+            if(StringUtils.isEmpty(vaccineName) &&
+                    vaccinationTime == null  &&
+                    StringUtils.isEmpty(vaccinationPlace) &&
+                    StringUtils.isEmpty(jici) &&
+                    StringUtils.isEmpty(progress)) {
+                continue;
+            }
+            if(StringUtils.isEmpty(vaccineName) ||
+                    vaccinationTime == null  ||
+                    StringUtils.isEmpty(vaccinationPlace) ||
+                    StringUtils.isEmpty(jici) ||
+                    StringUtils.isEmpty(progress)) {
+                msg = "请确认疫苗接种信息是否填写完整！";
+                break;
+            }
+        }
+        return msg;
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/IVaccineInfoService.java

@@ -1,5 +1,6 @@
 package com.boman.web.core.service.vaccineInfo;
 
+import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.VaccineInfoOperation;
 
 import java.util.List;
@@ -42,7 +43,7 @@ public interface IVaccineInfoService
      * @param vaccineInfo 疫苗信息
      * @return 结果
      */
-    public int updateVaccineInfo(VaccineInfoOperation vaccineInfo);
+    public AjaxResult updateVaccineInfo(VaccineInfoOperation vaccineInfo);
 
     /**
      * 批量删除疫苗信息

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.domain.SysDictData;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.VaccineInfoOperation;
 import com.boman.web.core.domain.VaccineInfoUser;
 import com.boman.web.core.mapper.VaccineInfoOperationMapper;
@@ -402,7 +403,19 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
      */
     @Override
     @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-    public int updateVaccineInfo(VaccineInfoOperation vaccineInfo) {
+    public AjaxResult updateVaccineInfo(VaccineInfoOperation vaccineInfo) {
+        // 根据身份证查询数据
+        VaccineInfoOperation oldInfo = this.findHjInfo(vaccineInfo);
+        boolean neetUpdate = false;
+        if(oldInfo != null) {
+            // 如果数据不等，即添加了一个别人的已存在身份证
+            if(oldInfo.getId() != vaccineInfo.getId()) {
+                AjaxResult.error("此身份证号非本人，请确认后再次输入！");
+            }
+        }else {
+            neetUpdate = true;
+        }
+
         vaccineInfo.setUpdateTime(DateUtils.getNowDate());
 //        genNowIn(vaccineInfo);
         List<VaccineInfoUser> vaccineInfoUserList = vaccineInfo.getVaccineInfoUserList();
@@ -427,6 +440,9 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                         jiCi = vaccineInfoUser.getJici();
                     }
                     vaccineName = vaccineInfoUser.getVaccineName();
+                    if(neetUpdate) {
+                        vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                    }
                     vaccineInfoUserMapper.updateVaccineInfoUser(vaccineInfoUser);
                 } else {
                     if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
@@ -465,7 +481,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         vaccineInfoOperationNew.setCreateBy(SecurityUtils.getUsername());
         vaccineInfoOperationNew.setVaccineInfoId(vaccineInfo.getId());
         vaccineInfoOperationMapper.insertVaccineInfoOperation(vaccineInfoOperationNew);
-        return info;
+        return AjaxResult.success();
     }
 
     /**