Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud

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<LocalDateTime> 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;
 

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;
     /**
      * 终端数量
      */

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<LocalDateTime> disposeTime;
 
+    @Condition(name = "create_time", type = Condition.ConditionType.between, tableName = "i")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN)
+    private List<LocalDateTime> createTime;
+
     /**
      * 工单状态
      */

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

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
+    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("上传合同文件失败");
+        }
     }
 
     /**