Sfoglia il codice sorgente

【CHG】修改实验报告

ZhaoMn 3 anni fa
parent
commit
d58c27046a

+ 4 - 0
railway-business/src/main/java/com/railway/business/safetool/domain/BaseSafetyTool.java

@@ -32,6 +32,10 @@ public class BaseSafetyTool extends BaseEntity {
   @ApiModelProperty(value = "车间id")
   private Long deptId;
 
+  @ApiModelProperty(value = "导出Excel序号")
+  @Excel(name = "序号")
+  private int seq;
+
   @ApiModelProperty(value = "车间名称")
   @Excel(name = "车间名称")
   private String deptName;

+ 2 - 0
railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentServiceImpl.java

@@ -117,7 +117,9 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
     List<BaseSafetyTool> toolList = toolMapper.listByExperimentId(secExperiment.getId());
     reportVo.setTotal(toolList.size());
     List<Integer> toolCycleList = new ArrayList<>();
+    int seq = 1;
     for (BaseSafetyTool tool : toolList) {
+      tool.setSeq(seq++);
       toolCycleList.add(tool.getTestCycle());
       ExpReportDetailVo detail = detailMap.get(tool.getToolType());
       if (null == detail) {

BIN
railway-business/src/main/resources/excel/template/绝缘工具试验记录.xls