Merge remote-tracking branch 'origin/Three' into Three

# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
#	src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java

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

@@ -1,18 +1,13 @@
 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.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;
 import java.util.Set;
@@ -122,9 +117,15 @@ public interface LawsUserInfoService {
     @PostMapping("/sarStandProjectLibrary/batchInsert")
     public String batchInsert(@RequestBody List<StandProjectRelationDto> standProjectRelationDtos);
 
+
     @PostMapping("/WgDept/saveBatch")
-    public String wgDeptSaveBatch(@RequestBody List<WgDept> wgDepts);
-
-
+    public String wgDeptSaveBatch(@RequestBody List<WgDept> wgdepts);
+    /**
+     * 日历显示会议日程--流程结束生成会议   （标准化活动，政策课题组）
+     * @param sapMeeting (id, title, type, ...)  type: 1,标准化活动;2,政策课题组
+     * @return 是否插入成功 int
+     */
+    @PostMapping("/sapMeetInfo/addMeeting")
+    public int addMeeting(@RequestBody SapMeeting sapMeeting);
 
 }

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

@@ -0,0 +1,46 @@
+package com.ydw.bat.wkflow.business_slrs.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgDept对象", description="集团参与情况")
+public class WgDept {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "我司在工作组排名顺序")
+    @TableField("dept_order")
+    private String deptOrder;
+
+    @ApiModelProperty(value = "我司人员")
+    @TableField("dept_people_id")
+    private String deptPeopleId;
+
+    @ApiModelProperty(value = "身份")
+    @TableField("identity")
+    private String identity;
+
+    @ApiModelProperty(value = "资料")
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+
+}