|
@@ -18,13 +18,22 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
|
|
|
|
|
|
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
|
|
|
-import com.qunzhixinxi.hnqz.admin.entity.*;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageStatus;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.WmTask;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskContent;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmDaDistributionMapper;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.*;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
@@ -196,6 +205,8 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
|
|
|
wmDaDistribution.setXsbmdjrlxfs(wmTaskContent.getTemp19());//销售部门对接人联系方式
|
|
|
wmDaDistribution.setGsjj(wmTaskContent.getTemp20());//公司简介
|
|
|
wmDaDistribution.setJyys(wmTaskContent.getTemp21());//经营优势
|
|
|
+ wmDaDistribution.setMedicineTraceability(wmTaskContent.getTemp22()); // 药品信息化追溯体系
|
|
|
+ wmDaDistribution.setMedicineTraceabilityOther(wmTaskContent.getTemp25()); // 追溯体系介绍
|
|
|
wmDaDistribution.setCreateTime(LocalDateTime.now());
|
|
|
newinfo=wmDaDistribution;
|
|
|
|
|
@@ -329,6 +340,14 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
|
|
|
resList.add(generateMap("经营优势",wmDaDistribution.getJyys(),wmTaskContent.getTemp21()));
|
|
|
newinfo.setJyys(wmTaskContent.getTemp21());
|
|
|
}
|
|
|
+ if (null != wmTaskContent.getTemp22() && !wmTaskContent.getTemp22().equals(wmDaDistribution.getMedicineTraceability())) {
|
|
|
+ resList.add(generateMap("药品信息化追溯体系", wmDaDistribution.getMedicineTraceability(), wmTaskContent.getTemp22()));
|
|
|
+ newinfo.setMedicineTraceability(wmTaskContent.getTemp22());
|
|
|
+ }
|
|
|
+ if (null != wmTaskContent.getTemp25() && !wmTaskContent.getTemp25().equals(wmDaDistribution.getMedicineTraceabilityOther())) {
|
|
|
+ resList.add(generateMap("追溯体系介绍", wmDaDistribution.getMedicineTraceabilityOther(), wmTaskContent.getTemp25()));
|
|
|
+ newinfo.setMedicineTraceabilityOther(wmTaskContent.getTemp25());
|
|
|
+ }
|
|
|
|
|
|
return resList;
|
|
|
|