diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java index c98bbf51..641f47df 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_slrs.dao; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.ToString; @@ -30,6 +31,7 @@ public class SapMeeting { private String title;//会议标题 + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date date;//会议开始时间 @@ -41,5 +43,7 @@ public class SapMeeting { private String files;//附件 json + private String place; + } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index d77a228b..ab2a40f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -17,6 +17,7 @@ import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -59,7 +60,12 @@ public class DirectorChooseAfter implements TaskListener { if("1".equals(object.getString("passFlag"))) { prcName = prcName + "参会代表填写参会信息表"; - nextUserList.add(object.getString("memberId")); + JSONObject object1=object.getJSONObject("ch_pageData"); + if (object1.getString("meetingInRoleId").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object1.getString("meetingInRoleId").split(",")))); + }else { + nextUserList.add(object1.getString("meetingInRoleId")); + } if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); middle.addAll(nextUserList); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index ffac9401..b43fdcd5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -3,7 +3,9 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.tmsps.fk.common.util.JsonUtil; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.*; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,8 +14,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.business_slrs.dao.SapMeeting; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -32,7 +36,8 @@ public class EngineerReviseDoneAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + LawsUserInfoService infoService=SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -42,8 +47,54 @@ public class EngineerReviseDoneAfter implements TaskListener { List nextUserList = new ArrayList(); String prcName = "标准化活动参会流程-结束"; - - + //入会 + JSONObject object1 = object.getJSONObject("ch_pageData"); + WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO(); + if (StringUtils.isNotEmpty(object1.getString("associaName"))) { + wgWorkGroupShowDTO.setId(object1.getString("associaName")); + wgWorkGroupShowDTO.setLevel("1"); + wgWorkGroupShowDTO.setNature("1"); + if (StringUtils.isNotEmpty(object1.getString("associaNameOne"))) { + wgWorkGroupShowDTO.setId(object1.getString("associaNameOne")); + wgWorkGroupShowDTO.setLevel("2"); + wgWorkGroupShowDTO.setNature("2"); + if (StringUtils.isNotEmpty(object1.getString("associaNameTwo"))) { + wgWorkGroupShowDTO.setId(object1.getString("associaNameTwo")); + wgWorkGroupShowDTO.setLevel("3"); + wgWorkGroupShowDTO.setNature("3"); + } + } + } + wgWorkGroupShowDTO.setTypes("0"); + wgWorkGroupShowDTO.setStatus("1"); + List wgMeetingInfos=new ArrayList<>(); + WgMeetingInfo wgMeetingInfo=new WgMeetingInfo(); + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + wgMeetingInfo.setJoinId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setMeetingName(object1.getString("meetingName")); + wgMeetingInfo.setJoinfile(JsonUtil.toJson(object1.get("uploadFile"))); + wgMeetingInfo.setMeetingTime(object1.getDate("meetingStartTime")); + List shows=new ArrayList<>(); + List strings=new ArrayList<>(); + JSONArray jsonArray=object1.getJSONArray("myPartRole"); + if (!jsonArray.isEmpty()){ + for (Object o : jsonArray) { + JSONObject object2=JSONObject.parseObject(o.toString()); + WgMeetingUserRelationShow wgMeetingUserRelationShow=new WgMeetingUserRelationShow(); + wgMeetingUserRelationShow.setMeetingId(wgMeetingInfo.getId()); + wgMeetingUserRelationShow.setUserId(object2.getString("fillPeopleId")); + if (!strings.contains(object2.getString("fillPeopleId"))){ + strings.add(object2.getString("fillPeopleId")); + } + shows.add(wgMeetingUserRelationShow); + } + } + wgMeetingInfo.setJoinMeetingPeopleInfo(shows); + wgMeetingInfos.add(wgMeetingInfo); + wgMeetingInfo.setMeetingPeople(strings); + wgWorkGroupShowDTO.setWgMeetingInfos(wgMeetingInfos); + infoService.wg_work_group_update(wgWorkGroupShowDTO); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -69,40 +120,6 @@ public class EngineerReviseDoneAfter implements TaskListener { } } } -// WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); -// JSONArray mp = pageData.getJSONArray("myPartRole");//参会人员; -// for(Object o : mp){ -// JSONObject t = (JSONObject) o; -// wgMeetingUserRelation.setUserId(t.getString("fillPeopleId")); -// } - - //入库操作 -// WgMeetingInfo wgMeetingInfo = new WgMeetingInfo();//会议信息 -// wgMeetingInfo.setWgId(object.getString("wgId"));//工作组id -// wgMeetingInfo.setMeetingTime(pageData.getDate("meetingStartTime"));//参会时间 -// wgMeetingInfo.setMeetingName(pageData.getString("meetingName"));//会议名称 -//// wgMeetingInfo.setMeetingPeople();//会议人员 -//// wgMeetingInfo.setJoinMeetingPeopleInfo();//会议人员名称 -// -//// wgMeetingInfo.setMeetingReport(object.getString("commentText"));//会议报告 -// wgMeetingInfo.setMeetingReport(report.toString());//会议报告 -//// wgMeetingInfo.setJoinfile(pageData.getString("uploadFile"));//会议资料 -// wgMeetingInfo.setJoinfile(pageData.getJSONArray("fileTextList").toJSONString());//会议资料 -// wgMeetingInfo.setJoinId(object.getString("joinId"));//前端id -// -// WgPayInfo wgPayInfo = new WgPayInfo(); //会议费用 -// wgPayInfo.setWgId(object.getString("wgId"));//工作组id -//// wgPayInfo.setPrice();//价格 -//// wgPayInfo.setYear();//年份 -//// wgPayInfo.setStatus();//支付状态(0:未支付,1:已支付) -//// wgPayInfo.setInplan();//是否计划内(0:计划内,1:计划外) -//// wgPayInfo.setPayWay();//支付方式 -//// wgPayInfo.setJoinfile();//支付资料 -// wgPayInfo.setPayInfo(pageData.getString("feeKind"));//费用列支 -// wgPayInfo.setJoinId(object.getString("joinId"));//前端id -// -// lawsUserInfoService.saAddWgMeetInfo(wgMeetingInfo); -// lawsUserInfoService.saAddWgPay(wgPayInfo); @@ -151,11 +168,13 @@ public class EngineerReviseDoneAfter implements TaskListener { SapMeeting sapMeeting= new SapMeeting(); sapMeeting.setTitle(json.getString("meetingName")); sapMeeting.setDate(json.getDate("meetingStartTime")); - sapMeeting.setType(1); + sapMeeting.setTitle(json.getString("meetingName")); sapMeeting.setId(UUID.randomUUID().toString()); sapMeeting.setAttend(attends.toJSONString()); sapMeeting.setFiles(files.toJSONString()); sapMeeting.setContent(contents.toString()); + sapMeeting.setType(1); + sapMeeting.setPlace(object1.getString("meetingPlace")); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); @@ -165,7 +184,7 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); - lawsUserInfoService.addMeeting(sapMeeting); + infoService.addMeeting(sapMeeting); } }