Merge branch 'master' of http://47.97.51.208/root/zrch-risk-39

zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue

@@ -590,7 +590,7 @@
 
       //alert("dd"+isFixed.value);
       // if (!isFixed.value) {
-      //alert("dd"+userType.value);
+     
       if (userType.value === 'user') {
         submitData.values['approval'] = formData.checkSendUser;
         submitData.values['copyUser'] = formData.copyUser;
@@ -604,7 +604,12 @@
       } else if (formData.checkSendRole) {
         submitData.values['approval'] = formData.checkSendRole;
         submitData.values['approvalType'] = 'role';
+      }else{
+        submitData.values['approval'] = formData.checkSendUser;
+        submitData.values['copyUser'] = formData.copyUser;
+        submitData.values['approvalType'] = 'user';
       }
+      console.log("ssss why ----",submitData);
       const result = await complete(submitData);
 
       message.success('任务发送成功');

zrch-risk-client-39/src/views/mytaskflowcc/MyTaskFlowCc.api.ts

@@ -11,6 +11,7 @@ enum Api {
   deleteBatch = '/my/myTaskFlowCc/deleteBatch',
   importExcel = '/my/myTaskFlowCc/importExcel',
   exportXls = '/my/myTaskFlowCc/exportXls',
+  updateStatus = '/my/myTaskFlowCc/updateStatus',
 }
 /**
  * 导出api
@@ -62,3 +63,12 @@ export const saveOrUpdate = (params, isUpdate) => {
   let url = isUpdate ? Api.edit : Api.save;
   return defHttp.post({url: url, params});
 }
+/**
+ * 抄送 抄阅 查看处理
+ * @param params
+ */
+ export const updateStatus = (params) => {
+  return defHttp.delete({url: Api.updateStatus, params}, {joinParamsToUrl: true}).then(() => {
+    //handleSuccess();
+  });
+}

zrch-risk-client-39/src/views/mytaskflowcc/MyTaskFlowCcList.vue

@@ -68,7 +68,7 @@
   import { useListPage } from '/@/hooks/system/useListPage'
   import MyTaskFlowCcModal from './components/MyTaskFlowCcModal.vue'
   import {columns, searchFormSchema, superQuerySchema} from './MyTaskFlowCc.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './MyTaskFlowCc.api';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,updateStatus} from './MyTaskFlowCc.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -265,6 +265,8 @@
       const myTaskFlow = await getMyTaskFlow({ deploymentId: record.deployId, dataId: record.targetId });
       const taskData = pickStartResult(myTaskFlow);
 
+      console.log("--------------myTaskFlow ",myTaskFlow);
+
       if (!taskData || !taskData.taskId) {
         message.error('未获取到待办任务信息');
         return;
@@ -281,6 +283,9 @@
       isShowDrawer.value = true;
       await nextTick();
       refTodoIndex.value?.iniData?.(taskData);
+       updateStatus({id: record.id});
+      handleSuccess();
+
     } catch (e) {
       console.error('获取流程任务信息失败:', e);
       message.error('获取任务信息失败，请重试');

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/my/controller/MyTaskFlowCcController.java

 package org.jeecg.modules.stm.my.controller;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -179,4 +176,16 @@ public class MyTaskFlowCcController extends JeecgController<MyTaskFlowCc, IMyTas
         return super.importExcel(request, response, MyTaskFlowCc.class);
     }
 
+	 @DeleteMapping(value = "/updateStatus")
+	 public void updateStatus(@RequestParam(name="id",required=true) String id) {
+
+		 MyTaskFlowCc myTaskFlowCc=new MyTaskFlowCc();
+		 myTaskFlowCc.setId(Integer.valueOf(id));
+		 myTaskFlowCc.setReadTime(new Date());
+		 myTaskFlowCc.setStatus("1");
+
+		 myTaskFlowCcService.updateById(myTaskFlowCc);
+
+	 }
+
 }

zrch-risk-server-39/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -33,9 +33,9 @@ flowable:
 #    enabled: false
 
 spring:
-#  main:
-#    # 启动加速 (建议开发环境，开启后flyway自动升级失效)
-#    lazy-initialization: true
+  #  main:
+  #    # 启动加速 (建议开发环境，开启后flyway自动升级失效)
+  #    lazy-initialization: true
   liquibase:
     enabled: false
   flyway:
@@ -61,7 +61,7 @@ spring:
       mail.smtp.writetimeout: 10000  # 写入超时（毫秒）
       mail.smtp.auth: true
       smtp.ssl.enable: true
-#      mail.debug: true  # 启用调试模式(查看详细日志)
+  #      mail.debug: true  # 启用调试模式(查看详细日志)
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc
@@ -166,19 +166,19 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-#          url: jdbc:mysql://47.98.203.68:3306/zrch_stm_db_3.9?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-#          username: root
-#          password: ZhongRunChangHong/123
+          #          url: jdbc:mysql://47.98.203.68:3306/zrch_stm_db_3.9?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #          username: root
+          #          password: ZhongRunChangHong/123
 
           url: jdbc:mysql://localhost:3306/zrch_stm_db_3.9_new?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
 
           driver-class-name: com.mysql.cj.jdbc.Driver
-#        # shardingjdbc数据源
-#        sharding-db:
-#          driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
-#          url: jdbc:shardingsphere:classpath:sharding.yaml
+  #        # shardingjdbc数据源
+  #        sharding-db:
+  #          driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
+  #          url: jdbc:shardingsphere:classpath:sharding.yaml
   #redis 配置
   data:
     redis:
@@ -296,7 +296,7 @@ jeecg:
   #大屏报表参数设置
   jmreport:
     #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
-    saasMode: 
+    saasMode:
     # 平台上线安全配置(v1.6.2+ 新增)
     firewall:
       # 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)