From 638fcafd0a06a3e23e6bc65185c37b56e61edd98 Mon Sep 17 00:00:00 2001 From: renzexin Date: Mon, 19 Aug 2024 16:13:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/inspection/project/po/WrkProject.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java index 4b0b476..45f0a86 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java @@ -95,6 +95,10 @@ public class WrkProject extends BaseEntity { @DictFormat(dictType = "project_effect") @Condition(name = "project_effect", type = Condition.ConditionType.eq) private Integer projectEffect; + @TableField(value = "project_effect") + @DictFormat(dictType = "project_effect") + @Condition(name = "project_effect", type = Condition.ConditionType.eq) + private Integer status; /** * 查询条件 所属部门id From db4d2b6f66a2b5c17388321b3ba13bdc20bce4e8 Mon Sep 17 00:00:00 2001 From: mashuanghui Date: Mon, 19 Aug 2024 19:39:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java index 14b5645..98b8d0a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java @@ -1,6 +1,7 @@ package com.chushang.inspection.work.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.chushang.common.dict.annotation.DictFormat; import lombok.Data; import java.io.Serial; @@ -61,6 +62,7 @@ public class WrkInfoTerminalInsVO implements Serializable { /** * 巡检状态 1 已巡检 2 未巡检 */ + @DictFormat(dictType = "inspectionStatus_status") private Integer inspectionStatus; /** From d429148a20127c9537057af87cd78378c3331b7d Mon Sep 17 00:00:00 2001 From: renzexin Date: Tue, 20 Aug 2024 11:27:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/controller/FileController.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java index 26db899..8272ed7 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java @@ -53,12 +53,25 @@ public class FileController { /** * 合同上传 */ +// @SysLog(value = "合同", businessType = BusinessType.UPLOAD) +// @PostMapping(value = "/uploadContract") +//// @RequiresPermissions("system:file:upload") +// public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) throws Exception +// { +// return AjaxResult.success(fileSourceService.uploadContract(file)); +// } @SysLog(value = "合同", businessType = BusinessType.UPLOAD) @PostMapping(value = "/uploadContract") @RequiresPermissions("system:file:upload") - public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) throws Exception - { - return AjaxResult.success(fileSourceService.uploadContract(file)); + public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) { + try { + log.info("开始上传合同文件: {}", file.getOriginalFilename()); + // 上传合同文件 + return AjaxResult.success(fileSourceService.uploadContract(file)); + } catch (Exception e) { + log.error("上传合同文件失败: {}", e.getMessage(), e); + return AjaxResult.error("上传合同文件失败"); + } } /**