diff --git a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java index b3d3aeb..70f24be 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java +++ b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java @@ -51,4 +51,9 @@ public class PowerApplyConstants { * 有预览和下载全部报告权限的levelId */ public static final Double SPECIAL_LEVEL_FOUL = 4.0; + + /** + * 有预览和下载全部报告权限的Employee_TYPE_ID + */ + public static final Double EMPLOYEE_TYPE_ID_ONE = 1.0; } 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 ebdcda5..d514fba 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 @@ -54,4 +54,6 @@ public interface PowerApplyActDao extends BaseMapper { List selectActListBydataId(@Param("dataId")String dataId); int batchDel(@Param("ids") List ids); + + boolean deleteByDataId(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 index 931ccdb..d663cfb 100644 --- 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 @@ -47,4 +47,7 @@ public interface TtReportManageActDao extends BaseMapper { List selectByDataId(String dataId); TtReportManageAct selectByPrcId(String prcId); + + boolean deleteByDataId(String dataId); + } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 22b6f55..3f4bf17 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -458,11 +458,14 @@ public class IReportServiceImpl extends ServiceImpl //设置权限 UserEO userEo = userEODao.selectById(UserUtils.getUserId()); String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); //用户级别 double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); //总监拥有全部报告的预览和下载权力 if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || - level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) { + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { list.getRecords().forEach(reportVo -> { reportVo.setPower(PREVIEW_DOWNLOAD); }); @@ -632,9 +635,15 @@ public class IReportServiceImpl extends ServiceImpl //校验权限 //总监(levelId) UserEO userEo = userEODao.selectById(userId); - Double levelId = Double.parseDouble(userEo.getLevelId() == null ? "1.0" : userEo.getLevelId()); - if (levelId.equals(SPECIAL_LEVEL_ONE) || levelId.equals(SPECIAL_LEVEL_TWO) || - levelId.equals(SPECIAL_LEVEL_THREE) || levelId.equals(SPECIAL_LEVEL_FOUL)) { + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); + //用户级别 + double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); + //总监拥有全部报告的预览和下载权力 + if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { return true; } //本人 @@ -680,11 +689,13 @@ public class IReportServiceImpl extends ServiceImpl ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId); //设置部门名称 String department = reportDetailVo.getDepartment(); - String[] idArray = department.split(","); - List orgEOList = orgEOService.query().in("ID", idArray).list(); - if (CollectionUtils.isNotEmpty(orgEOList)) { - String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); - reportDetailVo.setDepartmentName(departmentName); + if (StrUtil.isNotBlank(department)) { + String[] idArray = department.split(","); + List orgEOList = orgEOService.query().in("ID", idArray).list(); + if (CollectionUtils.isNotEmpty(orgEOList)) { + String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); + reportDetailVo.setDepartmentName(departmentName); + } } //设置标签列表 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 9c4a516..4ca2bcd 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 @@ -67,6 +67,10 @@ #{id} + + UPDATE power_apply_act set del_flag = 1 + where data_id = #{dataId} + diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 4bf88c4..e58e00d 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -228,7 +228,7 @@ ORDER BY updateDate desc diff --git a/adc-da-report/target/classes/com/adc/da/report/constant/PowerApplyConstants.class b/adc-da-report/target/classes/com/adc/da/report/constant/PowerApplyConstants.class index 3e0036e..c000014 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/constant/PowerApplyConstants.class and b/adc-da-report/target/classes/com/adc/da/report/constant/PowerApplyConstants.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/PowerApplyActDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/PowerApplyActDao.class index 5b447e3..964b1f2 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/PowerApplyActDao.class and b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/PowerApplyActDao.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class index c37eb6f..86fbdd8 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class and b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class index 42e5fde..8331d40 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class b/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class index b998154..cef2ae9 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class and b/adc-da-report/target/classes/com/adc/da/report/vo/ReportDetailVo.class differ diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml index 9c4a516..4ca2bcd 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -67,6 +67,10 @@ #{id} + + UPDATE power_apply_act set del_flag = 1 + where data_id = #{dataId} + diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 05095f3..e58e00d 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -228,7 +228,7 @@ ORDER BY updateDate desc diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java index 284b9e6..1b63841 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java @@ -160,20 +160,21 @@ public class MenuEOController extends BaseController { RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId); if ("管理员".equals(roleEO.getName())) { menuVOs.forEach(menuVO -> { - menuVO.setBelong(IsBelongEnum.BELONG.getValue()); + if (!"1".equals(menuVO.getIsButton())) { + menuVO.setBelong(IsBelongEnum.BELONG.getValue()); + } }); }else{ List roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage); for (MenuVO menuVO : menuVOs) { for (RoleMenuEO roleMenuEO : roleMenuEOList){ - if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId())){ + if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId()) && !"1".equals(menuVO.getIsButton())){ menuVO.setBelong(IsBelongEnum.BELONG.getValue()); break; } } } } - } //List levelMenus = menuEOService.changeMenu(menuVOs); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 634da53..6de1ddd 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -112,10 +112,7 @@ public class UserEOController extends BaseController { if (userEOService.getUserByLoginName(eo.getAccount(), eo.getUsid()) != null) { return Result.error("用户名已存在！"); } - - userEOService.save(eo); - return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java index 3a5bfd5..e3a4901 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java @@ -79,6 +79,19 @@ public class MenuEO extends TreeEntity implements Serializable { */ private String isUrl; + /** + * 1代表是按钮 + */ + private String isButton; + + public String getIsButton() { + return isButton; + } + + public void setIsButton(String isButton) { + this.isButton = isButton; + } + public String getIsUrl() { return isUrl; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java index 407756f..e959ff9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; -import java.util.UUID; @Service("orgEOService") @Transactional @@ -71,6 +70,7 @@ public class OrgEOService extends ServiceImpl implements IOrgEo orgEO.setId(orgEO.getOrgCode()); baseMapper.insert(orgEO); }else{ + orgEO.setId(orgEO.getOrgCode()); baseMapper.updateById(orgEO); } return Result.success(); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 4ec759d..32eaa3a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -76,7 +76,6 @@ public class UserEOServiceImpl implements IUserEoService { @Override @Transactional(rollbackFor = Exception.class) public void save(UserEO eo) { - // TODO 组织机构和角色 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (StringUtils.isEmpty(eo.getUsid())) { eo.setDelFlag(0); @@ -116,14 +115,14 @@ public class UserEOServiceImpl implements IUserEoService { userRoleEODao.insert(userRoleEO); }); -// // 插入组织关联表 暂时用不上,页面不维护组织机构 -// eo.getOrgList().forEach(c -> { -// UserOrgEO userOrgEO = new UserOrgEO(); -// userOrgEO.setUserId(eo.getUsid()); -// userOrgEO.setOrgId(c.getOrgCode()); -// userOrgEODao.insert(userOrgEO); -// }); - + String[] split = eo.getOrgId().split(","); + // 插入组织关联表 暂时用不上,页面不维护组织机构 + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEODao.insert(userOrgEO); + } } /** diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java index 91664a4..3ab7680 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java @@ -65,6 +65,20 @@ public class MenuVO extends TreeVO { */ private String isUrl; + /** + * + * @return + */ + private String isButton; + + public String getIsButton() { + return isButton; + } + + public void setIsButton(String isButton) { + this.isButton = isButton; + } + public String getIsUrl() { return isUrl; } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml index 01b556e..ef876cd 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml @@ -18,11 +18,12 @@ + - id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url + id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class index ebc333f..aef0655 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index 0bd0148..90e3058 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/entity/MenuEO.class b/adc-da-sys/target/classes/com/adc/da/sys/entity/MenuEO.class index 8f5bca5..7f89fcb 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/entity/MenuEO.class and b/adc-da-sys/target/classes/com/adc/da/sys/entity/MenuEO.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class b/adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class index b0df26d..346455c 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class index fc828f2..f005a64 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/vo/MenuVO.class b/adc-da-sys/target/classes/com/adc/da/sys/vo/MenuVO.class index 6fda33f..226f546 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/vo/MenuVO.class and b/adc-da-sys/target/classes/com/adc/da/sys/vo/MenuVO.class differ diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml index 01b556e..ef876cd 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml @@ -18,11 +18,12 @@ + - id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url + id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index b1e65eb..387d8e1 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -120,6 +120,7 @@ public class TaskController { if(userById.getOrgEOList().size()>0){ map.put("orgName",userById.getOrgEOList().get(0).getOrgName()); } + map.put("name",historicTaskInstance.get("name")); map.put("assignee", enUserName+"(" + consigner + " 委托)"); map.put("assigneeId", busProcessEntrust.getEnUserId()); map.put("prcType",one.getPrcType()); 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 f892965..9c09a6e 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 @@ -894,16 +894,20 @@ public class TodoTaskController { @ApiOperation(value = "删除草稿", notes = "删除草稿") @GetMapping("/deleteDraft") - public Wrapper deleteDraft(String id) { + public Wrapper deleteDraft(String id,String prcType,String dataId) { //iBusProcessNameService.removeById(id); //2022-10-11修改为逻辑删除 如果物理删除，会影响发号器计算的编号数量。导致编号重复。 BusProcessName busProcessName = new BusProcessName(); busProcessName.setId(id); busProcessName.setSubmitStatus(SubmitStatusEnum.DELETE.getValue()); this.iBusProcessNameService.updateById(busProcessName); + //删除业务数据 + iBusProcessNewService.deleteData(prcType,dataId); return WrapMapper.ok("删除成功"); } + + @ApiOperation(value = "已发流程", notes = "已发流程") @PostMapping("/issuedProcess") public Page IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery) { diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java index f621790..a58c672 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java @@ -31,4 +31,10 @@ public interface IBusProcessNewService extends IService { List selectEOByTaskId(String prcId); BusProcessNew selectEOByDataId(String prcId); + /** + * 删除业务数据 + * @param prcType + * @param dataId + */ + void deleteData(String prcType, String dataId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java index 58b2745..1c89be6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java @@ -1,13 +1,18 @@ package com.adc.da.wkflow.business_main.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.wkflow.business_main.entity.BusProcessNew; import com.adc.da.wkflow.business_main.mapper.BusProcessNewMapper; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Comparator; @@ -26,8 +31,14 @@ import java.util.stream.Collectors; @Service public class BusProcessNewServiceImpl extends ServiceImpl implements IBusProcessNewService { + @Autowired private TaskService taskService; + @Autowired + private PowerApplyActDao powerApplyActDao; + + @Autowired + private TtReportManageActDao ttReportManageActDao; /* * @Author yuzhong * @Description @@ -78,4 +89,36 @@ public class BusProcessNewServiceImpl extends ServiceImpl