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..050cbbb 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,6 @@ public interface PowerApplyActDao extends BaseMapper { int batchInsert(@Param("list")List powerApplyActs); List selectListBydataId(@Param("dataId")String dataId); + + int batchDel(@Param("ids") List ids); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java index 1f146f8..0e273a0 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java @@ -1,6 +1,7 @@ package com.adc.da.report.service; import com.adc.da.report.eo.PowerApply; +import com.adc.da.report.eo.PowerApplyAct; import com.adc.da.report.vo.DeleteParamRequestVO; import com.adc.da.report.vo.PowerApplyPageVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -55,4 +56,6 @@ public interface IPowerApplyService { * @description 根据id或id数组进行删除 */ public void deleteById(DeleteParamRequestVO deleteParamVO); + + void saveBatch(List powerApplyActs); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java index b5b1a52..9f038eb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java @@ -1,8 +1,10 @@ package com.adc.da.report.service.impl; +import com.adc.da.report.dao.mysql.PowerApplyActDao; import com.adc.da.report.dao.mysql.PowerApplyDao; import com.adc.da.report.eo.PowerApply; +import com.adc.da.report.eo.PowerApplyAct; import com.adc.da.report.service.IPowerApplyService; import com.adc.da.report.vo.DeleteParamRequestVO; import com.adc.da.report.vo.PowerApplyPageVO; @@ -11,11 +13,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @author bu @@ -27,6 +31,10 @@ import java.util.List; @Service public class IpowerApplyServiceImpl extends ServiceImpl implements IPowerApplyService { + @Autowired + private PowerApplyActDao powerApplyActDao; + + /** * @param powerApplyPageVO * @return @@ -109,5 +117,12 @@ public class IpowerApplyServiceImpl extends ServiceImpl powerApplyActs) { + baseMapper.saveBatch(powerApplyActs); + List ids = powerApplyActs.stream().map(a -> a.getId()).collect(Collectors.toList()); + powerApplyActDao.batchDel(ids); + } + } 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 90d99dc..7042359 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 @@ -60,6 +60,13 @@ (#{item.id}, #{item.prcId}, #{item.taskId}, #{item.dataId}, #{item.reportId}, #{item.power}, #{item.applyReason}, #{item.userId}, #{item.createUserId}, #{item.createDate}, #{item.updateDate}, #{item.updateUserId}, #{item.delFlag}) + + UPDATE power_apply_act set del_flag = 1 + where id in + + #{id} + + 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 8bcdf14..beb4b3b 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 @@ -85,6 +85,7 @@ AND eo.id NOT IN ( SELECT ru.reportId FROM tr_report_user ru WHERE ru.userId = #{pageVO.usid} ) AND eo.id NOT IN ( SELECT tt.report_id FROM power_apply tt WHERE tt.user_id = #{pageVO.usid} ) + AND eo.id NOT IN (SELECT tt.report_id FROM power_apply_act tt WHERE tt.user_id = #{pageVO.usid} and del_flag != 1 ) and name like CONCAT(CONCAT('%',#{pageVO.name}),'%') 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 4da2ac7..086b72f 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 @@ -252,12 +252,19 @@ public class TodoTaskController { } //监控流程中 变更处理人为永久变更 if (replaceMap != null){ - ibusProcessApproveService.changeAssignee(replaceMap,taskId); + ibusProcessApproveService.changeAssignee(replaceMap,pId); } log.info("task {} find " + taskId); return WrapMapper.ok("改派成功"); } + @ApiOperation(value = "查询当前任务", notes = "查询当前任务") + @ApiImplicitParams(@ApiImplicitParam(name = "taskId", value = "任务id")) + @GetMapping("/selectTask") + public ResponseMessage completeTaskByUserId(String taskId) { + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + return Result.success(task); + } @ApiOperation(value = "完成任务", notes = "流程单个节点任务，直接完成任务") @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java index e71f4cc..6452804 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java @@ -16,7 +16,7 @@ public interface IBusProcessApproveService extends IService { /** * 监控流程中 变更处理人为永久变更 * @param replaceMap - * @param taskId + * @param pId */ - void changeAssignee(String replaceMap,String taskId); + void changeAssignee(String replaceMap,String pId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java index ab052c0..3f8a87e 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java @@ -30,12 +30,16 @@ public class BusProcessApproveServiceImpl extends ServiceImpl busProcessApproves = baseMapper.selectEoByPrcIdAndTask(prcId); + BusProcessApprove busProcessApprove = busProcessApproves.get(0); String fromValsJson = busProcessApprove.getFromValsJson(); JSONObject jsonObject = JSON.parseObject(fromValsJson); - String[] split = replaceMap.split(":"); - jsonObject.replace(split[0],split[1]); + String[] split = replaceMap.split(","); + String[] split1 = split[0].split(":"); + String[] split2 = split[1].split(":"); + jsonObject.replace(split1[0],split1[1]); + jsonObject.replace(split2[0],split2[1]); busProcessApprove.setFromValsJson(jsonObject.toJSONString()); baseMapper.updateById(busProcessApprove); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java index d49534e..1c1c2fb 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java @@ -2,8 +2,8 @@ package com.adc.da.wkflow.listener.powerApply; import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; -import com.adc.da.report.dao.mysql.PowerApplyDao; import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.service.IPowerApplyService; 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; @@ -25,7 +25,7 @@ public class aid3 implements TaskListener { @Override public void notify(DelegateTask delegateTask) { PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class); - PowerApplyDao powerApplyDao = SpringContextUtil.getBean(PowerApplyDao.class); + IPowerApplyService iPowerApplyService = SpringContextUtil.getBean(IPowerApplyService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 @@ -60,7 +60,7 @@ public class aid3 implements TaskListener { // 1: 同意 2：退回 delegateTask.setVariable("flag",s); if ("1".equals(s)){ - powerApplyDao.saveBatch(powerApplyActs); + iPowerApplyService.saveBatch(powerApplyActs); } }