java/estate_expert.git

			@@ -13,6 +13,7 @@
			import com.estate.expert.admin.stat.report.render.AbstractInfoTablePolicy;
			import com.estate.expert.admin.stat.report.render.CheckInfoTablePolicy;
			import com.estate.expert.admin.stat.report.render.CustomPictureRenderPolicy;
			import com.estate.expert.admin.stat.report.render.DeviceGroupTablePolicy;
			import org.springframework.core.io.ClassPathResource;
			import org.springframework.util.CollectionUtils;

			@@ -87,7 +88,7 @@
			*/
			private ConfigureBuilder initConfig(Map<String, Boolean> viewConfig){
			ConfigureBuilder builder = Configure.builder();
			builder.bind("data.设备分组信息", new LoopRowTableRenderPolicy());
			builder.bind("data.设备分组信息", new DeviceGroupTablePolicy());
			builder.bind("data.评估结果.隐患等级分布.分项", new LoopRowTableRenderPolicy());
			builder.bind("分项评估", new CheckInfoTablePolicy());

			@@ -28,6 +28,10 @@
			@SuperBuilder
			public abstract class ReportDataBase {

			private static final String DAIGUAN_REMARK = "岱观科技";
			private static final String DEFAULT_COMPANY_NAME = "四川信立隆第三方评估咨询有限公司";
			private static final String DAIGUAN_COMPANY_NAME = "四川岱观科技有限公司";

			ReportTemplate template;

			List<Device> devices;
			@@ -71,10 +75,17 @@
			result.put("报告年份", reportDate.getYear());
			result.put("报告月份", reportDate.getMonthValue());
			result.put("报告日期日", reportDate.getDayOfMonth());
			result.put("公司名称", "四川信立隆第三方评估咨询有限公司");
			result.put("公司名称", buildCompanyName());
			return result;
			}

			private String buildCompanyName() {
			if (template != null && DAIGUAN_REMARK.equals(template.getRemark())) {
			return DAIGUAN_COMPANY_NAME;
			}
			return DEFAULT_COMPANY_NAME;
			}

			/**
			* 构建设备信息
			* @return 设备信息

	admin-server/src/main/java/com/estate/expert/admin/stat/report/builder/SystemReportBuilder.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin-server/src/main/resources/templates/第三方评估报告new.docx	补丁 \| 查看 \| 原始文档 \| blame \| 历史