From 72b976a06df7d26b138fdfe0ace0c7c1f5f719d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 28 Apr 2024 00:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/myProcess/detail/detailDrawer.vue | 4 +-- .../task/myProcess/editTaskDrawer.vue | 14 ++++----- .../task/myProcess/initTaskDrawer.vue | 14 ++++----- .../task/todo/detail/approveDrawer.vue | 4 +-- .../ruoyi/web/common/PublicsController.java | 29 +++++++++++++++++++ .../controller/WcFlowableController.java | 1 - 6 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue index 56b3a0df..786b6a48 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue @@ -134,10 +134,10 @@ {{ initData.subDeptSafetyCertificate }} - + {{ initData.subDeptCustodian }} - + {{ initData.subDeptCustodianCardId }} diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue index 9ac6fe6e..0d0f44b9 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue @@ -96,20 +96,20 @@ placeholder="请输入分包单位安全生产许可证" /> - + @@ -214,15 +214,15 @@ export default { }, ], subDeptCustodian: [ - { required: true, message: "请输入分包单位项目负责人", trigger: "blur" }, + { required: true, message: "请输入分包单位项目经理", trigger: "blur" }, { max: 20, - message: "分包单位项目负责人最多20字", + message: "分包单位项目经理最多20字", trigger: "blur", }, ], subDeptCustodianCardId: [ - { required: true, message: "请输入分包单位负责人身份证号", trigger: "blur" }, + { required: true, message: "请输入分包单位项目经理身份证号", trigger: "blur" }, { pattern: /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/, message: "请输入正确的身份证号", diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue index eeb230ee..f29da7bd 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue @@ -96,20 +96,20 @@ placeholder="请输入分包单位安全生产许可证" /> - + @@ -212,15 +212,15 @@ export default { }, ], subDeptCustodian: [ - { required: true, message: "请输入分包单位项目负责人", trigger: "blur" }, + { required: true, message: "请输入分包单位项目经理", trigger: "blur" }, { max: 20, - message: "分包单位项目负责人最多20字", + message: "分包单位项目经理最多20字", trigger: "blur", }, ], subDeptCustodianCardId: [ - { required: true, message: "请输入分包单位负责人身份证号", trigger: "blur" }, + { required: true, message: "请输入分包单位项目经理身份证号", trigger: "blur" }, { pattern: /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/, message: "请输入正确的身份证号", diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue index 380738cb..7e4b9c51 100644 --- a/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue @@ -139,10 +139,10 @@ {{ initData.subDeptSafetyCertificate }} - + {{ initData.subDeptCustodian }} - + {{ initData.subDeptCustodianCardId }} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java new file mode 100644 index 00000000..55d6f225 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java @@ -0,0 +1,29 @@ +package com.ruoyi.web.common; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.DictUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @version : V1.0 + * @ClassName: PublicsController + * @Description: 公共服务 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/publics") +public class PublicsController { + + /** + * 查询演训类型 + * @return + */ + @GetMapping("/v1/getDictCache/{type}") + public AjaxResult queryTrainDataType(@PathVariable("type") String type){ + return AjaxResult.success(DictUtils.getDictCache(type)); + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java index 5dbffc9f..266019ec 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java @@ -307,5 +307,4 @@ public class WcFlowableController extends BaseController { redisCache.setCacheObject(key, list, 2, TimeUnit.MINUTES); return success(list); } - }