Browse Source

修改导出的excel时间

master
ma 4 years ago
parent
commit
6568367940
  1. 7
      src/main/java/com/ccsens/carbasics/bean/dto/AccountDto.java
  2. 3
      src/main/java/com/ccsens/carbasics/config/SpringConfig.java
  3. 2
      src/main/java/com/ccsens/carbasics/service/ExportService.java
  4. 10
      src/main/resources/application-pre.yml
  5. 4
      src/main/resources/application.yml

7
src/main/java/com/ccsens/carbasics/bean/dto/AccountDto.java

@ -59,4 +59,11 @@ public class AccountDto {
@ApiModelProperty("申请人姓名")
private String name;
}
@Data
@ApiModel("查询医院下的职位-入参")
public static class QueryPositionOfHospital {
@ApiModelProperty("医院名称")
private String name;
}
}

3
src/main/java/com/ccsens/carbasics/config/SpringConfig.java

@ -3,6 +3,7 @@ package com.ccsens.carbasics.config;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.ccsens.util.PropUtil;
import com.ccsens.util.config.DruidProps;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -98,7 +99,7 @@ public class SpringConfig implements WebMvcConfigurer {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/uploads/**")
.addResourceLocations("file:///home/cloud/carbasics/uploads/");
.addResourceLocations("file://"+ PropUtil.path);
}
/**

2
src/main/java/com/ccsens/carbasics/service/ExportService.java

@ -280,7 +280,7 @@ public class ExportService implements IExportService{
firstCells.add(new PoiUtil.PoiUtilCell("病例状态(0:创建 1:急救审核通过 2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 6:申请拒绝')"));
list.add(firstCells);
//查询数据
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat timeParam = new SimpleDateFormat("yyyy-MM-dd");
Date parse = timeParam.parse(startTime);
long time = parse.getTime();

10
src/main/resources/application-pre.yml

@ -43,12 +43,12 @@ eureka:
ip-address: 127.0.0.1
file:
path: /home/cloud/carbasics/uploads/
domain: https://test.tall.wiki/gateway/carbasics/v4.0
imgDomain: https://test.tall.wiki/gateway/carbasics/v4.0/uploads/
path: /home/carbiscs/uploads/
domain: https://dd.tall.wiki/gateway/carbasics/v4.0
imgDomain: https://dd.tall.wiki/gateway/carbasics/v4.0/uploads/
wisdom:
weight: 10000
time: 600000
question:
template: /home/cloud/carbasics/uploads/template/暴风眼问卷导出表格模板.xlsx
pdftemplate: /home/cloud/carbasics/uploads/template/卒中绿色通道时间节点控制表form版备用.pdf
template: /home/carbasics/uploads/template/暴风眼问卷导出表格模板.xlsx
pdftemplate: /home/carbasics/uploads/template/卒中绿色通道时间节点控制表form版备用.pdf

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: test
include: common, util-test
active: prod
include: common, util-prod

Loading…
Cancel
Save