diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java index c85eba2..0a1bee2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java @@ -282,14 +282,6 @@ public class DjInspectImproveController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { + return super.importExcelByEasyExcel(request, DjInspectImprove.class); + } + + /** + * 通过EasyExcel校验数据,只返回校验结果,不保存到数据库 + */ + @RequiresPermissions("dj.inspectimprove:dj_inspect_improve:importExcel") + @RequestMapping(value = "/checkExcelByEasyExcel", method = RequestMethod.POST) + public Result checkExcelByEasyExcel(HttpServletRequest request) { + return super.checkExcelByEasyExcel(request, DjInspectImprove.class); + } + + } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java index 20c7928..ad820c1 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java @@ -13,6 +13,7 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.util.excel.annotation.ExcelColumn; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; @@ -64,73 +65,90 @@ public class DjInspectImprove implements Serializable { private java.lang.String hasChild; /**问题分类*/ @Excel(name = "问题分类", width = 15) + @ExcelColumn(name = "问题分类", width = 15, dicCode = "inspect_improve_type") @Schema(description = "问题分类") @Dict(dicCode = "inspect_improve_type") private java.lang.Integer questionCategory; /**面上问题*/ @Excel(name = "面上问题", width = 15) + @ExcelColumn(name = "面上问题", width = 15) @Schema(description = "面上问题") private java.lang.String mianshangQuestion; /**具体问题*/ @Excel(name = "具体问题", width = 15) + @ExcelColumn(name = "具体问题", width = 15) @Schema(description = "具体问题") private java.lang.String specicalQuestion; /**巡视建议*/ @Excel(name = "巡视建议", width = 15) + @ExcelColumn(name = "巡视建议", width = 15) @Schema(description = "巡视建议") private java.lang.String inspectAdvice; /**整改措施*/ @Excel(name = "整改措施", width = 15) + @ExcelColumn(name = "整改措施", width = 15) @Schema(description = "整改措施") private java.lang.String improveMeasure; /**完成时限*/ @Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd") + @ExcelColumn(name = "完成时限", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @Schema(description = "完成时限") private java.util.Date deadline; /**目标节点*/ @Excel(name = "目标节点", width = 15) + @ExcelColumn(name = "目标节点", width = 15) @Schema(description = "目标节点") private java.lang.String targetNode; /**问题责任领导*/ @Excel(name = "问题责任领导", width = 15) + @ExcelColumn(name = "问题责任领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Schema(description = "问题责任领导") private java.lang.String questionResLeader; /**问题责任部门*/ @Excel(name = "问题责任部门", width = 15) + @ExcelColumn(name = "问题责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Schema(description = "问题责任部门") private java.lang.String questionResDept; /**措施责任领导*/ @Excel(name = "措施责任领导", width = 15) + @ExcelColumn(name = "措施责任领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Schema(description = "措施责任领导") private java.lang.String measureResLeader; /**措施责任部门*/ @Excel(name = "措施责任部门", width = 15) + @ExcelColumn(name = "措施责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Schema(description = "措施责任部门") private java.lang.String measureResDept; /**整改交付成果*/ @Excel(name = "整改交付成果", width = 15) + @ExcelColumn(name = "整改交付成果", width = 15) @Schema(description = "整改交付成果") private java.lang.String rectificationEvidence; /**成效评价标准*/ @Excel(name = "成效评价标准", width = 15) + @ExcelColumn(name = "成效评价标准", width = 15) @Schema(description = "成效评价标准") private java.lang.String evaluationCriterion; /**工作进展*/ @Excel(name = "工作进展", width = 15) + @ExcelColumn(name = "工作进展", width = 15) @Schema(description = "工作进展") private java.lang.String workProgress; /**检查情况*/ @Excel(name = "检查情况", width = 15) + @ExcelColumn(name = "检查情况", width = 15) @Schema(description = "检查情况") private java.lang.String inspectionStatus; /**监督意见*/ @Excel(name = "监督意见", width = 15) + @ExcelColumn(name = "监督意见", width = 15) @Schema(description = "监督意见") private java.lang.String supervisoryOpinion; /**措施数量*/ @Excel(name = "措施数量", width = 15) + @ExcelColumn(name = "措施数量", width = 15) @Schema(description = "措施数量") private java.lang.Integer measureCount; }