diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java index cd96237d..7ed21607 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java +++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java @@ -14,7 +14,9 @@ public enum BpmMessageEnum { PROCESS_INSTANCE_APPROVE("bpm_process_instance_approve"), // 流程任务被审批通过时，发送给申请人 PROCESS_INSTANCE_REJECT("bpm_process_instance_reject"), // 流程任务被审批不通过时，发送给申请人 - TASK_ASSIGNED("bpm_task_assigned"); // 任务被分配时，发送给审批人 + TASK_ASSIGNED("bpm_task_assigned"), // 任务被分配时，发送给审批人 + BPM_WORK_TASK("bpm_work_task"), //【任务分配】发起任务 + BPM_WORK_TASK_COMPLETE("bpm_work_task_complete"); //【任务分配】任务完成 /** * 短信模板的标识 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java index 4cfde474..060a4da8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java @@ -64,20 +64,33 @@ public class BpmMessageServiceImpl implements BpmMessageService { // smsSendApi.sendSingleSmsToAdmin(BpmMessageConvert.INSTANCE.convert(reqDTO.getStartUserId(), // BpmMessageEnum.PROCESS_INSTANCE_APPROVE.getSmsTemplateCode(), templateParams)); - //发送站内信息 - notifyMessageSendApi.sendSingleMessageToAdmin(BpmMessageConvert.INSTANCE.convert1(reqDTO.getStartUserId(), - BpmMessageEnum.PROCESS_INSTANCE_APPROVE.getSmsTemplateCode(), templateParams)); + // 获得任务分配数据 + String nickName = null; + BpmOAWorkTaskDO workTaskDO = workTaskService.getWorkTaskByProcessInstanceId(reqDTO.getProcessInstanceId()); + if (workTaskDO != null) { + + nickName = userApi.getUser(workTaskDO.getReceiverUserId()).getCheckedData().getNickname(); + + templateParams = new HashMap<>(); + templateParams.put("userName", nickName); + templateParams.put("detailUrl", webProperties.getAdminUi().getUrl() + "/work-task/allocation?fromUserId=" + workTaskDO.getFromUserId() + "&userId=" + workTaskDO.getReceiverUserId()); + + //站内信 + notifyMessageSendApi.sendSingleMessageToAdmin(BpmMessageConvert.INSTANCE.convert1( + reqDTO.getStartUserId(), BpmMessageEnum.BPM_WORK_TASK_COMPLETE.getSmsTemplateCode(), templateParams)); + }else { + + //发送站内信息 + notifyMessageSendApi.sendSingleMessageToAdmin(BpmMessageConvert.INSTANCE.convert1(reqDTO.getStartUserId(), + BpmMessageEnum.PROCESS_INSTANCE_APPROVE.getSmsTemplateCode(), templateParams)); + } //发送审批结果通知至微信 String openId = getUserOpenId(reqDTO.getStartUserId()); if (openId != null) { - // 获得任务分配数据 - BpmOAWorkTaskDO workTaskDO = workTaskService.getWorkTaskByProcessInstanceId(reqDTO.getProcessInstanceId()); if (workTaskDO != null) { - String nickName = userApi.getUser(workTaskDO.getReceiverUserId()).getCheckedData().getNickname(); - subscribeMessageSendApi.sendWorkLogComment(BpmMessageConvert.INSTANCE.convertWorkTask( openId, reqDTO.getProcessInstanceName(), workTaskDO, nickName, reqDTO.getCreateTime(), "formal", true)); @@ -168,17 +181,32 @@ public class BpmMessageServiceImpl implements BpmMessageService { //短信 // smsSendApi.sendSingleSmsToAdmin(BpmMessageConvert.INSTANCE.convert(reqDTO.getAssigneeUserId(), // BpmMessageEnum.TASK_ASSIGNED.getSmsTemplateCode(), templateParams)); - //站内信 - notifyMessageSendApi.sendSingleMessageToAdmin(BpmMessageConvert.INSTANCE.convert1( - reqDTO.getAssigneeUserId(), BpmMessageEnum.TASK_ASSIGNED.getSmsTemplateCode(), templateParams)); + + // 获得任务分配数据 + BpmOAWorkTaskDO workTaskDO = workTaskService.getWorkTaskByProcessInstanceId(reqDTO.getProcessInstanceId()); + if (workTaskDO != null) { + + templateParams = new HashMap<>(); + templateParams.put("taskName", workTaskDO.getTaskName()); + templateParams.put("startUserNickname", reqDTO.getStartUserNickname()); + templateParams.put("detailUrl", webProperties.getAdminUi().getUrl() + "/work-task/my-task?fromUserId=" + workTaskDO.getFromUserId()); + + //站内信 + notifyMessageSendApi.sendSingleMessageToAdmin(BpmMessageConvert.INSTANCE.convert1( + reqDTO.getAssigneeUserId(), BpmMessageEnum.BPM_WORK_TASK.getSmsTemplateCode(), templateParams)); + }else { + + //站内信 + notifyMessageSendApi.sendSingleMessageToAdmin(BpmMessageConvert.INSTANCE.convert1( + reqDTO.getAssigneeUserId(), BpmMessageEnum.TASK_ASSIGNED.getSmsTemplateCode(), templateParams)); + } //微信小程序订阅消息 //发送OA流程待办提醒 String openId = getUserOpenId(assigneeUserId); //只有在微信小程序登陆过用户才会有openid if (openId != null) { - // 获得任务分配数据 - BpmOAWorkTaskDO workTaskDO = workTaskService.getWorkTaskByProcessInstanceId(reqDTO.getProcessInstanceId()); + if (workTaskDO != null) { subscribeMessageSendApi.sendWorkLogComment(BpmMessageConvert.INSTANCE.convertWorkTask( @@ -200,11 +228,8 @@ public class BpmMessageServiceImpl implements BpmMessageService { return webProperties.getAdminUi().getUrl() + "/process-instance/detail?id=" + taskId; } - @Resource - private AdminUserApi adminUserApi; - private String getUserOpenId(Long userId) { - AdminUserRespDTO adminUserRespDTO = adminUserApi.getUser(userId).getData(); + AdminUserRespDTO adminUserRespDTO = userApi.getUser(userId).getData(); return adminUserRespDTO.getOpenId(); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java index 7e2aa679..8657ddff 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java @@ -17,9 +17,11 @@ import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryIn import cn.iocoder.yudao.module.smartfactory.dal.dataobject.packagedata.PackageDataDO; import cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata.FactoryDataMapper; import cn.iocoder.yudao.module.smartfactory.service.factoryinfo.FactoryInfoService; +import cn.iocoder.yudao.module.smartfactory.service.packagedata.PackageDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; @@ -54,6 +56,9 @@ public class FactoryDataServiceImpl implements FactoryDataService { @Resource private FactoryInfoService factoryInfoService; + @Resource + private PackageDataService packageDataService; + @Override public Long createData(List factoryDataDOS) { @@ -64,6 +69,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { } @Override + @Transactional(rollbackFor = Exception.class) public void updateData(FactoryDataSizeCreateReqVO updateReqVO) { // 修改 规格明细数据 @@ -107,10 +113,14 @@ public class FactoryDataServiceImpl implements FactoryDataService { } @Override + @Transactional(rollbackFor = Exception.class) public void deleteData(Long factoryId, String date) { //删除出入库 规格数据 dataSizeService.deleteData(factoryId, date); + + //删除打包线数据 + packageDataService.deletePackageData(factoryId, date); } @Override diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java index 9c9202c9..09248e72 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java @@ -128,7 +128,6 @@ public class FactoryDataSizeServiceImpl implements FactoryDataSizeService{ } @Override - @Transactional(rollbackFor = Exception.class) public void updateData(FactoryDataSizeCreateReqVO updateReqVO) { // 更新