diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java index 76b43cc..97d0b7f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java @@ -58,6 +58,16 @@ public class BusTemplateInfo extends BaseEntity private List attrInfoList; + private List attrConfigList; + + public List getAttrConfigList() { + return attrConfigList; + } + + public void setAttrConfigList(List attrConfigList) { + this.attrConfigList = attrConfigList; + } + public List getAttrInfoList() { return attrInfoList; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java index a4ce3ed..33e67a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java @@ -2,7 +2,9 @@ package com.ruoyi.business.service.impl; import java.util.List; +import com.ruoyi.business.domain.BusTemplateAttrConfig; import com.ruoyi.business.domain.BusTemplateAttrInfo; +import com.ruoyi.business.mapper.BusTemplateAttrConfigMapper; import com.ruoyi.business.mapper.BusTemplateAttrInfoMapper; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.model.LoginUser; @@ -30,6 +32,9 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService @Autowired private BusTemplateAttrInfoMapper busTemplateAttrInfoMapper; + @Autowired + private BusTemplateAttrConfigMapper busTemplateAttrConfigMapper; + @Autowired private RuoYiConfig ruoyiConfig; /** @@ -45,7 +50,11 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService BusTemplateAttrInfo busTemplateAttrInfo = new BusTemplateAttrInfo(); busTemplateAttrInfo.setTemplateId(id); List list1 = busTemplateAttrInfoMapper.selectBusTemplateAttrInfoList(busTemplateAttrInfo); + BusTemplateAttrConfig busTemplateAttrConfig = new BusTemplateAttrConfig(); + busTemplateAttrConfig.setTemplateType("word"); + List list2 = busTemplateAttrConfigMapper.selectBusTemplateAttrConfigList(busTemplateAttrConfig); busTemplateInfo.setAttrInfoList(list1); + busTemplateInfo.setAttrConfigList(list2); return busTemplateInfo; } diff --git a/ruoyi-ui/src/views/statistics/daily/index.vue b/ruoyi-ui/src/views/statistics/daily/index.vue index 89e972c..3c83a52 100644 --- a/ruoyi-ui/src/views/statistics/daily/index.vue +++ b/ruoyi-ui/src/views/statistics/daily/index.vue @@ -93,6 +93,16 @@ + + {{item.attrName}} + + @@ -268,7 +278,20 @@ export default { this.download('business/template/export', { ...this.queryParams }, `template_${new Date().getTime()}.xlsx`) + }, + clickContent(event,content){ + // console.log(event,content) + this.form.templateContent += '

'+content+'

' + }, + handleClose(content){ + content = '

'+content+'

' + this.form.templateContent = this.form.templateContent.replace(content, ''); } } }; +