Prechádzať zdrojové kódy

【CHG】统一代码字段类型

zhaomn 2 rokov pred
rodič
commit
9db94d07ac
24 zmenil súbory, kde vykonal 867 pridanie a 275 odobranie
  1. 72 0
      railway-business/src/main/java/com/railway/business/bi/controller/ShowFileController.java
  2. 18 8
      railway-business/src/main/java/com/railway/business/bi/domain/ShowBdyc.java
  3. 10 4
      railway-business/src/main/java/com/railway/business/bi/domain/ShowBpdjxjh.java
  4. 15 6
      railway-business/src/main/java/com/railway/business/bi/domain/ShowDlyc.java
  5. 52 0
      railway-business/src/main/java/com/railway/business/bi/domain/ShowFile.java
  6. 22 21
      railway-business/src/main/java/com/railway/business/bi/domain/ShowGsd.java
  7. 26 14
      railway-business/src/main/java/com/railway/business/bi/domain/ShowGsy.java
  8. 37 31
      railway-business/src/main/java/com/railway/business/bi/domain/ShowSbxj.java
  9. 13 4
      railway-business/src/main/java/com/railway/business/bi/domain/ShowTestPlanDt.java
  10. 13 4
      railway-business/src/main/java/com/railway/business/bi/domain/ShowTestPlanKg.java
  11. 13 3
      railway-business/src/main/java/com/railway/business/bi/domain/ShowYdts.java
  12. 44 0
      railway-business/src/main/java/com/railway/business/bi/mapper/ShowFileMapper.java
  13. 37 0
      railway-business/src/main/java/com/railway/business/bi/service/IShowFileService.java
  14. 74 0
      railway-business/src/main/java/com/railway/business/bi/service/impl/ShowFileServiceImpl.java
  15. 45 9
      railway-business/src/main/resources/mapper/bi/ShowBdycMapper.xml
  16. 10 30
      railway-business/src/main/resources/mapper/bi/ShowBpdjxjhMapper.xml
  17. 44 7
      railway-business/src/main/resources/mapper/bi/ShowDlycMapper.xml
  18. 188 0
      railway-business/src/main/resources/mapper/bi/ShowFileMapper.xml
  19. 10 30
      railway-business/src/main/resources/mapper/bi/ShowGsdMapper.xml
  20. 10 30
      railway-business/src/main/resources/mapper/bi/ShowGsyMapper.xml
  21. 47 7
      railway-business/src/main/resources/mapper/bi/ShowSbxjMapper.xml
  22. 10 30
      railway-business/src/main/resources/mapper/bi/ShowTestPlanDtMapper.xml
  23. 10 30
      railway-business/src/main/resources/mapper/bi/ShowTestPlanKgMapper.xml
  24. 47 7
      railway-business/src/main/resources/mapper/bi/ShowYdtsMapper.xml

+ 72 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowFileController.java

