景聚庭-流程完成后给发起人发送通知

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/service/PsiCollectService.java

@@ -34,6 +34,7 @@ import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
+import org.flowable.bpmn.model.FlowNode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -484,6 +485,8 @@ public class PsiCollectService {
                         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                         String day = format.format(new Date());
                         String title = "[领用编号："+dto.getCollectNo()+"]-领用申请审批通过";
+                        UserDTO initiator = SpringUtil.getBean(IUserApi.class).getById(dto.getHandledById());
+                        notifiedPartyUsers.add(initiator);
                         //向用户发起通知
                         if (null != notifiedPartyUsers) {
                             for (UserDTO userDTO1 : notifiedPartyUsers) {

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/loss/service/PsiLossService.java

@@ -24,8 +24,10 @@ import com.jeeplus.psimanage.psiWareHouse.mapper.PsiWareHouseDetailedMapper;
 import com.jeeplus.psimanage.psiWareHouse.mapper.PsiWareHouseSummaryMapper;
 import com.jeeplus.psimanage.purchase.service.PsiMaterialService;
 import com.jeeplus.psimanage.serialNumTpl.service.PsiSerialnumTplService;
+import com.jeeplus.sys.feign.IRoleApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -175,7 +177,33 @@ public class PsiLossService {
 
         if (!isApproved(oldInfo.getStatus()) && isApproved(info.getStatus())) {
             deductInventory(detail);
+            //通知发起人
+            List<UserDTO> notifiedPartyUsers = new ArrayList<>();
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            String day = format.format(new Date());
+            String title = "[报损编号："+dto.getLossNo()+"]-报损申请审批通过";
+            UserDTO initiator = SpringUtil.getBean(IUserApi.class).getById(dto.getHandledById());
+            notifiedPartyUsers.add(initiator);
+            //向用户发起通知
+            if (null != notifiedPartyUsers) {
+                for (UserDTO userDTO1 : notifiedPartyUsers) {
+                    //发送通知
+                    Map<String ,String > map = new HashMap<>();
+                    map.put("taskId",dto.getProcInsId());
+                    map.put("title",title);
+                    map.put("defId",dto.getProcessDefinitionId());
+                    map.put("taskName","报损申请审批通过");
+                    map.put("createUser","管理员");
+                    map.put("createTime",day);
+                    map.put("noticeName",userDTO1.getLoginName());
+                    map.put("noticeId",userDTO1.getId());
+                    map.put("createById",userDTO.getId());
+                    flowTaskService.add(map);
+                }
+            }
         }
+
+
         return dto.getId();
     }
 

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/service/PsiWareHouseBasicService.java

@@ -417,6 +417,30 @@ public class PsiWareHouseBasicService {
                         }
                     }
                 });
+                //通知发起人
+                List<UserDTO> notifiedPartyUsers = new ArrayList<>();
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                String day = format.format(new Date());
+                String title = "[入库修改："+dto.getPurchaseNo()+"]-入库修改申请审批通过";
+                UserDTO initiator = SpringUtil.getBean(IUserApi.class).getById(dto.getHandledById());
+                notifiedPartyUsers.add(initiator);
+                //向用户发起通知
+                if (null != notifiedPartyUsers) {
+                    for (UserDTO userDTO1 : notifiedPartyUsers) {
+                        //发送通知
+                        Map<String ,String > map = new HashMap<>();
+                        map.put("taskId",dto.getProcInsId());
+                        map.put("title",title);
+                        map.put("defId",dto.getProcessDefinitionId());
+                        map.put("taskName","入库修改申请审批通过");
+                        map.put("createUser","管理员");
+                        map.put("createTime",day);
+                        map.put("noticeName",userDTO1.getLoginName());
+                        map.put("noticeId",userDTO1.getId());
+                        map.put("createById",userDTO.getId());
+                        flowTaskService.add(map);
+                    }
+                }
                 return dto.getId();
             }
             if ("back".equals(dto.getFunctionFlag())) { // 撤回后取消修改、流程终止

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/purchase/service/PsiMaterialService.java

@@ -324,6 +324,8 @@ public class PsiMaterialService {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
             String day = format.format(new Date());
             String title = "[采购编号："+dto.getPurchaseNo()+"]-采购申请审批通过";
+            UserDTO initiator = SpringUtil.getBean(IUserApi.class).getById(dto.getHandledById());
+            notifiedPartyUsers.add(initiator);
             //向用户发起通知
             if (null != notifiedPartyUsers) {
                 for (UserDTO userDTO1 : notifiedPartyUsers) {