From d429148a20127c9537057af87cd78378c3331b7d Mon Sep 17 00:00:00 2001 From: renzexin Date: Tue, 20 Aug 2024 11:27:00 +0800 Subject: [PATCH 1/2] =?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("上传合同文件失败"); + } } /** From 2e5c9fd80aa814e757ac472e79d4b5193bee45ad Mon Sep 17 00:00:00 2001 From: likewei <2211508111@qq.com> Date: Tue, 20 Aug 2024 11:44:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chushang/inspection/terminal/query/StoreQuery.java | 10 ++++++---- .../com/chushang/inspection/terminal/vo/StoreVO.java | 2 ++ .../chushang/inspection/work/query/WrkInfoQuery.java | 6 +++++- .../src/main/resources/mapper/StoreMapper.xml | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java index db3f919..c439553 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java @@ -33,13 +33,14 @@ public class StoreQuery extends CommonParam { /** * 商户编号 */ - @Condition(name = "store_no") + @Condition(name = "store_no", type = Condition.ConditionType.eq, tableName = "s") @Size(max = 64, message = "商户编号不能超过64个字符") private String storeNo; /** * 终端编号 */ + @Condition(name = "terminal_no", type = Condition.ConditionType.eq, tableName = "s") @Size(max = 30, message = "终端sn号不能超过30个字符") private String terminalNo; @@ -71,13 +72,14 @@ public class StoreQuery extends CommonParam { /** * 终端sn号 */ + @Condition(name = "terminal_sn", type = Condition.ConditionType.eq, tableName = "s") @Size(max = 100, message = "终端sn号不能超过100个字符") private String terminalSn; /** * 商户名称 */ - @Condition(name = "store_name", type = Condition.ConditionType.like) + @Condition(name = "store_name", type = Condition.ConditionType.like, tableName = "s") @Size(max = 128, message = "商户名称不能超过128个字符") private String storeName; @@ -112,7 +114,7 @@ public class StoreQuery extends CommonParam { /** * 创建时间 */ - @Condition(name = "create_time", type = Condition.ConditionType.between) + @Condition(name = "create_time", type = Condition.ConditionType.between, tableName = "s") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private List createTime; @@ -131,7 +133,7 @@ public class StoreQuery extends CommonParam { /** * 门店名称 */ - @Condition(name = "shop_name", type = Condition.ConditionType.like) + @Condition(name = "shop_name", type = Condition.ConditionType.like, tableName = "s") @Size(max = 128, message = "门店名称不能超过128个字符") private String shopName; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java index dcd45e6..5e3156a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java @@ -138,6 +138,8 @@ public class StoreVO implements Serializable { */ @DictFormat(dictType = "mer_status") private Integer storeStatus; + + private Integer isEnter; /** * 终端数量 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java index a9c39da..690f6c7 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java @@ -22,7 +22,7 @@ public class WrkInfoQuery extends CommonParam { /** * 工单编号 */ - @Condition(name = "work_no", tableName = "i") + @Condition(name = "wrk_no", tableName = "i") private String workNo; /** @@ -66,6 +66,10 @@ public class WrkInfoQuery extends CommonParam { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN) private List disposeTime; + @Condition(name = "create_time", type = Condition.ConditionType.between, tableName = "i") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN) + private List createTime; + /** * 工单状态 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml index 3a27abf..55e71fe 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml @@ -21,6 +21,7 @@ s.create_time AS createTime, s.dept_id AS deptId, s.state AS storeStatus, + s.is_enter AS isEnter, pt1.`name` AS taskName, pt2.`name` AS totalTaskName, (select COUNT(*) from st_terminal where s.del_state = 0 AND s.store_id = store_id) AS countTerminal