更新UI和数据库

ruoyi-admin/src/main/resources/application-dev.yml

@@ -49,17 +49,17 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://localhost:3306/ruoyi-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
           username: root
-          password: root
+          password: 351002
         # 从库数据源
-        slave:
+#        slave:
-          lazy: true
+#          lazy: true
-          type: ${spring.datasource.type}
+#          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
+#          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+#          url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-          username:
+#          username:
-          password:
+#          password:
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java

@@ -386,8 +386,8 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
      */
     @Override
     public void stopProcess(WfTaskBo bo) {
-        List<Task> taskList = taskService.createTaskQuery().processInstanceId(bo.getProcInsId()).list();
+        List<Task> task = taskService.createTaskQuery().processInstanceId(bo.getProcInsId()).list();
-        if (CollectionUtils.isEmpty(taskList)) {
+        if (CollectionUtils.isEmpty(task)) {
             throw new RuntimeException("流程未启动或已执行完成，取消申请失败");
         }
 
@@ -399,10 +399,8 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
             List<EndEvent> endNodes = process.findFlowElementsOfType(EndEvent.class, false);
             if (CollectionUtils.isNotEmpty(endNodes)) {
                 Authentication.setAuthenticatedUserId(TaskUtils.getUserId());
-                runtimeService.setVariable(processInstance.getId(), ProcessConstants.PROCESS_STATUS_KEY, ProcessStatus.CANCELED.getStatus());
+//                taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(),
-                for (Task task : taskList) {
+//                        StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment());
-                    taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(), "取消流程");
-                }
                 // 获取当前流程最后一个节点
                 String endId = endNodes.get(0).getId();
                 List<Execution> executions = runtimeService.createExecutionQuery()

ruoyi-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = RuoYi-Flowable-Plus后台管理系统
+VUE_APP_TITLE = 电产院科研财务管理系统
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/src/layout/components/Navbar.vue

@@ -7,10 +7,6 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <el-tooltip content="驰骋BPM" effect="dark" placement="bottom">
-          <a href="http://ccflow.org/?frm=KonBAI" target="_blank" class="right-menu-item hover-effect">驰骋BPM</a>
-        </el-tooltip>
-
         <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: 'RuoYi-Flowable-Plus',
+      title: '科研财务管理系统',
       logo: logoImg
     }
   }

ruoyi-ui/src/views/system/role/index.vue

@@ -100,7 +100,7 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="角色系统编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />

ruoyi-ui/src/views/system/user/index.vue

@@ -139,7 +139,7 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户系统编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />

ruoyi-ui/src/views/workflow/category/index.vue

@@ -73,8 +73,8 @@
 
     <el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="分类编号" align="center" prop="categoryId" v-if="true"/>
+      <el-table-column label="流程分类编号" align="center" prop="categoryId" v-if="true"/>
-      <el-table-column label="分类名称" align="center" prop="categoryName" />
+      <el-table-column label="流程分类名称" align="center" prop="categoryName" />
       <el-table-column label="分类编码" align="center" prop="code" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/workflow/model/index.vue

@@ -82,8 +82,8 @@
 
     <el-table v-loading="loading" fit :data="modelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="模型标识" align="center" prop="modelKey" :show-overflow-tooltip="true" />
+      <el-table-column label="流程ID" align="center" prop="modelKey" :show-overflow-tooltip="true" />
-      <el-table-column label="模型名称" align="center" :show-overflow-tooltip="true">
+      <el-table-column label="流程名称" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button type="text" @click="handleProcessView(scope.row)">
             <span>{{ scope.row.modelName }}</span>