格式化代码

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 6f363d0fee687011f3fd37341fd7afbbdd2805c4
+Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java

@@ -54,14 +54,8 @@ public class VaccinationInfoController {
     public Result save(@RequestBody VaccinationInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        // 剂次重复校验
-        if (vaccinationInfoService.checkVaccination(dto).isEmpty()) {
-            vaccinationInfoService.save(dto);
-            epidemicUserInfoService.updateVaccinationInfo(dto);
-        } else {
-            return new Result().error("接种剂次重复");
-        }
-        return new Result();
+
+        return vaccinationInfoService.saveNew(dto);
     }
 
     @PutMapping

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.vaccine.vim.service;
 
 
 import com.elink.esua.epdc.commons.mybatis.service.CrudService;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO;
 import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity;
 
@@ -34,4 +35,14 @@ public interface VaccinationInfoService extends CrudService<VaccinationInfoEntit
      * @date 2021/5/6 9:53
      */
     boolean beforeDelete(VaccinationInfoDTO dto);
+
+    /**
+     * 新增时增加校验
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/5/7 13:42
+     */
+    Result saveNew(VaccinationInfoDTO dto);
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java

@@ -1,16 +1,16 @@
 package com.elink.esua.epdc.vaccine.vim.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.vaccine.common.base.BaseVimCurdServiceImpl;
+import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
 import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao;
 import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO;
 import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity;
 import com.elink.esua.epdc.vaccine.vim.service.VaccinationInfoService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,6 +26,9 @@ import java.util.stream.Collectors;
 @Service
 public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<VaccinationInfoDao, VaccinationInfoEntity, VaccinationInfoDTO> implements VaccinationInfoService {
 
+    @Autowired
+    private EpidemicUserInfoService epidemicUserInfoService;
+
     @Override
     public QueryWrapper<VaccinationInfoEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get("id");
@@ -62,4 +65,18 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
         int maxDose = checkInfoList.stream().collect(Collectors.summarizingInt(VaccinationInfoEntity::getDose)).getMax();
         return maxDose <= dose;
     }
+
+    @Override
+    public Result saveNew(VaccinationInfoDTO dto) {
+        // 剂次重复校验
+        if (checkVaccination(dto).isEmpty()) {
+            dto.setId(null);
+            VaccinationInfoEntity entity = ConvertUtils.sourceToTarget(dto, VaccinationInfoEntity.class);
+            baseDao.insert(entity);
+            epidemicUserInfoService.updateVaccinationInfo(dto);
+        } else {
+            return new Result().error("接种剂次重复");
+        }
+        return new Result();
+    }
 }