Merge remote-tracking branch 'origin/master'

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

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,8 +80,12 @@ 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));
+        return 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;
@@ -34,7 +35,7 @@ public interface IVaccineInfoService
      * @param vaccineInfo 疫苗信息
      * @return 结果
      */
-    public int insertVaccineInfo(VaccineInfoOperation vaccineInfo);
+    public AjaxResult insertVaccineInfo(VaccineInfoOperation vaccineInfo);
 
     /**
      * 修改疫苗信息
@@ -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

@@ -2,10 +2,7 @@ package com.boman.web.core.service.vaccineInfo.impl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -13,8 +10,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
+import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.domain.SysDept;
 import com.boman.domain.SysDictData;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.web.core.domain.VaccineInfoOperation;
 import com.boman.web.core.domain.VaccineInfoUser;