Forráskód Böngészése

新增我的工作台

wangliang 1 éve
szülő
commit
1812ad086e

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -860,7 +860,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         if (Objects.nonNull(approveRemark)) {
             tfFlowLog.setApproveRemark(approveRemark);
         } else {
-            tfFlowLog.setApproveRemark(DingExceptionApproveEnum.REFUSE.getTitle());
+            tfFlowLog.setApproveRemark(DingExceptionApproveEnum.NO_PASS.getTitle());
         }
     }
 }

+ 1 - 1
sop-business/src/main/resources/mapper/SysUserMapper.xml

@@ -61,7 +61,7 @@
                         and sc.name like concat('%', #{customName}, '%')
                     </if>
                 </where>
-                UNION all
+                UNION ALL
                 select
                     cast(ari.USER_ID_ as Decimal(24)) as userId,
                     tfcf.type,

+ 2 - 2
sop-business/src/main/resources/mapper/TBDingApplyMapper.xml

@@ -63,7 +63,7 @@
                                           #{item}
                                       </foreach>
                                   </if>
-                                  UNION all
+                                  UNION ALL
                                   select
                                       art.PROC_INST_ID_ as flowId
                                   from
@@ -160,7 +160,7 @@
                 </foreach>
             </if>
           and aht.END_TIME_ is not null
-            union all
+            UNION ALL
             select
             t.PROC_INST_ID_
             from

+ 1 - 1
sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -154,7 +154,6 @@ public class SystemConstant {
     public static final String PREFIX_URL_LOG = "/sys/log";
     public static final String PREFIX_URL_NOTICE = "/sys/notice";
     public static final String PREFIX_URL_MESSAGE = "/sys/message";
-    public static final String PREFIX_URL_SERVICE_CRM = "/service/crm";
     public static final String PREFIX_URL_SERVICE_SERVICE_UNIT = "/service/service/unit";
     public static final String PREFIX_URL_SERVICE_SERVICE_SCOPE = "/service/service/scope";
     public static final String PREFIX_URL_SERVICE_SERVICE_REGION = "/service/service/region";
@@ -168,6 +167,7 @@ public class SystemConstant {
     public static final String PREFIX_URL_CRM = "/admin/tb/crm";
     public static final String PREFIX_URL_DING_EXCEPTION_APPLY = "/admin/ding/exception/apply";
     public static final String PREFIX_URL_PRODUCT = "/admin/tb/product";
+    public static final String PREFIX_URL_MY_WORK_BENCH = "/admin/my/work_bench";
 
     /**
      * 缓存配置

+ 1 - 1
sop-common/src/main/java/com/qmth/sop/common/enums/DingExceptionApproveEnum.java

@@ -11,7 +11,7 @@ public enum DingExceptionApproveEnum {
 
     PASS("通过"),
 
-    REFUSE("拒绝");
+    NO_PASS("不通过");
 
     private String title;
 

+ 25 - 0
sop-common/src/main/java/com/qmth/sop/common/enums/WarnTypeEnum.java

@@ -0,0 +1,25 @@
+package com.qmth.sop.common.enums;
+
+/**
+ * @Description: 预警类型enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/1/24
+ */
+public enum WarnTypeEnum {
+
+    DELAY_WARN("延期预警"),
+
+    VIOLATION_WARN("云阅卷SOP");
+
+    private String title;
+
+    private WarnTypeEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}

+ 46 - 0
sop-server/src/main/java/com/qmth/sop/server/api/MyWorkBenchController.java

@@ -0,0 +1,46 @@
+package com.qmth.sop.server.api;
+
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.sop.business.bean.result.WorkTaskResult;
+import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.WarnTypeEnum;
+import com.qmth.sop.common.util.Result;
+import com.qmth.sop.common.util.ResultUtil;
+import io.swagger.annotations.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+/**
+ * <p>
+ * 我的工作台 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-24
+ */
+@Api(tags = "我的工作台Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_MY_WORK_BENCH)
+public class MyWorkBenchController {
+    private final static Logger log = LoggerFactory.getLogger(MyWorkBenchController.class);
+
+    @ApiOperation(value = "获取违规/延期预警待办接口")
+    @RequestMapping(value = "/warn/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkTaskResult.class)})
+    public Result getFlowTaskList(@ApiParam(value = "用户id") @RequestParam(required = false) Long userId,
+                                  @ApiParam(value = "预警类型") @RequestParam(required = false) WarnTypeEnum type,
+                                  @ApiParam(value = "服务单元id") @RequestParam(required = false) Long serviceId,
+                                  @ApiParam(value = "客户名称") @RequestParam(required = false) String customName,
+                                  @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                  @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok();
+    }
+}