@@ -0,0 +1,72 @@
+package com.railway.business.bi.controller;
+
+import com.railway.business.bi.domain.ShowFile;
+import com.railway.business.bi.service.IShowFileService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaomn
+ */
+@Api(value = "rest/bi", tags = "大屏展示-导入文件记录")
+@RestController
+@Validated
+@RequestMapping(value = "business/bi")
+public class ShowFileController extends BaseController {
+
+  private final IShowFileService showFileService;
+
+  public ShowFileController(IShowFileService showFileService) {
+    this.showFileService = showFileService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody ShowFile showFile) {
+    return toAjax(showFileService.create(showFile));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam String[] ids) {
+    return toAjax(showFileService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid ShowFile showFile) {
+    return toAjax(showFileService.update(showFile));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    ShowFile info = showFileService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(ShowFile showFile) {
+    startPage();
+    List<ShowFile> list = showFileService.getList(showFile);
+    return getDataTable(list);
+  }
+
+}

+ 18 - 8
railway-business/src/main/java/com/railway/business/bi/domain/ShowBdyc.java

@@ -4,10 +4,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-变电异常信息详情表
@@ -20,11 +21,12 @@ import org.hibernate.validator.constraints.Length;
 public class ShowBdyc extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
-  @JsonFormat(pattern = "yyyy-MM-dd")
   @ApiModelProperty(value = "发现时间")
-  private Date foundDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate foundDate;
 
   @ApiModelProperty(value = "线别")
   @Length(min = 1, max = 255, message = "【线别】长度必须介于 {min} 和 {max} 之间")
@@ -70,16 +72,24 @@ public class ShowBdyc extends BaseEntity {
   @Length(min = 1, max = 255, message = "【整改措施】长度必须介于 {min} 和 {max} 之间")
   private String rectifyWay;
 
-  @JsonFormat(pattern = "yyyy-MM-dd")
   @ApiModelProperty(value = "整改时间")
-  private Date rectifyDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate rectifyDate;
 
   @ApiModelProperty(value = "计数")
   private Integer counted;
 
+  @ApiModelProperty(value = "计划处理时间(每周倒排计划)")
   @JsonFormat(pattern = "yyyy-MM-dd")
-  @ApiModelProperty(value = "计划处理时间\n(每周倒排计划)")
-  private Date planDate;
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate planDate;
+
+  @ApiModelProperty(value = "del_flag")
+  private String delFlag;
+
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
 
   public ShowBdyc() {
   }

+ 10 - 4
railway-business/src/main/java/com/railway/business/bi/domain/ShowBpdjxjh.java

@@ -1,12 +1,14 @@
 package com.railway.business.bi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-变配电所检修计划表
@@ -19,7 +21,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowBpdjxjh extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "线路信息")
   @Length(min = 1, max = 255, message = "【线路信息】长度必须介于 {min} 和 {max} 之间")
@@ -46,12 +48,16 @@ public class ShowBpdjxjh extends BaseEntity {
   private String completionState;
 
   @ApiModelProperty(value = "兑现日期")
-  @Length(min = 1, max = 255, message = "【兑现日期】长度必须介于 {min} 和 {max} 之间")
-  private String completionDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate;
 
   @ApiModelProperty(value = "del_flag")
   private String delFlag;
 
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowBpdjxjh() {
   }
 

+ 15 - 6
railway-business/src/main/java/com/railway/business/bi/domain/ShowDlyc.java

@@ -4,10 +4,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-电力异常信息详情表
@@ -20,7 +21,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowDlyc extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "缺陷设备名称")
   @Length(min = 1, max = 255, message = "【缺陷设备名称】长度必须介于 {min} 和 {max} 之间")
@@ -38,9 +39,10 @@ public class ShowDlyc extends BaseEntity {
   @Length(min = 1, max = 255, message = "【线别】长度必须介于 {min} 和 {max} 之间")
   private String lineName;
 
-  @JsonFormat(pattern = "yyyy-MM-dd")
   @ApiModelProperty(value = "发现日期")
-  private Date foundDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate foundDate;
 
   @ApiModelProperty(value = "缺陷内容")
   @Length(min = 1, max = 255, message = "【缺陷内容】长度必须介于 {min} 和 {max} 之间")
@@ -70,14 +72,21 @@ public class ShowDlyc extends BaseEntity {
   @Length(min = 1, max = 255, message = "【处理缺陷负责人】长度必须介于 {min} 和 {max} 之间")
   private String rectifyUser;
 
-  @JsonFormat(pattern = "yyyy-MM-dd")
   @ApiModelProperty(value = "消除日期")
-  private Date rectifyDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate rectifyDate;
 
   @ApiModelProperty(value = "计数")
   @Length(min = 1, max = 255, message = "【计数】长度必须介于 {min} 和 {max} 之间")
   private String counted;
 
+  @ApiModelProperty(value = "del_flag")
+  private String delFlag;
+
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowDlyc() {
   }
 

+ 52 - 0
railway-business/src/main/java/com/railway/business/bi/domain/ShowFile.java

@@ -0,0 +1,52 @@
+package com.railway.business.bi.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 大屏展示-导入文件记录
+ *
+ * @author ZhaoMn 2023-02-10
+ */
+@Data
+@ApiModel("大屏展示-导入文件记录")
+@EqualsAndHashCode(callSuper = true)
+public class ShowFile extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
+
+  @ApiModelProperty(value = "文件名")
+  @Length(min = 1, max = 255, message = "【文件名】长度必须介于 {min} 和 {max} 之间")
+  private String fileName;
+
+  @ApiModelProperty(value = "文件路径")
+  @Length(min = 1, max = 255, message = "【文件路径】长度必须介于 {min} 和 {max} 之间")
+  private String filePath;
+
+  @ApiModelProperty(value = "文件类型")
+  @Length(min = 1, max = 10, message = "【文件类型】长度必须介于 {min} 和 {max} 之间")
+  private String dataType;
+
+  @ApiModelProperty(value = "记录数")
+  @Length(min = 1, max = 255, message = "【记录数】长度必须介于 {min} 和 {max} 之间")
+  private String recordCount;
+
+  @ApiModelProperty(value = "导入结果,0成功,1失败")
+  @Length(min = 1, max = 1, message = "【导入结果,0成功,1失败】长度必须介于 {min} 和 {max} 之间")
+  private String impResult;
+
+  @ApiModelProperty(value = "错误信息记录id")
+  private Long errorLogId;
+
+  @ApiModelProperty(value = "del_flag")
+  private String delFlag;
+
+  public ShowFile() {
+  }
+
+}

+ 22 - 21
railway-business/src/main/java/com/railway/business/bi/domain/ShowGsd.java

@@ -1,12 +1,16 @@
 package com.railway.business.bi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-生产任务-高受电
@@ -19,7 +23,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowGsd extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "车间")
   @Length(min = 1, max = 255, message = "【车间】长度必须介于 {min} 和 {max} 之间")
@@ -32,44 +36,37 @@ public class ShowGsd extends BaseEntity {
   @Length(min = 1, max = 255, message = "【线路名称】长度必须介于 {min} 和 {max} 之间")
   private String lineName;
 
-  @ApiModelProperty(value = "架空线路")
-  @Length(min = 1, max = 255, message = "【架空线路】长度必须介于 {min} 和 {max} 之间")
-  private String jkxl;
+  @ApiModelProperty(value = "架空线路 km")
+  private BigDecimal jkxl;
 
-  @ApiModelProperty(value = "电缆线路")
-  @Length(min = 1, max = 255, message = "【电缆线路】长度必须介于 {min} 和 {max} 之间")
-  private String dlxl;
+  @ApiModelProperty(value = "电缆线路 km")
+  private BigDecimal dlxl;
 
   @ApiModelProperty(value = "隔离开关")
-  @Length(min = 1, max = 255, message = "【隔离开关】长度必须介于 {min} 和 {max} 之间")
-  private String glkg;
+  private Integer glkg;
 
   @ApiModelProperty(value = "断路器")
-  @Length(min = 1, max = 255, message = "【断路器】长度必须介于 {min} 和 {max} 之间")
-  private String dlq;
+  private Integer dlq;
 
   @ApiModelProperty(value = "电缆接头")
-  @Length(min = 1, max = 255, message = "【电缆接头】长度必须介于 {min} 和 {max} 之间")
-  private String dljt;
+  private Integer dljt;
 
   @ApiModelProperty(value = "电缆井")
-  @Length(min = 1, max = 255, message = "【电缆井】长度必须介于 {min} 和 {max} 之间")
-  private String dlj;
+  private Integer dlj;
 
   @ApiModelProperty(value = "接续箱")
-  @Length(min = 1, max = 255, message = "【接续箱】长度必须介于 {min} 和 {max} 之间")
-  private String jxx;
+  private Integer jxx;
 
   @ApiModelProperty(value = "维修方式")
   @Length(min = 1, max = 255, message = "【维修方式】长度必须介于 {min} 和 {max} 之间")
   private String wxfs;
 
   @ApiModelProperty(value = "上次维修年度")
-  @Length(min = 1, max = 255, message = "【上次维修年度】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【上次维修年度】长度必须介于 {min} 和 {max} 之间")
   private String lastTestYear;
 
   @ApiModelProperty(value = "计划完成月份")
-  @Length(min = 1, max = 255, message = "【计划完成月份】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【计划完成月份】长度必须介于 {min} 和 {max} 之间")
   private String planMonth;
 
   @ApiModelProperty(value = "到期提醒")
@@ -77,8 +74,9 @@ public class ShowGsd extends BaseEntity {
   private String overdueReminder;
 
   @ApiModelProperty(value = "完成日期")
-  @Length(min = 1, max = 255, message = "【完成日期】长度必须介于 {min} 和 {max} 之间")
-  private String completionDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate;
 
   @ApiModelProperty(value = "计划调整建议")
   @Length(min = 1, max = 255, message = "【计划调整建议】长度必须介于 {min} 和 {max} 之间")
@@ -91,6 +89,9 @@ public class ShowGsd extends BaseEntity {
   @ApiModelProperty(value = "del_flag")
   private String delFlag;
 
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowGsd() {
   }
 

+ 26 - 14
railway-business/src/main/java/com/railway/business/bi/domain/ShowGsy.java

@@ -1,12 +1,15 @@
 package com.railway.business.bi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDate;
 import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-生产任务-高试验
@@ -19,7 +22,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowGsy extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "车间")
   @Length(min = 1, max = 255, message = "【车间】长度必须介于 {min} 和 {max} 之间")
@@ -38,36 +41,42 @@ public class ShowGsy extends BaseEntity {
   private String bhlx;
 
   @ApiModelProperty(value = "上次试验年度")
-  @Length(min = 1, max = 255, message = "【上次试验年度】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【上次试验年度】长度必须介于 {min} 和 {max} 之间")
   private String lastTestYear;
 
   @ApiModelProperty(value = "试验计划电源一")
-  @Length(min = 1, max = 255, message = "【试验计划电源一】长度必须介于 {min} 和 {max} 之间")
-  private String testPlan1;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate testPlan1;
 
   @ApiModelProperty(value = "试验计划电源二")
-  @Length(min = 1, max = 255, message = "【试验计划电源二】长度必须介于 {min} 和 {max} 之间")
-  private String testPlan2;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate testPlan2;
 
   @ApiModelProperty(value = "到期提醒")
   @Length(min = 1, max = 255, message = "【到期提醒】长度必须介于 {min} 和 {max} 之间")
   private String overdueReminder;
 
   @ApiModelProperty(value = "完成日期电源一")
-  @Length(min = 1, max = 255, message = "【完成日期电源一】长度必须介于 {min} 和 {max} 之间")
-  private String completionDate1;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate1;
 
   @ApiModelProperty(value = "完成日期电源二")
-  @Length(min = 1, max = 255, message = "【完成日期电源二】长度必须介于 {min} 和 {max} 之间")
-  private String completionDate2;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate2;
 
   @ApiModelProperty(value = "计划调整建议电源一")
-  @Length(min = 1, max = 255, message = "【计划调整建议电源一】长度必须介于 {min} 和 {max} 之间")
-  private String planChange1;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate planChange1;
 
   @ApiModelProperty(value = "计划调整建议电源二")
-  @Length(min = 1, max = 255, message = "【计划调整建议电源二】长度必须介于 {min} 和 {max} 之间")
-  private String planChange2;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate planChange2;
 
   @ApiModelProperty(value = "当月未完成原因")
   @Length(min = 1, max = 255, message = "【当月未完成原因】长度必须介于 {min} 和 {max} 之间")
@@ -76,6 +85,9 @@ public class ShowGsy extends BaseEntity {
   @ApiModelProperty(value = "del_flag")
   private String delFlag;
 
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowGsy() {
   }
 

+ 37 - 31
railway-business/src/main/java/com/railway/business/bi/domain/ShowSbxj.java

@@ -18,7 +18,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowSbxj extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "车间")
   @Length(min = 1, max = 255, message = "【车间】长度必须介于 {min} 和 {max} 之间")
@@ -33,125 +33,131 @@ public class ShowSbxj extends BaseEntity {
   private String xjdy;
 
   @ApiModelProperty(value = "箱变")
-  @Length(min = 1, max = 255, message = "【箱变】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【箱变】长度必须介于 {min} 和 {max} 之间")
   private String xb;
 
   @ApiModelProperty(value = "配电所")
-  @Length(min = 1, max = 255, message = "【配电所】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【配电所】长度必须介于 {min} 和 {max} 之间")
   private String pds;
 
   @ApiModelProperty(value = "10/0.4变电所")
-  @Length(min = 1, max = 255, message = "【10/0.4变电所】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【10/0.4变电所】长度必须介于 {min} 和 {max} 之间")
   private String bds;
 
   @ApiModelProperty(value = "受电线路")
-  @Length(min = 1, max = 255, message = "【受电线路】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【受电线路】长度必须介于 {min} 和 {max} 之间")
   private String sdxl;
 
   @ApiModelProperty(value = "牵引变电所")
-  @Length(min = 1, max = 255, message = "【牵引变电所】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【牵引变电所】长度必须介于 {min} 和 {max} 之间")
   private String qybds;
 
   @ApiModelProperty(value = "at/分区所")
-  @Length(min = 1, max = 255, message = "【at/分区所】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 10, message = "【at/分区所】长度必须介于 {min} 和 {max} 之间")
   private String atfqs;
 
   @ApiModelProperty(value = "1月计划")
-  @Length(min = 1, max = 255, message = "【1月计划】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【1月计划】长度必须介于 {min} 和 {max} 之间")
   private String plan1;
 
   @ApiModelProperty(value = "1月实际")
-  @Length(min = 1, max = 255, message = "【1月实际】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【1月实际】长度必须介于 {min} 和 {max} 之间")
   private String actual1;
 
   @ApiModelProperty(value = "plan2")
-  @Length(min = 1, max = 255, message = "【plan2】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan2】长度必须介于 {min} 和 {max} 之间")
   private String plan2;
 
   @ApiModelProperty(value = "actual2")
-  @Length(min = 1, max = 255, message = "【actual2】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual2】长度必须介于 {min} 和 {max} 之间")
   private String actual2;
 
   @ApiModelProperty(value = "plan3")
-  @Length(min = 1, max = 255, message = "【plan3】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan3】长度必须介于 {min} 和 {max} 之间")
   private String plan3;
 
   @ApiModelProperty(value = "actual3")
-  @Length(min = 1, max = 255, message = "【actual3】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual3】长度必须介于 {min} 和 {max} 之间")
   private String actual3;
 
   @ApiModelProperty(value = "plan4")
-  @Length(min = 1, max = 255, message = "【plan4】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan4】长度必须介于 {min} 和 {max} 之间")
   private String plan4;
 
   @ApiModelProperty(value = "actual4")
-  @Length(min = 1, max = 255, message = "【actual4】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual4】长度必须介于 {min} 和 {max} 之间")
   private String actual4;
 
   @ApiModelProperty(value = "plan5")
-  @Length(min = 1, max = 255, message = "【plan5】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan5】长度必须介于 {min} 和 {max} 之间")
   private String plan5;
 
   @ApiModelProperty(value = "actual5")
-  @Length(min = 1, max = 255, message = "【actual5】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual5】长度必须介于 {min} 和 {max} 之间")
   private String actual5;
 
   @ApiModelProperty(value = "plan6")
-  @Length(min = 1, max = 255, message = "【plan6】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan6】长度必须介于 {min} 和 {max} 之间")
   private String plan6;
 
   @ApiModelProperty(value = "actual6")
-  @Length(min = 1, max = 255, message = "【actual6】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual6】长度必须介于 {min} 和 {max} 之间")
   private String actual6;
 
   @ApiModelProperty(value = "plan7")
-  @Length(min = 1, max = 255, message = "【plan7】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan7】长度必须介于 {min} 和 {max} 之间")
   private String plan7;
 
   @ApiModelProperty(value = "actual7")
-  @Length(min = 1, max = 255, message = "【actual7】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual7】长度必须介于 {min} 和 {max} 之间")
   private String actual7;
 
   @ApiModelProperty(value = "plan8")
-  @Length(min = 1, max = 255, message = "【plan8】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan8】长度必须介于 {min} 和 {max} 之间")
   private String plan8;
 
   @ApiModelProperty(value = "actual8")
-  @Length(min = 1, max = 255, message = "【actual8】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual8】长度必须介于 {min} 和 {max} 之间")
   private String actual8;
 
   @ApiModelProperty(value = "plan9")
-  @Length(min = 1, max = 255, message = "【plan9】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan9】长度必须介于 {min} 和 {max} 之间")
   private String plan9;
 
   @ApiModelProperty(value = "actual9")
-  @Length(min = 1, max = 255, message = "【actual9】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual9】长度必须介于 {min} 和 {max} 之间")
   private String actual9;
 
   @ApiModelProperty(value = "plan10")
-  @Length(min = 1, max = 255, message = "【plan10】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan10】长度必须介于 {min} 和 {max} 之间")
   private String plan10;
 
   @ApiModelProperty(value = "actual10")
-  @Length(min = 1, max = 255, message = "【actual10】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual10】长度必须介于 {min} 和 {max} 之间")
   private String actual10;
 
   @ApiModelProperty(value = "plan11")
-  @Length(min = 1, max = 255, message = "【plan11】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan11】长度必须介于 {min} 和 {max} 之间")
   private String plan11;
 
   @ApiModelProperty(value = "actual11")
-  @Length(min = 1, max = 255, message = "【actual11】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual11】长度必须介于 {min} 和 {max} 之间")
   private String actual11;
 
   @ApiModelProperty(value = "plan12")
-  @Length(min = 1, max = 255, message = "【plan12】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【plan12】长度必须介于 {min} 和 {max} 之间")
   private String plan12;
 
   @ApiModelProperty(value = "actual12")
-  @Length(min = 1, max = 255, message = "【actual12】长度必须介于 {min} 和 {max} 之间")
+  @Length(min = 1, max = 32, message = "【actual12】长度必须介于 {min} 和 {max} 之间")
   private String actual12;
 
+  @ApiModelProperty(value = "del_flag")
+  private String delFlag;
+
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowSbxj() {
   }
 

+ 13 - 4
railway-business/src/main/java/com/railway/business/bi/domain/ShowTestPlanDt.java

@@ -1,12 +1,14 @@
 package com.railway.business.bi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-试验计划兑现情况-单体
@@ -19,7 +21,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowTestPlanDt extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "线路名称")
   @Length(min = 1, max = 255, message = "【线路名称】长度必须介于 {min} 和 {max} 之间")
@@ -42,14 +44,21 @@ public class ShowTestPlanDt extends BaseEntity {
   private String testCycle;
 
   @ApiModelProperty(value = "计划试验日期")
-  private Date testPlanDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate testPlanDate;
 
   @ApiModelProperty(value = "完成日期")
-  private Date completionDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate;
 
   @ApiModelProperty(value = "del_flag")
   private String delFlag;
 
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowTestPlanDt() {
   }
 

+ 13 - 4
railway-business/src/main/java/com/railway/business/bi/domain/ShowTestPlanKg.java

@@ -1,12 +1,14 @@
 package com.railway.business.bi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-试验计划兑现情况-开关分合
@@ -19,7 +21,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowTestPlanKg extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "线别")
   @Length(min = 1, max = 255, message = "【线别】长度必须介于 {min} 和 {max} 之间")
@@ -34,14 +36,21 @@ public class ShowTestPlanKg extends BaseEntity {
   private String kgbh;
 
   @ApiModelProperty(value = "计划时间")
-  private Date testPlanDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate testPlanDate;
 
   @ApiModelProperty(value = "实际时间")
-  private Date completionDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate;
 
   @ApiModelProperty(value = "del_flag")
   private String delFlag;
 
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowTestPlanKg() {
   }
 

+ 13 - 3
railway-business/src/main/java/com/railway/business/bi/domain/ShowYdts.java

@@ -1,12 +1,14 @@
 package com.railway.business.bi.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 大屏展示-远动调试
@@ -19,7 +21,7 @@ import org.hibernate.validator.constraints.Length;
 public class ShowYdts extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String id;
+  private Long id;
 
   @ApiModelProperty(value = "段")
   @Length(min = 1, max = 255, message = "【段】长度必须介于 {min} 和 {max} 之间")
@@ -67,7 +69,9 @@ public class ShowYdts extends BaseEntity {
   private String overdueReminder;
 
   @ApiModelProperty(value = "完成日期")
-  private Date completionDate;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate completionDate;
 
   @ApiModelProperty(value = "计划调整建议")
   @Length(min = 1, max = 255, message = "【计划调整建议】长度必须介于 {min} 和 {max} 之间")
@@ -77,6 +81,12 @@ public class ShowYdts extends BaseEntity {
   @Length(min = 1, max = 255, message = "【当月未完成原因】长度必须介于 {min} 和 {max} 之间")
   private String overdueReason;
 
+  @ApiModelProperty(value = "del_flag")
+  private String delFlag;
+
+  @ApiModelProperty(value = "导入文件记录ID")
+  private Long fileId;
+
   public ShowYdts() {
   }
 

+ 44 - 0
railway-business/src/main/java/com/railway/business/bi/mapper/ShowFileMapper.java

@@ -0,0 +1,44 @@
+package com.railway.business.bi.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.bi.domain.ShowFile;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 大屏展示-导入文件记录
+ *
+ * @author ZhaoMn
+ * @date 2023/02/10
+ */
+@Mapper
+@Repository
+public interface ShowFileMapper {
+
+  /**
+   * 新增
+   */
+  int insert(ShowFile showFile);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("id") String id);
+
+  /**
+   * 更新
+   */
+  int update(ShowFile showFile);
+
+  /**
+   * 获取单个
+   */
+  ShowFile getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<ShowFile> getList(ShowFile showFile);
+
+}

+ 37 - 0
railway-business/src/main/java/com/railway/business/bi/service/IShowFileService.java

@@ -0,0 +1,37 @@
+package com.railway.business.bi.service;
+
+import com.railway.business.bi.domain.ShowFile;
+import java.util.List;
+/**
+* 大屏展示-导入文件记录
+* @author ZhaoMn
+* @date 2023/02/10
+*/
+public interface IShowFileService{
+
+    /**
+    * 新增
+    */
+    int create(ShowFile showFile);
+
+    /**
+    * 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * 更新
+    */
+    int update(ShowFile showFile);
+
+    /**
+    * 获取单个
+    */
+    ShowFile getInfo(String id);
+
+    /**
+    * 查询列表
+    */
+    List<ShowFile> getList(ShowFile showFile);
+
+}

+ 74 - 0
railway-business/src/main/java/com/railway/business/bi/service/impl/ShowFileServiceImpl.java

@@ -0,0 +1,74 @@
+package com.railway.business.bi.service.impl;
+
+import com.railway.business.bi.domain.ShowFile;
+import com.railway.business.bi.mapper.ShowFileMapper;
+import com.railway.business.bi.service.IShowFileService;
+import com.railway.common.utils.SecurityUtils;
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 大屏展示-导入文件记录
+ *
+ * @author ZhaoMn
+ * @date 2023/02/10
+ */
+@Service
+@Transactional(readOnly = true)
+public class ShowFileServiceImpl implements IShowFileService {
+
+  private final ShowFileMapper showFileMapper;
+
+  public ShowFileServiceImpl(ShowFileMapper showFileMapper) {
+    this.showFileMapper = showFileMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Transactional(rollbackFor = Exception.class)
+  public int create(ShowFile showFile) {
+    showFile.setCreateTime(LocalDateTime.now());
+    showFile.setCreateBy(SecurityUtils.getUsername());
+    return showFileMapper.insert(showFile);
+  }
+
+  /**
+   * 删除
+   */
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = showFileMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Transactional(rollbackFor = Exception.class)
+  public int update(ShowFile showFile) {
+    showFile.setUpdateTime(LocalDateTime.now());
+    showFile.setUpdateBy(SecurityUtils.getUsername());
+    return showFileMapper.update(showFile);
+  }
+
+  /**
+   * 获取单个
+   */
+  public ShowFile getInfo(String id) {
+    return showFileMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+  public List<ShowFile> getList(ShowFile showFile) {
+    return showFileMapper.getList(showFile);
+  }
+}

+ 45 - 9
railway-business/src/main/resources/mapper/bi/ShowBdycMapper.xml

@@ -20,11 +20,16 @@
     <result column="rectify_date" property="rectifyDate"/>
     <result column="counted" property="counted"/>
     <result column="plan_date" property="planDate"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+    <result column="file_id" property="fileId"/>
+    <result column="del_flag" property="delFlag"/>
   </resultMap>
 
   <sql id="Base_Column_List">
-    id
-    ,
+    id,
     found_date,
     line_name,
     station_name,
@@ -39,13 +44,16 @@
     rectify_way,
     rectify_date,
     counted,
-    plan_date
+    plan_date,
+    create_by,
+    create_time,
+    update_by,
+    update_time,
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowBdyc">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_bdyc
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != foundDate'>
@@ -91,7 +99,19 @@
         counted,
       </if>
       <if test='null != planDate'>
-        plan_date
+        plan_date,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != fileId'>
+        file_id,
+      </if>
+      <if test='null != delFlag'>
+        del_flag
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -138,7 +158,19 @@
         #{counted},
       </if>
       <if test='null != planDate'>
-        #{planDate}
+        #{planDate},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != fileId'>
+        #{fileId},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag}
       </if>
     </trim>
   </insert>
@@ -166,7 +198,11 @@
       <if test='null != rectifyWay'>rectify_way = #{rectifyWay},</if>
       <if test='null != rectifyDate'>rectify_date = #{rectifyDate},</if>
       <if test='null != counted'>counted = #{counted},</if>
-      <if test='null != planDate'>plan_date = #{planDate}</if>
+      <if test='null != planDate'>plan_date = #{planDate},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
   </update>

+ 10 - 30
railway-business/src/main/resources/mapper/bi/ShowBpdjxjhMapper.xml

@@ -17,6 +17,7 @@
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="file_id" property="fileId"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -32,13 +33,11 @@
     create_time,
     update_by,
     update_time,
-    del_flag
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowBpdjxjh">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_bpdjxjh
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != linName'>
@@ -68,11 +67,8 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
+      <if test='null != fileId'>
+        file_id,
       </if>
       <if test='null != delFlag'>
         del_flag
@@ -106,11 +102,8 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
+      <if test='null != fileId'>
+        #{fileId},
       </if>
       <if test='null != delFlag'>
         #{delFlag}
@@ -134,10 +127,9 @@
       <if test='null != jhDay'>jh_day = #{jhDay},</if>
       <if test='null != completionState'>completion_state = #{completionState},</if>
       <if test='null != completionDate'>completion_date = #{completionDate},</if>
-      <if test='null != createBy'>create_by = #{createBy},</if>
-      <if test='null != createTime'>create_time = #{createTime},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
       <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
       <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
@@ -179,20 +171,8 @@
       <if test="completionDate!=null and completionDate!=''">
         and completion_date=#{completionDate}
       </if>
-      <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
       </if>
     </where>
   </select>

+ 44 - 7
railway-business/src/main/resources/mapper/bi/ShowDlycMapper.xml

@@ -19,6 +19,12 @@
     <result column="rectify_user" property="rectifyUser"/>
     <result column="rectify_date" property="rectifyDate"/>
     <result column="counted" property="counted"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+    <result column="file_id" property="fileId"/>
+    <result column="del_flag" property="delFlag"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -37,13 +43,16 @@
     rectify_result,
     rectify_user,
     rectify_date,
-    counted
+    counted,
+    create_by,
+    create_time,
+    update_by,
+    update_time,
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowDlyc">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_dlyc
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != qxsbmc'>
@@ -86,7 +95,19 @@
         rectify_date,
       </if>
       <if test='null != counted'>
-        counted
+        counted,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != fileId'>
+        file_id,
+      </if>
+      <if test='null != delFlag'>
+        del_flag
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -130,7 +151,19 @@
         #{rectifyDate},
       </if>
       <if test='null != counted'>
-        #{counted}
+        #{counted},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != fileId'>
+        #{fileId},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag}
       </if>
     </trim>
   </insert>
@@ -157,7 +190,11 @@
       <if test='null != rectifyResult'>rectify_result = #{rectifyResult},</if>
       <if test='null != rectifyUser'>rectify_user = #{rectifyUser},</if>
       <if test='null != rectifyDate'>rectify_date = #{rectifyDate},</if>
-      <if test='null != counted'>counted = #{counted}</if>
+      <if test='null != counted'>counted = #{counted},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
   </update>

+ 188 - 0
railway-business/src/main/resources/mapper/bi/ShowFileMapper.xml

@@ -0,0 +1,188 @@
+<?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.railway.business.bi.mapper.ShowFileMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.bi.domain.ShowFile">
+    <result column="id" property="id"/>
+    <result column="file_name" property="fileName"/>
+    <result column="file_path" property="filePath"/>
+    <result column="data_type" property="dataType"/>
+    <result column="record_count" property="recordCount"/>
+    <result column="imp_result" property="impResult"/>
+    <result column="error_log_id" property="errorLogId"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+    <result column="del_flag" property="delFlag"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    id,
+    file_name,
+    file_path,
+    data_type,
+    record_count,
+    imp_result,
+    error_log_id,
+    create_by,
+    create_time,
+    update_by,
+    update_time,
+    del_flag
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.bi.domain.ShowFile">
+    <selectKey keyProperty="id" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO show_file
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != fileName'>
+        file_name,
+      </if>
+      <if test='null != filePath'>
+        file_path,
+      </if>
+      <if test='null != dataType'>
+        data_type,
+      </if>
+      <if test='null != recordCount'>
+        record_count,
+      </if>
+      <if test='null != impResult'>
+        imp_result,
+      </if>
+      <if test='null != errorLogId'>
+        error_log_id,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time,
+      </if>
+      <if test='null != delFlag'>
+        del_flag
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != fileName'>
+        #{fileName},
+      </if>
+      <if test='null != filePath'>
+        #{filePath},
+      </if>
+      <if test='null != dataType'>
+        #{dataType},
+      </if>
+      <if test='null != recordCount'>
+        #{recordCount},
+      </if>
+      <if test='null != impResult'>
+        #{impResult},
+      </if>
+      <if test='null != errorLogId'>
+        #{errorLogId},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE show_file
+    set del_flag='1'
+    WHERE id = #{id}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.bi.domain.ShowFile">
+    UPDATE show_file
+    <set>
+      <if test='null != fileName'>file_name = #{fileName},</if>
+      <if test='null != filePath'>file_path = #{filePath},</if>
+      <if test='null != dataType'>data_type = #{dataType},</if>
+      <if test='null != recordCount'>record_count = #{recordCount},</if>
+      <if test='null != impResult'>imp_result = #{impResult},</if>
+      <if test='null != errorLogId'>error_log_id = #{errorLogId},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag}</if>
+    </set>
+    WHERE id = #{id}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM show_file
+    WHERE del_flag='0' and id = #{id}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM show_file
+    <where>
+      del_flag='0'
+      <if test="fileName!=null and fileName!=''">
+        and file_name=#{fileName}
+      </if>
+      <if test="filePath!=null and filePath!=''">
+        and file_path=#{filePath}
+      </if>
+      <if test="dataType!=null and dataType!=''">
+        and data_type=#{dataType}
+      </if>
+      <if test="recordCount!=null and recordCount!=''">
+        and record_count=#{recordCount}
+      </if>
+      <if test="impResult!=null and impResult!=''">
+        and imp_result=#{impResult}
+      </if>
+      <if test="errorLogId!=null and errorLogId!=''">
+        and error_log_id=#{errorLogId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+    </where>
+  </select>
+
+</mapper>

+ 10 - 30
railway-business/src/main/resources/mapper/bi/ShowGsdMapper.xml

@@ -27,6 +27,7 @@
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="file_id" property="fileId"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -51,13 +52,11 @@
     create_time,
     update_by,
     update_time,
-    del_flag
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowGsd">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_gsd
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != deptName'>
@@ -117,11 +116,8 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
+      <if test='null != fileId'>
+        file_id,
       </if>
       <if test='null != delFlag'>
         del_flag
@@ -185,11 +181,8 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
+      <if test='null != fileId'>
+        #{fileId},
       </if>
       <if test='null != delFlag'>
         #{delFlag}
@@ -223,10 +216,9 @@
       <if test='null != completionDate'>completion_date = #{completionDate},</if>
       <if test='null != planChangeDesc'>plan_change_desc = #{planChangeDesc},</if>
       <if test='null != overdueReason'>overdue_reason = #{overdueReason},</if>
-      <if test='null != createBy'>create_by = #{createBy},</if>
-      <if test='null != createTime'>create_time = #{createTime},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
       <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
       <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
@@ -298,20 +290,8 @@
       <if test="overdueReason!=null and overdueReason!=''">
         and overdue_reason=#{overdueReason}
       </if>
-      <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
       </if>
     </where>
   </select>

+ 10 - 30
railway-business/src/main/resources/mapper/bi/ShowGsyMapper.xml

@@ -23,6 +23,7 @@
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="file_id" property="fileId"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -44,13 +45,11 @@
     create_time,
     update_by,
     update_time,
-    del_flag
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowGsy">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_gsy
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != deptName'>
@@ -98,11 +97,8 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
+      <if test='null != fileId'>
+        file_id,
       </if>
       <if test='null != delFlag'>
         del_flag
@@ -154,11 +150,8 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
+      <if test='null != fileId'>
+        #{fileId},
       </if>
       <if test='null != delFlag'>
         #{delFlag}
@@ -188,10 +181,9 @@
       <if test='null != planChange1'>plan_change1 = #{planChange1},</if>
       <if test='null != planChange2'>plan_change2 = #{planChange2},</if>
       <if test='null != overdueReason'>overdue_reason = #{overdueReason},</if>
-      <if test='null != createBy'>create_by = #{createBy},</if>
-      <if test='null != createTime'>create_time = #{createTime},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
       <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
       <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
@@ -251,20 +243,8 @@
       <if test="overdueReason!=null and overdueReason!=''">
         and overdue_reason=#{overdueReason}
       </if>
-      <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
       </if>
     </where>
   </select>

+ 47 - 7
railway-business/src/main/resources/mapper/bi/ShowSbxjMapper.xml

@@ -38,6 +38,12 @@
     <result column="actual11" property="actual11"/>
     <result column="plan12" property="plan12"/>
     <result column="actual12" property="actual12"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+    <result column="file_id" property="fileId"/>
+    <result column="del_flag" property="delFlag"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -75,13 +81,16 @@
     plan11,
     actual11,
     plan12,
-    actual12
+    actual12,
+    create_by,
+    create_time,
+    update_by,
+    update_time,
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowSbxj">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_sbxj
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != deptName'>
@@ -181,7 +190,19 @@
         plan12,
       </if>
       <if test='null != actual12'>
-        actual12
+        actual12,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != fileId'>
+        file_id,
+      </if>
+      <if test='null != delFlag'>
+        del_flag
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -282,7 +303,19 @@
         #{plan12},
       </if>
       <if test='null != actual12'>
-        #{actual12}
+        #{actual12},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != fileId'>
+        #{fileId},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag}
       </if>
     </trim>
   </insert>
@@ -328,7 +361,11 @@
       <if test='null != plan11'>plan11 = #{plan11},</if>
       <if test='null != actual11'>actual11 = #{actual11},</if>
       <if test='null != plan12'>plan12 = #{plan12},</if>
-      <if test='null != actual12'>actual12 = #{actual12}</if>
+      <if test='null != actual12'>actual12 = #{actual12},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
   </update>
@@ -447,6 +484,9 @@
       <if test="actual12!=null and actual12!=''">
         and actual12=#{actual12}
       </if>
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
+      </if>
     </where>
   </select>
 

+ 10 - 30
railway-business/src/main/resources/mapper/bi/ShowTestPlanDtMapper.xml

@@ -17,6 +17,7 @@
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="file_id" property="fileId"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -32,13 +33,11 @@
     create_time,
     update_by,
     update_time,
-    del_flag
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowTestPlanDt">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_test_plan_dt
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != lineName'>
@@ -68,11 +67,8 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
+      <if test='null != fileId'>
+        file_id,
       </if>
       <if test='null != delFlag'>
         del_flag
@@ -106,11 +102,8 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
+      <if test='null != fileId'>
+        #{fileId},
       </if>
       <if test='null != delFlag'>
         #{delFlag}
@@ -134,10 +127,9 @@
       <if test='null != testCycle'>test_cycle = #{testCycle},</if>
       <if test='null != testPlanDate'>test_plan_date = #{testPlanDate},</if>
       <if test='null != completionDate'>completion_date = #{completionDate},</if>
-      <if test='null != createBy'>create_by = #{createBy},</if>
-      <if test='null != createTime'>create_time = #{createTime},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
       <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
       <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
@@ -179,20 +171,8 @@
       <if test="completionDate!=null and completionDate!=''">
         and completion_date=#{completionDate}
       </if>
-      <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
       </if>
     </where>
   </select>

+ 10 - 30
railway-business/src/main/resources/mapper/bi/ShowTestPlanKgMapper.xml

@@ -15,6 +15,7 @@
     <result column="update_by" property="updateBy"/>
     <result column="update_time" property="updateTime"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="file_id" property="fileId"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -28,13 +29,11 @@
     create_time,
     update_by,
     update_time,
-    del_flag
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowTestPlanKg">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_test_plan_kg
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != lineName'>
@@ -58,11 +57,8 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
+      <if test='null != fileId'>
+        file_id,
       </if>
       <if test='null != delFlag'>
         del_flag
@@ -90,11 +86,8 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
+      <if test='null != fileId'>
+        #{fileId},
       </if>
       <if test='null != delFlag'>
         #{delFlag}
@@ -116,10 +109,9 @@
       <if test='null != kgbh'>kgbh = #{kgbh},</if>
       <if test='null != testPlanDate'>test_plan_date = #{testPlanDate},</if>
       <if test='null != completionDate'>completion_date = #{completionDate},</if>
-      <if test='null != createBy'>create_by = #{createBy},</if>
-      <if test='null != createTime'>create_time = #{createTime},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
       <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
       <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
@@ -155,20 +147,8 @@
       <if test="completionDate!=null and completionDate!=''">
         and completion_date=#{completionDate}
       </if>
-      <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
       </if>
     </where>
   </select>

+ 47 - 7
railway-business/src/main/resources/mapper/bi/ShowYdtsMapper.xml

@@ -20,6 +20,12 @@
     <result column="completion_date" property="completionDate"/>
     <result column="jhtzjy" property="jhtzjy"/>
     <result column="overdue_reason" property="overdueReason"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+    <result column="file_id" property="fileId"/>
+    <result column="del_flag" property="delFlag"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -38,13 +44,16 @@
     overdue_reminder,
     completion_date,
     jhtzjy,
-    overdue_reason
+    overdue_reason,
+    create_by,
+    create_time,
+    update_by,
+    update_time,
+    del_flag,
+    file_id
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.bi.domain.ShowYdts">
-    <selectKey keyProperty="id" order="BEFORE" resultType="String">
-      select replace(uuid(), '-', '') from dual
-    </selectKey>
     INSERT INTO show_ydts
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != branchName'>
@@ -90,7 +99,19 @@
         jhtzjy,
       </if>
       <if test='null != overdueReason'>
-        overdue_reason
+        overdue_reason,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != fileId'>
+        file_id,
+      </if>
+      <if test='null != delFlag'>
+        del_flag
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -137,7 +158,19 @@
         #{jhtzjy},
       </if>
       <if test='null != overdueReason'>
-        #{overdueReason}
+        #{overdueReason},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != fileId'>
+        #{fileId},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag}
       </if>
     </trim>
   </insert>
@@ -165,7 +198,11 @@
       <if test='null != overdueReminder'>overdue_reminder = #{overdueReminder},</if>
       <if test='null != completionDate'>completion_date = #{completionDate},</if>
       <if test='null != jhtzjy'>jhtzjy = #{jhtzjy},</if>
-      <if test='null != overdueReason'>overdue_reason = #{overdueReason}</if>
+      <if test='null != overdueReason'>overdue_reason = #{overdueReason},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime},</if>
+      <if test='null != fileId'>file_id = #{fileId},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag}</if>
     </set>
     WHERE id = #{id}
   </update>
@@ -230,6 +267,9 @@
       <if test="overdueReason!=null and overdueReason!=''">
         and overdue_reason=#{overdueReason}
       </if>
+      <if test="fileId!=null ">
+        and file_id=#{fileId}
+      </if>
     </where>
   </select>