zcr:日历--标准化会议日程

2021-11-11 16:12:54 +08:00
parent 8e67f10d46
commit 54477f3784
4 changed files with 96 additions and 12 deletions
@@ -1,17 +1,14 @@
 package com.ydw.bat.wkflow.business_auth;

-import com.github.pagehelper.PageInfo;
-import com.tmsps.fk.common.wrapper.Wrapper;
+
 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 feign.Headers;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;

-import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -125,5 +122,22 @@ public interface LawsUserInfoService {



+    @PostMapping("/sapMeetInfo/addMeeting")
+    public int addMeeting(@RequestBody SapMeeting sapMeeting);
+
+    @GetMapping("/sapMeetInfo/getMeetingsByMonth")
+    public List<SapMeeting> getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date);
+
+    @GetMapping("/sapMeetInfo/getMeetingsByMonthType")
+    public List<SapMeeting> getMeetingsByMonthType(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type);
+
+    @GetMapping("/sapMeetInfo/getMeetingsByDate")
+    public List<SapMeeting> getMeetingsByDate(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type);
+
+    @GetMapping("/sapMeetInfo/getOneById")
+    public SapMeeting getOneById(@RequestParam("id") String id);
+
+    @PostMapping("/sapMeetInfo/getDateMeeting")
+    public int getDateMeeting(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("id") String id,@RequestParam("type") int type);

 }
@@ -0,0 +1,44 @@
+package com.ydw.bat.wkflow.business_slrs.dao;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+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)
+@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
+
+
+}
@@ -1,5 +1,7 @@
 package com.ydw.bat.wkflow.listener.StandardMeetProcess;

+import com.alibaba.fastjson.JSON;
+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 +11,7 @@ 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.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -17,6 +20,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;

 /**
 * EngineerReviseDone - 标准法规工程师汇总修订
@@ -27,6 +31,8 @@ public class EngineerReviseDoneAfter implements TaskListener {
        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
        //流程节点信息
        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //存储会议信息
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
        //流程信息
        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
        //根据流程id找到流程信息
@@ -38,13 +44,8 @@ public class EngineerReviseDoneAfter implements TaskListener {
        List<String> nextUserList = new ArrayList();

        String prcName = "标准化活动参会流程-";
-//            prcName = "标准化活动参会流程-" + "会议结束";
        prcName = prcName + "流程结束";

-        //把ch_pageData(前端的) 中的 meetingStartTime取出，放入最外层大JSON里(object)
-//        JSONObject o1 = object.getJSONObject("ch_pageData");
-//        String meetingStartTime = o1.getString("meetingStartTime");
-//        object.put("meetingStartTime",meetingStartTime);

        //截止时间 流程描述 创建人
        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -83,6 +84,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());
@@ -91,6 +117,8 @@ public class EngineerReviseDoneAfter implements TaskListener {
            busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束");
            busProcessNewNext.setPrcName(prcName);
            busBean.save(busProcessNewNext);
+            lawsUserInfoService.addMeeting(sapMeeting);
+
        }
    }
 }
@@ -30,8 +30,6 @@ public class WriteMaterialAfter implements TaskListener {
        //流程信息
        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);

-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
        //根据流程id找到流程信息
        QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());