核酸记录_新增

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description 核酸检测-上报核酸记录
@@ -76,16 +77,15 @@ public class AddIcNatFormDTO implements Serializable {
      */
     private String attachmentUrl;
     /**
-     * 通知渠道 0小程序通知，1短信通知,多选用逗号分隔(0,1)
+     * 通知渠道 0小程序通知，1短信通知，多选是数组
      */
-    private String channel;
+    private List<String> channel;
     /**
      * 通知内容
      */
     private String content;
 
     //token中信息
-    private String staffId;
     private String customerId;
 
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java

@@ -79,7 +79,6 @@ public class IcNatController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddIcNatFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddIcNatFormDTO.Nat.class);
-        formDTO.setStaffId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         icNucleinService.add(formDTO);
         return new Result();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcNatDao;
 import com.epmet.dto.IcNatDTO;
@@ -88,6 +92,19 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
      **/
     @Override
     public void add(AddIcNatFormDTO formDTO) {
+        //1.获取所填居民所属组织缓存信息
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId());
+        if (null == agencyInfo) {
+            throw new RenException(String.format("获取组织缓存信息失败%s", formDTO.getAgencyId()));
+        }
+        //2.新增核酸记录表数据
+        IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class);
+        insert(entity);
+
+        //3.新增通知表信息
+        if(formDTO.getChannel().size()> NumConstant.ZERO){
+            //TODO
+        }
 
     }