修改知识库复制。
This commit is contained in:
haown
parent
a77afdb4ef
commit
1c5c0e4a0b
@ -4,14 +4,11 @@ import com.xinelu.common.annotation.Excel;
|
||||
import com.xinelu.common.core.domain.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 服务包基础信息对象 service_package
|
||||
@ -123,28 +120,9 @@ public class ServicePackage extends BaseEntity {
|
||||
@Excel(name = "是否发布，0：否，1：是")
|
||||
private Integer whetherRelease;
|
||||
|
||||
/**
|
||||
* 公共库模板id
|
||||
*/
|
||||
private Long sourceTemplateId;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("departmentId", getDepartmentId())
|
||||
.append("departmentName", getDepartmentName())
|
||||
.append("diseaseTypeId", getDiseaseTypeId())
|
||||
.append("diseaseTypeName", getDiseaseTypeName())
|
||||
.append("packageName", getPackageName())
|
||||
.append("packageIntroduction", getPackageIntroduction())
|
||||
.append("packageVersion", getPackageVersion())
|
||||
.append("packageTerm", getPackageTerm())
|
||||
.append("packageTermUnit", getPackageTermUnit())
|
||||
.append("packagePrice", getPackagePrice())
|
||||
.append("packageRemark", getPackageRemark())
|
||||
.append("hardwareType", getHardwareType())
|
||||
.append("whetherRelease", getWhetherRelease())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@ -136,7 +136,10 @@ public class ServicePackageAddDTO {
|
||||
@Excel(name = "是否发布，0：否，1：是")
|
||||
private Integer whetherRelease;
|
||||
|
||||
|
||||
/**
|
||||
* 公共库模板id
|
||||
*/
|
||||
private Long sourceTemplateId;
|
||||
|
||||
/**
|
||||
* 服务内容列表
|
||||
|
||||
@ -462,6 +462,8 @@ public class KnowledgeBaseServiceImpl implements IKnowledgeBaseService {
|
||||
ServicePackage servicePackage = servicePackageMapper.selectServicePackageById(sourceId);
|
||||
|
||||
BeanUtils.copyBeanProp(servicePackageAddDTO, servicePackage);
|
||||
servicePackageAddDTO.setId(null);
|
||||
servicePackageAddDTO.setSourceTemplateId(sourceId);
|
||||
servicePackageAddDTO.setDepartmentId(knowledgeBaseSaveDto.getDepartmentId());
|
||||
servicePackageAddDTO.setDepartmentName(knowledgeBaseSaveDto.getDepartmentName());
|
||||
|
||||
|
||||
@ -75,18 +75,7 @@ public class TextMessageServiceImpl implements ITextMessageService {
|
||||
return voList.stream().map(vo -> {
|
||||
TextMessageTaskVO taskVO = new TextMessageTaskVO();
|
||||
// 复制属性
|
||||
taskVO.setId(vo.getId());
|
||||
taskVO.setDepartmentId(vo.getDepartmentId());
|
||||
taskVO.setDepartmentName(vo.getDepartmentName());
|
||||
taskVO.setDiseaseTypeId(vo.getDiseaseTypeId());
|
||||
taskVO.setDiseaseTypeName(vo.getDiseaseTypeName());
|
||||
taskVO.setTextMessageName(vo.getTextMessageName());
|
||||
taskVO.setTextMessageId(vo.getTextMessageId());
|
||||
taskVO.setTextMessageContent(vo.getTextMessageContent());
|
||||
taskVO.setTextMessageChannel(vo.getTextMessageChannel());
|
||||
taskVO.setTextMessageStatus(vo.getTextMessageStatus());
|
||||
taskVO.setTextMessageSort(vo.getTextMessageSort());
|
||||
taskVO.setTextMessageRemark(vo.getTextMessageRemark());
|
||||
BeanUtils.copyBeanProp(taskVO, vo);
|
||||
// 提取 suitTaskList 中的 typeName 字段并用逗号拼接
|
||||
String suitTaskTypeNames = (vo.getSuitTaskList() != null) ? vo.getSuitTaskList().stream()
|
||||
.map(TextMessageSuitTask::getSuitTaskTypeName)
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xinelu.manage.vo.servicepackage;
|
||||
|
||||
import com.xinelu.common.annotation.Excel;
|
||||
import com.xinelu.manage.vo.serviceway.ServiceWayVO;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author : youxilong
|
||||
* @date : 2024/3/3 21:02
|
||||
@ -88,6 +85,11 @@ public class ServicePackageVO {
|
||||
@Excel(name = "是否发布，0：否，1：是")
|
||||
private Integer whetherRelease;
|
||||
|
||||
/**
|
||||
* 公共库模板id
|
||||
*/
|
||||
private Long sourceTemplateId;
|
||||
|
||||
/**
|
||||
* 病种名称
|
||||
*/
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
package com.xinelu.manage.vo.textmessage;
|
||||
|
||||
import com.xinelu.common.annotation.Excel;
|
||||
import com.xinelu.common.core.domain.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
@ -102,6 +100,11 @@ public class TextMessageTaskVO {
|
||||
@Excel(name = "短信备注")
|
||||
private String textMessageRemark;
|
||||
|
||||
/**
|
||||
* 公共库模板id
|
||||
*/
|
||||
private Long sourceTemplateId;
|
||||
|
||||
/**
|
||||
* 适用任务类型
|
||||
*/
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
package com.xinelu.manage.vo.wechattemplate;
|
||||
|
||||
import com.xinelu.common.annotation.Excel;
|
||||
import com.xinelu.common.core.domain.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
@ -94,6 +92,9 @@ public class WechatTemplateTaskVO {
|
||||
@Excel(name = "模板备注")
|
||||
private String templateRemark;
|
||||
|
||||
@ApiModelProperty(value = "公共模板库id")
|
||||
private Long sourceTemplateId;
|
||||
|
||||
/**
|
||||
* 适用任务类型
|
||||
*/
|
||||
|
||||
@ -77,6 +77,7 @@
|
||||
oi.operation_code,
|
||||
oi.operation_info,
|
||||
oi.operation_remark,
|
||||
oi.source_template_id,
|
||||
oi.sort,
|
||||
oi.create_by,
|
||||
oi.create_time,
|
||||
|
||||
@ -114,6 +114,7 @@
|
||||
qi.questionnaire_status,
|
||||
qi.questionnaire_sort,
|
||||
qi.questionnaire_remark,
|
||||
qi.source_template_id,
|
||||
qi.question_type,
|
||||
qi.create_by,
|
||||
qi.create_time,
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
<result property="packageRemark" column="package_remark"/>
|
||||
<result property="hardwareType" column="hardware_type"/>
|
||||
<result property="whetherRelease" column="whether_release"/>
|
||||
<result property="sourceTemplateId" column="source_template_id"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
@ -172,7 +173,8 @@
|
||||
concat(sp.package_term,sp.package_term_unit) as packageTermAndUnit,
|
||||
sp.package_price,
|
||||
sp.package_remark,
|
||||
sp.whether_release
|
||||
sp.whether_release,
|
||||
sp.source_template_id
|
||||
from service_package sp
|
||||
left join department d on d.id = sp.department_id
|
||||
<where>
|
||||
@ -267,6 +269,8 @@
|
||||
<if test="hardwareType != null">hardware_type,
|
||||
</if>
|
||||
<if test="whetherRelease != null">whether_release,
|
||||
</if>
|
||||
<if test="sourceTemplateId != null">source_template_id,
|
||||
</if>
|
||||
<if test="createBy != null">create_by,
|
||||
</if>
|
||||
@ -303,6 +307,8 @@
|
||||
<if test="hardwareType != null">#{hardwareType},
|
||||
</if>
|
||||
<if test="whetherRelease != null">#{whetherRelease},
|
||||
</if>
|
||||
<if test="sourceTemplateId != null">#{sourceTemplateId},
|
||||
</if>
|
||||
<if test="createBy != null">#{createBy},
|
||||
</if>
|
||||
|
||||
@ -127,6 +127,7 @@
|
||||
wt.template_source,
|
||||
wt.template_sort,
|
||||
wt.template_remark,
|
||||
wt.source_template_id,
|
||||
IFNULL(MAX(wtst.id), 0) AS taskId,
|
||||
GROUP_CONCAT(wtst.suit_task_type_name SEPARATOR ',') as suitTaskTypeName
|
||||
from wechat_template wt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user