diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/TtReportManageActController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/TtReportManageActController.java new file mode 100644 index 0000000..d3b3ab9 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/TtReportManageActController.java @@ -0,0 +1,116 @@ +package com.adc.da.report.controller; + +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.report.service.impl.ITtReportManageActServiceImpl; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.TtReportManageActPageVO; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 前端控制器 + * @date 2023-05-04 + */ +@Slf4j +@RestController +@RequestMapping("/${restPath}/report/ttReportManageAct") +@Api(tags = "report|") +public class TtReportManageActController { + @Autowired + private ITtReportManageActServiceImpl ttReportManageActService; + + /** + * @param ttReportManageActPageVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-04 + * @description 分页查询 + */ + @PostMapping(value = "/page") + @ApiOperation(value = "分页查询") + @ApiImplicitParam(name = "ttReportManageActPageVO", value = "查询条件VO", dataType = "TtReportManageActPageVO") + public ResponseMessage> page(@RequestBody TtReportManageActPageVO ttReportManageActPageVO){ + + //分页查询 + Page ttReportManageActIPage = ttReportManageActService.selectPage(ttReportManageActPageVO); + return Result.success(ttReportManageActIPage); + } + + /** + * @param ttReportManageActPageVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-04 + * @description 列表查询 + */ + @PostMapping("/list") + @ApiOperation(value = "列表查询") + @ApiImplicitParam(name = "ttReportManageActPageVO", value = "查询条件VO", dataType = "TtReportManageActPageVO") + public ResponseMessage> list(@RequestBody TtReportManageActPageVO ttReportManageActPageVO) { + + //列表查询 + List ttReportManageActList = ttReportManageActService.selectList(ttReportManageActPageVO); + return Result.success(ttReportManageActList); + } + + /** + * @param id + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-04 + * @description 根据id查询 + */ + @GetMapping("/info/{id}") + @ApiOperation(value = "根据id查询") + @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String") + public ResponseMessage info(@PathVariable("id") String id){ + + //根据id查询 + TtReportManageAct ttReportManageAct = ttReportManageActService.selectById(id); + return Result.success(ttReportManageAct); + } + + /** + * @param ttReportManageAct + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-04 + * @description 单条数据新增/更改 + */ + @PostMapping("/saveOrUpdate") + @ApiOperation(value = "单条数据新增/更改") + @ApiImplicitParam(name = "ttReportManageAct", value = " TtReportManageAct实体", dataType = "TtReportManageAct") + public ResponseMessage saveOrUpdate(@RequestBody TtReportManageAct ttReportManageAct){ + + //单条数据新增/更改 + ttReportManageActService.saveOrUpdateSingle(ttReportManageAct); + return Result.success(ttReportManageAct.getId()); + } + + /** + * @param deleteParamRequestVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-04 + * @description 根据id或id数组进行删除 + */ + @DeleteMapping("/delete") + @ApiOperation(value = "单条/批量删除数据") + public ResponseMessage delete(@RequestBody DeleteParamRequestVO deleteParamRequestVO){ + + //单条/批量删除数据 + ttReportManageActService.deleteById(deleteParamRequestVO); + return Result.success(); + } +} 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 f9ed445..dd79f6f 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 @@ -46,4 +46,5 @@ public interface PowerApplyActDao extends BaseMapper { int batchInsert(@Param("list")List powerApplyActs); List selectListBydataId(@Param("dataId")String dataId); + } diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java new file mode 100644 index 0000000..6f4bb6a --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java @@ -0,0 +1,48 @@ +package com.adc.da.report.dao.mysql; + + +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.report.vo.TtReportManageActPageVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description Mapper接口 + * @date 2023-05-04 + */ +public interface TtReportManageActDao extends BaseMapper { + + /** + * @param ttReportManageActPageVO + * @param page + * @author bu + * @date 2023-05-04 + * @description 使用分页插件进行查询 + */ + List selectPage(Page page, @Param("pageVO") TtReportManageActPageVO ttReportManageActPageVO); + + /** + * @param ttReportManageActPageVO + * @param page + * @author bu + * @date 2023-05-04 + * @description 使用分页插件进行查询总数 + */ + Long selectPageCount(@Param("pageVO") TtReportManageActPageVO ttReportManageActPageVO); + + /** + * @param ttReportManageActPageVO + * @return java.util.List + * @author bu + * @date 2023-05-04 + * @description 列表查询 + */ + List queryList(@Param("pageVO") TtReportManageActPageVO ttReportManageActPageVO); + + TtReportManageActPageVO selectByDataId(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 new file mode 100644 index 0000000..beb41e7 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -0,0 +1,122 @@ +package com.adc.da.report.eo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description + * @date 2023-05-04 + */ +@Data +@TableName("tt_report_manage_act") +public class TtReportManageAct { + + + @TableField(exist = false) + private String id; + /** + * 任务id + */ + @TableField("task_id") + private String taskId; + + /** + * 流程id + */ + @TableField("prc_id") + private String prcId; + + /** + * 数据id + */ + @TableField("data_id") + private String dataId; + + /** + * 报告名 + */ + @TableField("name") + private String name; + + /** + * 关键字 + */ + @TableField("keycontent") + private String keyContent; + + /** + * 主要内容 + */ + @TableField("maincontent") + private String mainContent; + + /** + * 部门 + */ + @TableField("department") + private String department; + + /** + * 年 + */ + @TableField("year") + private String year; + + /** + * 报告涉密等级 + */ + @TableField("confidentialLevel") + private String confidentialLevel; + + /** + * 隐私等级 + */ + @TableField("privacyLevel") + private String privacyLevel; + + /** + * 文件id + */ + @TableField("fileId") + private String fileId; + + + /** + * + */ + private String createUserId; + + /** + * + */ + private Date createDate; + + /** + * + */ + private Date updateDate = new Date(); + + /** + * + */ + @TableField("del_flag") + private Integer delFlag; + + + /** + * 创建人id + */ + @TableField("update_user_id") + private String updateUserId; + + /** + * 权限设置 + */ + private List powerList; +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java b/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java new file mode 100644 index 0000000..8464e9a --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java @@ -0,0 +1,21 @@ +package com.adc.da.report.service; + +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.TtReportManageActPageVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.List; + +public interface ITtReportManageActService { + + Page selectPage(TtReportManageActPageVO ttReportManageActPageVO); + + List selectList(TtReportManageActPageVO ttReportManageActPageVO); + + TtReportManageAct selectById(String id); + + void saveOrUpdateSingle(TtReportManageAct ttReportManageAct); + + void deleteById(DeleteParamRequestVO deleteParamVO); +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java new file mode 100644 index 0000000..5eeb7d7 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java @@ -0,0 +1,111 @@ +package com.adc.da.report.service.impl; + + +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.report.service.ITtReportManageActService; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.TtReportManageActPageVO; +import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 服务实现类 + * @date 2023-05-04 + */ +@Slf4j +@Service +public class ITtReportManageActServiceImpl extends ServiceImpl implements ITtReportManageActService { + + /** + * @param ttReportManageActPageVO + * @return + * @author bu + * @date 2023-05-04 + * @description 分页查询 + */ + public Page selectPage(TtReportManageActPageVO ttReportManageActPageVO){ + Page page = new Page<>(ttReportManageActPageVO.getCurrent(), + ttReportManageActPageVO.getSize()); + page.setRecords(baseMapper.selectPage(page, ttReportManageActPageVO)); + Long total = baseMapper.selectPageCount(ttReportManageActPageVO); + page.setTotal(total); + return page; + } + + /** + * @param ttReportManageActPageVO + * @return java.util.List + * @author bu + * @date 2023-05-04 + * @description 列表查询 + */ + public List selectList(TtReportManageActPageVO ttReportManageActPageVO) { + return baseMapper.queryList(ttReportManageActPageVO); + } + + /** + * @param id + * @return com.adc.da.report.entity.TtReportManageAct + * @author bu + * @date 2023-05-04 + * @description 根据id查询 + */ + public TtReportManageAct selectById(String id) { + return baseMapper.selectById(id); + } + + /** + * @param ttReportManageAct + * @return boolean + * @author bu + * @date 2023-05-04 + * @description 单条数据新增/更改 + */ + public void saveOrUpdateSingle(TtReportManageAct ttReportManageAct) { + if (StringUtils.isEmpty(ttReportManageAct.getId())) { + baseMapper.insert(ttReportManageAct); + } else { + baseMapper.updateById(ttReportManageAct); + } + } + + /** + * @param deleteParamVO + * @return void + * @author bu + * @date 2023-05-04 + * @description 根据id或id数组进行删除 + */ + public void deleteById(DeleteParamRequestVO deleteParamVO) { + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + List ids = new ArrayList<>(); + + if (!ObjectUtils.isEmpty(deleteParamVO.getId())) { + ids.add(deleteParamVO.getId()); + } + if (!ObjectUtils.isEmpty(deleteParamVO.getIds())) { + ids.addAll(deleteParamVO.getIds()); + } + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + QueryWrapper wrapper = new QueryWrapper(); + wrapper.in("id",ids); + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + ttReportManageAct.setDelFlag(1); + baseMapper.update(ttReportManageAct,wrapper); + } +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java new file mode 100644 index 0000000..3426567 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java @@ -0,0 +1,96 @@ +package com.adc.da.report.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 查询条件VO + * @date 2023-05-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TtReportManageActPageVO extends BasePageVO { + + + /** + * 任务id + */ + private String taskId; + + /** + * 流程id + */ + private String prcId; + + /** + * 数据id + */ + private String dataId; + + /** + * + */ + private String name; + + /** + * + */ + private String keycontent; + + /** + * + */ + private String maincontent; + + /** + * + */ + private String department; + + /** + * + */ + private String year; + + /** + * + */ + private String fileId; + + /** + * + */ + private String confidentialLevel; + + /** + * + */ + private String privacyLevel; + + /** + * + */ + private String createUserId; + + /** + * + */ + private Date createDate; + + /** + * + */ + private Date updateDate; + + /** + * + */ + private Integer delFlag; + + private List powerList; +} diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml new file mode 100644 index 0000000..30e3479 --- /dev/null +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + tt_report_manage_act + + + + + id, + task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + + + + + + AND del = '${@com.adc.da.sys.constant.YesOrNoEnum@NO.value}' + + + AND task_id LIKE CONCAT(CONCAT('%',#{pageVO.taskId}),'%') + + + AND prc_id LIKE CONCAT(CONCAT('%',#{pageVO.prcId}),'%') + + + AND data_id LIKE CONCAT(CONCAT('%',#{pageVO.dataId}),'%') + + + AND name LIKE CONCAT(CONCAT('%',#{pageVO.name}),'%') + + + AND keycontent LIKE CONCAT(CONCAT('%',#{pageVO.keyContent}),'%') + + + AND maincontent LIKE CONCAT(CONCAT('%',#{pageVO.mainContent}),'%') + + + AND department LIKE CONCAT(CONCAT('%',#{pageVO.department}),'%') + + + AND year LIKE CONCAT(CONCAT('%',#{pageVO.year}),'%') + + + AND fileId LIKE CONCAT(CONCAT('%',#{pageVO.fileId}),'%') + + + AND confidentialLevel LIKE CONCAT(CONCAT('%',#{pageVO.confidentialLevel}),'%') + + + AND privacyLevel LIKE CONCAT(CONCAT('%',#{pageVO.privacyLevel}),'%') + + + AND createUserId LIKE CONCAT(CONCAT('%',#{pageVO.createUserId}),'%') + + + AND createDate = #{pageVO.createDate} + + + AND updateDate = #{pageVO.updateDate} + + + AND del_flag = #{pageVO.delFlag} + + + + + + + + + + + + + + + + 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 9a82313..91b7335 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 @@ -1,14 +1,19 @@ package com.adc.da.wkflow.business_activiti.service; import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.IPowerApplyActService; +import com.adc.da.report.service.ITtReportManageActService; +import com.adc.da.util.utils.StringUtils; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -23,14 +28,18 @@ public class ActivitDefineService { @Autowired PowerApplyActDao powerApplyActDao; + + @Autowired + TtReportManageActDao ttReportManageActDao; + + @Autowired + ITtReportManageActService ttReportManageActService; + //保存data数据 public String saveOrUpdateDate(String prcType, String dataJson,String taskId,String prcId) { String dataId = UUID.randomUUID().toString().replaceAll("-",""); if ("1".equals(prcType)){ List powerApplyActs = JSONObject.parseArray(dataJson, PowerApplyAct.class); -// LambdaQueryWrapper powerWrapper = new LambdaQueryWrapper<>(); -// powerWrapper.eq(PowerApplyAct::getPrcId,prcId); -// powerApplyActDao.delete(powerWrapper); for (PowerApplyAct powerApplyAct : powerApplyActs) { powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); powerApplyAct.setDataId(dataId); @@ -40,6 +49,29 @@ public class ActivitDefineService { powerApplyAct.setCreateDate(new Date()); } powerApplyActDao.batchInsert(powerApplyActs); + }else if ("2".equals(prcType)){ + TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); + ttReportManageAct.setDataId(dataId); + ttReportManageAct.setTaskId(taskId); + ttReportManageAct.setPrcId(prcId); + ttReportManageAct.setDelFlag(0); + ttReportManageAct.setCreateDate(new Date()); + ttReportManageActService.saveOrUpdateSingle(ttReportManageAct); + //权限 + List powerApplyActs = new ArrayList<>(); + List powerList = ttReportManageAct.getPowerList(); + for (PowerApplyAct powerApplyAct : powerList) { + if (StringUtils.isNotEmpty(powerApplyAct.getId())){ + powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); + powerApplyAct.setDataId(dataId); + powerApplyAct.setTaskId(taskId); + powerApplyAct.setPrcId(prcId); + powerApplyAct.setDelFlag(0); + powerApplyAct.setCreateDate(new Date()); + powerApplyActs.add(powerApplyAct); + } + } + 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 6f075d7..b62c383 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 @@ -3,7 +3,9 @@ package com.adc.da.wkflow.business_activiti.task; import cn.hutool.core.util.StrUtil; import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.vo.PowerApplyActPageVO; +import com.adc.da.report.vo.TtReportManageActPageVO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.vo.UserVO; import com.adc.da.util.exception.AdcDaBaseException; @@ -109,6 +111,9 @@ public class TodoTaskController { @Autowired private PowerApplyActDao powerApplyActDao; + @Autowired + private TtReportManageActDao ttReportManageActDao; + @ApiOperation(value = "我的待办任务列表") @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"), @ApiImplicitParam(name = "current", value = "当前页"), @@ -393,6 +398,13 @@ public class TodoTaskController { String string = JSONArray.toJSONString(powerApplyActs); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); + }else if("2".equals(prcType)){ + TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); + List powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + ttReportManageActPageVO.setPowerList(powerApplyActs); + String string = JSONArray.toJSONString(ttReportManageActPageVO); + //去对应的 数据表查数据 + busProcessNewVO.setDataJson(string); } return busProcessNewVO; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java index d063e9b..f5620ba 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java @@ -1,13 +1,12 @@ package com.adc.da.wkflow.enums; -import org.apache.commons.codec.binary.StringUtils; - /** * 流程类型枚举类 */ public enum FlowTypeEnum { BGQXSQLC("1","报告权限申请流程","QXSQ","报告权限申请流程",""), + SCBGLC("2","上传报告流程","SCBG","上传报告流程",""), ; private String value; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java new file mode 100644 index 0000000..432427a --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java @@ -0,0 +1,57 @@ +package com.adc.da.wkflow.listener.SCBG; + +import com.adc.da.login.util.UserUtils; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.wkflow.business_main.entity.BusProcessApprove; +import com.adc.da.wkflow.business_main.entity.BusProcessNew; +import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.adc.da.wkflow.util.SpringContextUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +/** + * 上传报告 发起流程 + */ +public class aid1 implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); + //查询task任务 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId()); + List ttReportManageActs = ttReportManageActDao.selectList(queryWrapper); + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + if (ttReportManageActs.size()>0){ + ttReportManageAct = ttReportManageActs.get(0); + } + //构建工作流代办 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setUserId(UserUtils.getUserId()); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setTaskInfo(delegateTask.getEventName()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setDataId(ttReportManageAct.getDataId()); + busBean.save(busProcessNew); + + //审批结果 + LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); + approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); + List list = approveService.list(approveWrapper); + String fromValsJson = list.get(0).getFromValsJson(); + JSONObject object = JSONObject.parseObject(fromValsJson); + //审批人 + delegateTask.setVariable("oneApprove",object.getString("oneApprove")); + delegateTask.setVariable("twoApprove",object.getString("twoApprove")); + //发起人 + delegateTask.setVariable("userId",object.getString("userId")); + } +} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java new file mode 100644 index 0000000..27d0752 --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java @@ -0,0 +1,57 @@ +package com.adc.da.wkflow.listener.SCBG; + +import com.adc.da.login.util.UserUtils; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.wkflow.business_main.entity.BusProcessApprove; +import com.adc.da.wkflow.business_main.entity.BusProcessNew; +import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.adc.da.wkflow.listener.FlagEnum; +import com.adc.da.wkflow.util.SpringContextUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +/** + * 上传报告 发起流程 + */ +public class aid2 implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); + //查询task任务 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId()); + List ttReportManageActs = ttReportManageActDao.selectList(queryWrapper); + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + if (ttReportManageActs.size()>0){ + ttReportManageAct = ttReportManageActs.get(0); + } + //构建工作流代办 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setUserId(UserUtils.getUserId()); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setTaskInfo(delegateTask.getEventName()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setDataId(ttReportManageAct.getDataId()); + busBean.save(busProcessNew); + + //审批结果 + LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); + approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); + List list = approveService.list(approveWrapper); + String fromValsJson = list.get(0).getFromValsJson(); + JSONObject object = JSONObject.parseObject(fromValsJson); + String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag"); + // 1: 同意 2：退回 + delegateTask.setVariable("flag",s); + + } +} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java new file mode 100644 index 0000000..fe5a6d0 --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java @@ -0,0 +1,61 @@ +package com.adc.da.wkflow.listener.SCBG; + +import com.adc.da.login.util.UserUtils; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.wkflow.business_main.entity.BusProcessApprove; +import com.adc.da.wkflow.business_main.entity.BusProcessNew; +import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.adc.da.wkflow.listener.FlagEnum; +import com.adc.da.wkflow.util.SpringContextUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +/** + * 上传报告 发起流程 + */ +public class aid3 implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); + //查询task任务 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId()); + List ttReportManageActs = ttReportManageActDao.selectList(queryWrapper); + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + if (ttReportManageActs.size()>0){ + ttReportManageAct = ttReportManageActs.get(0); + } + //构建工作流代办 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setUserId(UserUtils.getUserId()); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setTaskInfo(delegateTask.getEventName()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setDataId(ttReportManageAct.getDataId()); + busBean.save(busProcessNew); + + //审批结果 + LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); + approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); + List list = approveService.list(approveWrapper); + String fromValsJson = list.get(0).getFromValsJson(); + JSONObject object = JSONObject.parseObject(fromValsJson); + String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag"); + // 1: 同意 2：退回 + delegateTask.setVariable("flag",s); + if ("1".equals(s)){ + //todo +// ttReportManageActDao.saveBatch(powerApplyActs); + } + + } +} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java new file mode 100644 index 0000000..f1f027d --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java @@ -0,0 +1,55 @@ +package com.adc.da.wkflow.listener.SCBG; + +import com.adc.da.login.util.UserUtils; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.wkflow.business_main.entity.BusProcessApprove; +import com.adc.da.wkflow.business_main.entity.BusProcessNew; +import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.adc.da.wkflow.util.SpringContextUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +/** + * 上传报告 发起流程 + */ +public class aid4 implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); + //查询task任务 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId()); + List ttReportManageActs = ttReportManageActDao.selectList(queryWrapper); + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + if (ttReportManageActs.size()>0){ + ttReportManageAct = ttReportManageActs.get(0); + } + //构建工作流代办 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setUserId(UserUtils.getUserId()); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setTaskInfo(delegateTask.getEventName()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setDataId(ttReportManageAct.getDataId()); + busBean.save(busProcessNew); + + //审批结果 + LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); + approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); + List list = approveService.list(approveWrapper); + String fromValsJson = list.get(0).getFromValsJson(); + JSONObject object = JSONObject.parseObject(fromValsJson); + + delegateTask.setVariable("oneApprove",object.getString("oneApprove")); + delegateTask.setVariable("twoApprove",object.getString("twoApprove")); + } +} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java index 1a06f3b..b92648c 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java @@ -7,6 +7,7 @@ import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.entity.BusProcessNew; import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.adc.da.wkflow.enums.FlowTypeEnum; import com.adc.da.wkflow.util.SpringContextUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -35,12 +36,11 @@ public class aid1 implements TaskListener { } //构建工作流代办 BusProcessNew busProcessNew = new BusProcessNew(); -// busProcessNew.setUserId(powerApplyAct.getUpdateUserId()); busProcessNew.setUserId(UserUtils.getUserId()); busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setTaskInfo(delegateTask.getEventName()); busProcessNew.setTaskId(delegateTask.getId()); -// busProcessNew.set(FlowTypeEnum.BGQXSQLC.getValue()); + busProcessNew.set(FlowTypeEnum.BGQXSQLC.getValue()); busProcessNew.setDataId(powerApplyAct.getDataId()); busBean.save(busProcessNew);