From 91c14e048946fd4564c3a54641216ce70dc9281c Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Sat, 6 May 2023 09:30:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/controller/PowerApplyController.java | 2 +- .../adc/da/report/dao/mysql/PowerApplyActDao.java | 2 ++ .../com/adc/da/report/eo/TtReportManageAct.java | 13 +++++++------ .../mybatis/mapper/mysql/PowerApplyActMapper.xml | 5 +++++ .../service/ActivitDefineService.java | 9 ++++++--- .../business_activiti/task/TodoTaskController.java | 4 ++-- .../service/impl/BusProcessNameServiceImpl.java | 6 +++++- .../com/adc/da/wkflow/util/ImpulseSenderUtils.java | 4 ++++ 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java index 6e71427..5c74c98 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java @@ -122,7 +122,7 @@ public class PowerApplyController { } /** - * @param deleteParamRequestVO + * @param powerApplyActPageVO * @return com.adc.da.util.http.ResponseMessage * @author bu * @date 2023-04-23 diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java index e46c364..cae3061 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java @@ -47,6 +47,8 @@ public interface PowerApplyActDao extends BaseMapper { List selectListBydataId(@Param("dataId")String dataId); + List selectListByPrcId(@Param("prcId")String prcId); + List selectListBydataIdNodel(@Param("dataId")String dataId); List selectActListBydataId(@Param("dataId")String dataId); diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java index beb41e7..e8618aa 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -1,6 +1,8 @@ package com.adc.da.report.eo; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -18,7 +20,7 @@ import java.util.List; public class TtReportManageAct { - @TableField(exist = false) + @TableId(value = "id",type = IdType.UUID) private String id; /** * 任务id @@ -90,16 +92,19 @@ public class TtReportManageAct { /** * */ + @TableField("createUserId") private String createUserId; /** * */ + @TableField("createDate") private Date createDate; /** * */ + @TableField("updateDate") private Date updateDate = new Date(); /** @@ -109,14 +114,10 @@ public class TtReportManageAct { private Integer delFlag; - /** - * 创建人id - */ - @TableField("update_user_id") - private String updateUserId; /** * 权限设置 */ + @TableField(exist = false) private List powerList; } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml index 08d55e7..4fa7d5b 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -118,4 +118,9 @@ from a where a.data_id = #{dataId} and a.del_flag = 0 + diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java index 91b7335..4667c85 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -61,17 +61,20 @@ public class ActivitDefineService { List powerApplyActs = new ArrayList<>(); List powerList = ttReportManageAct.getPowerList(); for (PowerApplyAct powerApplyAct : powerList) { - if (StringUtils.isNotEmpty(powerApplyAct.getId())){ + if (StringUtils.isEmpty(powerApplyAct.getId())){ powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); + powerApplyAct.setReportId(ttReportManageAct.getId()); powerApplyAct.setDataId(dataId); - powerApplyAct.setTaskId(taskId); +// powerApplyAct.setTaskId(taskId); powerApplyAct.setPrcId(prcId); powerApplyAct.setDelFlag(0); powerApplyAct.setCreateDate(new Date()); powerApplyActs.add(powerApplyAct); } } - powerApplyActDao.batchInsert(powerApplyActs); + if (powerApplyActs.size()>0){ + powerApplyActDao.batchInsert(powerApplyActs); + } } return dataId; } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 30e8992..4d4781b 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -446,7 +446,7 @@ public class TodoTaskController { busProcessNewVO.setDataJson(string); }else if ("2".equals(prcType)){ TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); - List powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + List powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId()); ttReportManageActPageVO.setPowerList(powerApplyActs); String string = JSONArray.toJSONString(ttReportManageActPageVO); //去对应的 数据表查数据 @@ -472,7 +472,7 @@ public class TodoTaskController { busProcessNewVO.setDataJson(string); }else if("2".equals(prcType)){ TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); - List powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + List powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId()); ttReportManageActPageVO.setPowerList(powerApplyActs); String string = JSONArray.toJSONString(ttReportManageActPageVO); //去对应的 数据表查数据 diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java index f09c20e..6050223 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java @@ -46,7 +46,11 @@ public class BusProcessNameServiceImpl extends ServiceImpl