导出excel修改

modules/core/src/main/java/com/jeesite/modules/sys/dao/DictCusDataDao.java

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.modules.sys.dao;
+
+import com.jeesite.common.dao.CrudDao;
+import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import com.jeesite.modules.sys.entity.DictData;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * 岗位管理DAO接口
+ * @author ThinkGem
+ * @version 2017-03-25
+ */
+@MyBatisDao
+@ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true)
+public interface DictCusDataDao extends CrudDao<DictData> {
+    DictData getDictDataByType(@Param("dictType") String dictType,@Param("dictValue") String dictValue);
+
+}

modules/core/src/main/resources/mappings/modules/sys/DictCusDataDao.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeesite.modules.sys.dao.DictCusDataDao">
+
+	<select id="getDictDataByType" resultType="com.jeesite.modules.sys.entity.DictData">
+         select * from js_sys_dict_data where dict_type =#{dictType} and dict_value =#{dictValue} limit 0,1
+	</select>
+</mapper>

modules/report/src/main/java/com/jeesite/modules/report/dao/ResearchReportDao.java

@@ -4,6 +4,7 @@ import com.jeesite.common.dao.CrudDao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.report.dto.ResearchReportDto;
 import com.jeesite.modules.report.entity.ResearchReport;
+import com.jeesite.modules.sys.entity.DictData;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -109,4 +110,5 @@ public interface ResearchReportDao extends CrudDao<ResearchReport> {
      * @return
      */
     List<ResearchReport> findReportLTList();
+
 }

modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java

@@ -1,5 +1,6 @@
 package com.jeesite.modules.report.dto;
 
+import com.jeesite.common.constant.Constants;
 import com.jeesite.common.utils.excel.annotation.ExcelField;
 import com.jeesite.common.utils.excel.annotation.ExcelFields;
 import java.io.Serializable;
@@ -7,7 +8,7 @@ import java.io.Serializable;
 public class ResearchReportDto implements Serializable {
     @ExcelFields({
         @ExcelField(title = "TITLE",attrName = "title",align = ExcelField.Align.AUTO,sort = 10),
-        @ExcelField(title = "SUBJECT",attrName = "marketType",align = ExcelField.Align.AUTO,dictType = "reports_category",sort = 20),
+        @ExcelField(title = "SUBJECT",attrName = "marketType",align = ExcelField.Align.AUTO,sort = 20),
         @ExcelField(title = "ABSTRACT",attrName = "reportScopeHtml",align = ExcelField.Align.AUTO,sort = 30),
         @ExcelField(title = "TABLE OF CONTENTS",attrName = "directoryHtml",align = ExcelField.Align.AUTO,sort = 40),
     })

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java

@@ -22,6 +22,9 @@ import com.jeesite.modules.report.entity.ResearchReport;
 import com.jeesite.modules.report.entity.SiteInfo;
 import com.jeesite.modules.report.util.TransContentUtils;
 import com.jeesite.modules.report.util.XmlUtils;
+import com.jeesite.modules.sys.dao.DictCusDataDao;
+import com.jeesite.modules.sys.dao.DictDataDao;
+import com.jeesite.modules.sys.entity.DictData;
 import com.jeesite.modules.sys.utils.RedisUtil;
 import org.dom4j.DocumentException;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -44,6 +47,10 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 	private TemplateInfoDao templateInfoDao;
 	@Resource
 	private SiteInfoDao siteInfoDao;
+
+	@Resource
+	private DictCusDataDao dictCusDataDao;
+
 	@Resource
 	private ReportHtmlDao reportHtmlDao;
 	@Resource
@@ -63,7 +70,6 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 	/**
 	 * 查询分页数据
 	 * @param researchReport 查询条件
-	 * @param researchReport.page 分页对象
 	 * @return
 	 */
 	@Override
@@ -1041,4 +1047,8 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 		}
 		return msg.toString();
 	}
+
+	public DictData getDictDataByType(String dictType,String dictValue){
+		return dictCusDataDao.getDictDataByType(dictType,dictValue);
+	}
 }

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java

@@ -15,6 +15,9 @@ import com.jeesite.modules.report.dto.ResearchReportMarketDrivenDto;
 import com.jeesite.modules.report.dto.ResearchReportMarketScaleDto;
 import com.jeesite.modules.report.entity.ResearchReport;
 import com.jeesite.modules.report.service.ResearchReportService;
+import com.jeesite.modules.sys.entity.DictData;
+import com.jeesite.modules.sys.service.DictDataService;
+import com.jeesite.modules.sys.service.DictTypeService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.dom4j.DocumentException;
 import org.jsoup.Jsoup;
@@ -58,6 +61,7 @@ public class ResearchReportController extends BaseController {
 	private ResearchReportService researchReportService;
 	@Resource
 	private ResearchReportAsyncService researchReportAsyncService;
+
 	@Value("${file.baseDir}")
 	private String basePath;
 	private static final String TEMP_PATH = "/temp";
@@ -346,6 +350,7 @@ public class ResearchReportController extends BaseController {
 			listExcel = list.stream().map(vo -> {
 				vo.setReportScopeHtml(convertMarket(vo.getMarketScale(), vo.getMarketDriven(), vo.getLang()) + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
+				vo.setMarketType(convertMarketType(vo.getMarketType(), vo.getLang()));
 				return vo;
 			}).collect(Collectors.toList());
 		}
@@ -456,4 +461,18 @@ public class ResearchReportController extends BaseController {
 		sb.append("\\n\\n");
 		return Html2PlainTxtUtils.convert(sb.toString());
 	}
+
+	private String convertMarketType(String marketTypeValue, String lang) {
+		if (StringUtils.isEmpty(marketTypeValue) && StringUtils.isEmpty(marketTypeValue)) {
+			return "";
+		}
+		String dictType = "reports_category";
+		if (Constants.lang.ZH_CH.equals(lang)) {
+			dictType = "reports_category";
+		} else {
+			dictType = "reports_category_en";
+		}
+		DictData dictData = researchReportService.getDictDataByType(dictType,marketTypeValue);
+		return null!=dictData ?dictData.getDictLabel():"";
+	}
 }

modules/report/src/main/resources/mappings/modules/report/ResearchReportDao.xml

@@ -291,4 +291,5 @@
 	<select id="findReportLTList" resultType="com.jeesite.modules.report.entity.ResearchReport">
 		select id,lang,web_title from research_report where is_replace != '0' or is_replace is null
 	</select>
+
 </mapper>