rest

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -5,9 +5,11 @@ import com.ydw.bat.wkflow.business_main.datas.dto.*;
 import com.ydw.bat.wkflow.business_main.datas.entity.*;
 import com.ydw.bat.wkflow.business_slrs.dao.*;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -126,7 +128,8 @@ public interface LawsUserInfoService {
      * @return 是否插入成功 int
      */
     @PostMapping("/sapMeetInfo/addMeeting")
-    public int addMeeting(@RequestBody SapMeeting sapMeeting);
+    int addMeeting(@RequestBody SapMeeting sapMeeting);
+
 
     @GetMapping("/sapMeetInfo/getMeetingsByMonth")
     public List<SapMeeting> getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date);

src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java

@@ -0,0 +1,45 @@
+package com.ydw.bat.wkflow.business_slrs.dao;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Data
+@Accessors(chain = true)
+@ToString
+@ApiModel(value="SapMeeting对象", description="流程通过的 标准化活动会议信息表 standard_activity_pass")
+public class SapMeeting {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;//主键-会议id
+
+    private String title;//会议标题
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date date;//会议开始时间
+
+    private String content;//会议内容大纲
+
+    private int type;//标志位--1标准化活动会议,0政策组会议
+
+    private String attend;//参与人 {id,name} json
+
+    private String files;//附件 json
+
+
+}

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java

@@ -1,5 +1,6 @@
 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.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -9,6 +10,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 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.entity.WgMeetingInfo;
+import com.ydw.bat.wkflow.entity.WgPayInfo;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -55,6 +59,57 @@ public class EngineerReviseDoneAfter implements TaskListener {
 
         prcName = "标准化活动参会流程";
 
+
+        JSONObject pageData = object.getJSONObject("ch_pageData");
+        JSONArray mt = pageData.getJSONArray("meetingTable");//议题1;议题2;议题3;--会议报告
+        StringBuilder report = new StringBuilder();
+        for(Object table : mt){
+            JSONObject t = (JSONObject) table;
+            if(t.getString("meetingTheme") != null){
+                if(report.length() > 0){
+                    report.append(";").append(t.getString("meetingTheme"));
+                }else{
+                    report.append(t.getString("meetingTheme"));
+                }
+            }
+        }
+//        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);
+
+
+
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -81,6 +136,31 @@ public class EngineerReviseDoneAfter implements TaskListener {
                 busBean.save(busProcessNewNext);
             }
         }else {
+            JSONObject json = object.getJSONObject("ch_pageData");
+            JSONArray attends = json.getJSONArray("myPartRole");
+            JSONArray files = json.getJSONArray("fileTextList");
+            JSONArray tables = json.getJSONArray("meetingTable");
+            StringBuilder contents = new StringBuilder();
+            for(Object table : tables){
+                JSONObject t = (JSONObject) table;
+                if(t.getString("meetingTheme") != null){
+                    if(contents.length() > 0){
+                        contents.append(";").append(t.getString("meetingTheme"));
+                    }else{
+                        contents.append(t.getString("meetingTheme"));
+                    }
+                }
+            }
+
+            SapMeeting sapMeeting= new SapMeeting();
+            sapMeeting.setTitle(json.getString("meetingName"));
+            sapMeeting.setDate(json.getDate("meetingStartTime"));
+            sapMeeting.setType(1);
+            sapMeeting.setId(UUID.randomUUID().toString());
+            sapMeeting.setAttend(attends.toJSONString());
+            sapMeeting.setFiles(files.toJSONString());
+            sapMeeting.setContent(contents.toString());
+
             BusProcessNew busProcessNewNext = new BusProcessNew();
             busProcessNewNext.setMsgType("clause");
             busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -89,6 +169,8 @@ public class EngineerReviseDoneAfter implements TaskListener {
             busProcessNewNext.setTaskInfo(delegateTask.getName());
             busProcessNewNext.setPrcName(prcName);
             busBean.save(busProcessNewNext);
+            lawsUserInfoService.addMeeting(sapMeeting);
+
         }
     }
 }