物料主数据审批完成推送消息

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -215,60 +215,26 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
 
         NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
-        if(nonProdApplyBaseInfo.getMaintenanceType().equals("new")) { //新申请的 发布分发人的待办信息 06.17
+
+       // if(nonProdApplyBaseInfo.getMaintenanceType().equals("new")) { //新申请的 发布分发人的待办信息 06.17 给货源专员发送消息
             //审批通过
             if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
                 //SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
               //  SapNonProdApplyDept newNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getId());
+                 publishHyzyMessage(nonProdApplyBaseInfo);
 
-                String sql="select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
-                        "left join  sa_oporg  o on p.CODE=o.code where  MAIN_ORG_ID in (select id from sa_oporg where  code='HYZY')";
-                List<Map<String, Object>> mapList = this.sqlExecutorDao.queryToListMap(sql);
-                for (Map map : mapList) {
-                    String user = map.get("code").toString();
-                    BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
-                    bsnMessageSponsor.setTaskSponsor(map.get("id").toString());
-                    bsnMessageSponsor.setTitle(nonProdApplyBaseInfo.getGenericName());//通用品名
-                    bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=false");
-                    bsnMessageSponsor.setBusinessId(nonProdApplyBaseInfo.getId());//newNonProdApplyDept.getApplyDeptId()改为BaseInfo 的ID
-                    bsnMessageSponsor.setCreateDate(new Date());
-                    bsnMessageSponsor.setStatus(0);
-                    //List<Map<String, String>> deptStaffList=new ArrayList<>();
-                    //Map <String,String>map=new HashMap<String, String>();
-                    // map.put("");
-                    //deptStaffList.add(map);
-                    // for (Map<String, String> stringMap : deptStaffList) {
-                    BsnMessageExecute messageExecute = new BsnMessageExecute();
-                    String userCode = map.get("personMemberId").toString();//stringMap.get("userCode");
-                    String deptName =  map.get("positionName").toString();//stringMap.get("deptName");
-                    String deptCode =map.get("positionCode").toString();;//stringMap.get("deptCode");
-                    String[] split = userCode.split("@");
-                    messageExecute.setTaskExecute(split[0]);
-                    messageExecute.setBusinessCode(deptCode);
-                    messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
-                    messageExecute.setUpdateDate(new Date());
-                    messageExecute.setTaskDescribe(nonProdApplyBaseInfo.getGenericName()+"-.物料维护("+deptName+")");
-
-                    //保存任务
-                    // bsnMessageApplication.keepTasks(bsnMessageSponsor);
-
-                    bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
-                    messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());
-
-                    List<BsnMessageExecute> executes =new ArrayList<>();
-                    executes.add(messageExecute);
-                    bsnMessageApplication.saveBsnMessageExecute(executes);
-                }
             }
-        }
-        if(nonProdApplyBaseInfo.getMaintenanceType().equals("modify")){ //变更的发布 分发信息
+       // }
+      //  if(nonProdApplyBaseInfo.getMaintenanceType().equals("modify")||
+       //         nonProdApplyBaseInfo.getMaintenanceType().equals("extend")
+       // ){ //变更和扩展的发布 分发信息
 
             //审批通过
-            if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
+          /*   if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
                 SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
                 SapNonProdApplyDept newNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getId());
-
-                List<Map<String, String>> deptStaffList=new ArrayList<>();
+                publishHyzyMessage(nonProdApplyBaseInfo);
+               List<Map<String, String>> deptStaffList=new ArrayList<>();
 
                 BsnMessageSponsor sponsor = bsnMessageSponsorRepository.findByBusinessId(nonProdApplyDept.getApplyDeptId());
                 BsnMessageSponsor newSponsor=new  BsnMessageSponsor();
@@ -298,11 +264,10 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
                 }
                 //保存任务
                 bsnMessageApplication.keepTasks(newSponsor);
-
                  //发布任务
-                bsnMessageApplication.publishTasks(nonProdApplyDept.getApplyDeptId());
-            }
-        }
+                bsnMessageApplication.publishTasks(nonProdApplyDept.getApplyDeptId());*/
+         //   }
+        //}
         nonProdApplyBaseInfo.setStatusId(status.getId());
         nonProdApplyBaseInfo.setApprover(getOperator().getPersonMemberName());
         nonProdApplyBaseInfo.setApprovalDate(new Date());
@@ -317,7 +282,56 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         nonProdApplyBaseInfo.setStatusId(BizBillStatus.ABORTED.getId());
         nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
     }
+     //发布货源专员的待办消息
+    private void publishHyzyMessage(NonProdApplyBaseInfo nonProdApplyBaseInfo){
+        String sql="select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
+                "left join  sa_oporg  o on p.CODE=o.code where  MAIN_ORG_ID in (select id from sa_oporg where  code='HYZY')";
+        List<Map<String, Object>> mapList = this.sqlExecutorDao.queryToListMap(sql);
+        for (Map map : mapList) {
+            String user = map.get("code").toString();
+            BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
+            bsnMessageSponsor.setTaskSponsor(map.get("id").toString());
+            bsnMessageSponsor.setTitle(nonProdApplyBaseInfo.getGenericName());//通用品名
+            bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=false");
+            bsnMessageSponsor.setBusinessId(nonProdApplyBaseInfo.getId());//newNonProdApplyDept.getApplyDeptId()改为BaseInfo 的ID
+            bsnMessageSponsor.setCreateDate(new Date());
+            bsnMessageSponsor.setStatus(0);
+            //List<Map<String, String>> deptStaffList=new ArrayList<>();
+            //Map <String,String>map=new HashMap<String, String>();
+            // map.put("");
+            //deptStaffList.add(map);
+            // for (Map<String, String> stringMap : deptStaffList) {
+            BsnMessageExecute messageExecute = new BsnMessageExecute();
+            String userCode = map.get("personMemberId").toString();//stringMap.get("userCode");
+            String deptName = map.get("positionName").toString();//stringMap.get("deptName");
+            String deptCode = map.get("positionCode").toString();
+            ;//stringMap.get("deptCode");
+            String[] split = userCode.split("@");
+            messageExecute.setTaskExecute(split[0]);
+            messageExecute.setBusinessCode(deptCode);
+            messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
+            messageExecute.setUpdateDate(new Date());
+            String mess="-.物料维护(";
+            if (nonProdApplyBaseInfo.getMaintenanceType().equals("modify")){
+                mess="-.物料变更(";
+            }
+            if (nonProdApplyBaseInfo.getMaintenanceType().equals("extend")){
+                mess="-.物料扩展(";
+            }
+            messageExecute.setTaskDescribe(nonProdApplyBaseInfo.getGenericName() + mess+ deptName + ")");
 
+            //保存任务
+            // bsnMessageApplication.keepTasks(bsnMessageSponsor);
+
+            bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
+            messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());
+
+            List<BsnMessageExecute> executes = new ArrayList<>();
+            executes.add(messageExecute);
+            bsnMessageApplication.saveBsnMessageExecute(executes);
+        }
+
+    }
     /**
      * 流程撤销事件
      **/