宠物食品审核完成后自动同步科研

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/CommonSampleEditServiceImpl.java

@@ -96,10 +96,12 @@ public class CommonSampleEditServiceImpl implements SampleEditService {
                 dingMsg = String.format("【%s】【%s/%s】%s同意，请进行审查", projectType, previousStatus, previousUser, now);
                 break;
             case COMPLETED:
-                //自动【执行】到科研管理系统，并【同步】到lis系统；为了不出现循环依赖，使用事件；目前只有<动物样本检测>、<宠物食品检测>
-                if (SampleTypeEnum.ANIMAL.getType().equals(sampleInfo.getType()) || SampleTypeEnum.ANIMAL_FOOD.getType().equals(sampleInfo.getType())) {
+                //自动【执行】到科研管理系统，并【同步】到lis系统；为了不出现循环依赖，使用事件
+                if (SampleTypeEnum.ANIMAL.getType().equals(sampleInfo.getType())) {
                     applicationContext.publishEvent(new SyncKyEvent(sampleId));
                     applicationContext.publishEvent(new SyncLisEvent(sampleId));
+                } else if (SampleTypeEnum.ANIMAL_FOOD.getType().equals(sampleInfo.getType())) {
+                    applicationContext.publishEvent(new SyncKyEvent(sampleId));
                 }
                 return;
             default:

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleFoodServiceImpl.java

@@ -16,13 +16,11 @@ import cn.hutool.crypto.digest.DigestUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.jfcloud.admin.api.sys.dto.message.MessageUserDTO;
 import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.gene.cache.UserIdNameCache;
 import com.github.jfcloud.gene.common.constant.StrConstant;
 import com.github.jfcloud.gene.common.constant.WhetherEnum;
 import com.github.jfcloud.gene.common.util.CustomIdGenerator;
-import com.github.jfcloud.gene.common.util.UserUtil;
 import com.github.jfcloud.gene.constants.ConstantField;
 import com.github.jfcloud.gene.constants.GeneStatusEnum;
 import com.github.jfcloud.gene.file.service.FileInfoService;
@@ -352,36 +350,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
 
     @Override
     public void afterAudit(Long sampleId) {
-        SampleInfo sampleInfo = sampleInfoMapper.selectById(sampleId);
-        if (sampleInfo == null) {
-            return;
-        }
-
         SampleEditService.super.afterAudit(sampleId);
-
-        //如果审核完成，提醒送检人和收样人
-        if (GeneStatusEnum.COMPLETED.getStatus().equals(sampleInfo.getStatus())) {
-            String now = DateUtil.format(new Date(), DatePattern.CHINESE_DATE_TIME_PATTERN);
-            String dingMsg = String.format("【%s】【%s/%s】%s同意，审核完成", sampleInfo.projectType(),
-                    GeneStatusEnum.PROJECT_MANAGEMENT.getDescription(), UserUtil.getNickName(), now);
-
-            //查询是否需要钉钉通知
-            String key = String.format("sample.%s.dingding.enable", sampleInfo.getStatus());
-            if (systemPropertiesService.getBooleanValue(key)) {
-                SampleFoodVo detail = getDetail(sampleId);
-
-                List<MessageUserDTO> messageUsers = new ArrayList<>();
-                MessageUserDTO user1 = new MessageUserDTO();
-                user1.setUserId(detail.getSenderContactId());
-                messageUsers.add(user1);
-                MessageUserDTO user2 = new MessageUserDTO();
-                user2.setUserId(detail.getReceiverId());
-                messageUsers.add(user2);
-                notifyService.sendDingding("样本送检", dingMsg, messageUsers);
-            }
-            return;
-        }
-
         commonSampleEditService.afterAudit(sampleId);
     }