kangwei: 会议纪要下载

@@ -96,4 +96,23 @@ public class AjhMeetingAttend {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "序号")
 	private Integer index;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "职务")
+	private String duties;
+
+	public AjhMeetingAttend() {
+	}
+
+	public AjhMeetingAttend(Integer index ,String duties) {
+		this.index = index;
+		this.duties = duties;
+	}
+
+	public AjhMeetingAttend( Integer index,String departName, String userName, String duties) {
+		this.index = index;
+		this.departName = departName;
+		this.userName = userName;
+		this.duties = duties;
+	}
 }

@@ -11,7 +11,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AjhMeetingMinutesMapper extends BaseMapper<AjhMeetingMinutes> {
 
-    AjhMeetingMinutes queryByMeetId(@Param("meetId") String meetId);
+    /**
+     * 根据会议记录编号获取最新的会议纪要内容
+     * @param meetsId
+     * @return
+     */
+    AjhMeetingMinutes queryByMeetsId(@Param("meetsId") String meetsId);
 
     AjhMeetingMinutes getDataById(@Param("id") String id);
 }

@@ -2,8 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.skua.modules.ajh.mapper.AjhMeetingMinutesMapper">
 
-    <select id="queryByMeetId" resultType="com.skua.modules.ajh.entity.AjhMeetingMinutes">
-        select * from ajh_meeting_minutes where meets_id = #{meetId}  order by create_time desc limit 1
+    <!--  根据会议记录编号获取最新的会议纪要内容-->
+    <select id="queryByMeetsId" resultType="com.skua.modules.ajh.entity.AjhMeetingMinutes">
+        select * from ajh_meeting_minutes where meets_id = #{meetsId}  order by create_time desc limit 1
     </select>
 
     <select id="getDataById" resultType="com.skua.modules.ajh.entity.AjhMeetingMinutes">

@@ -3,7 +3,6 @@ package com.skua.modules.ajh.service;
 import com.skua.modules.ajh.entity.AjhMeetingAttend;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.ajh.entity.AjhMeetingSend;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,6 +18,6 @@ public interface IAjhMeetingAttendService extends IService<AjhMeetingAttend> {
      * @param meetsId
      * @return
      */
-    public List<AjhMeetingAttend> getByMeetsId(@Param("meetsId")String meetsId);
+    public List<AjhMeetingAttend> getByMeetsId(String meetsId);
 
 }

@@ -8,7 +8,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAjhMeetingMinutesService extends IService<AjhMeetingMinutes> {
 
-    AjhMeetingMinutes queryByMeetId(String meetId);
+    /***
+     * 根据会议记录编号获取最细的会议纪要
+     * @param meetsId
+     * @return
+     */
+    public AjhMeetingMinutes queryByMeetsId(String meetsId);
 
     AjhMeetingMinutes getDataById(String id);
 }

@@ -32,31 +32,17 @@ public class AjhMeetingMinutesServiceImpl extends ServiceImpl<AjhMeetingMinutesM
     @Autowired
     private ISysUserService sysUserService;
 
+    /***
+     * 根据会议记录编号获取最细的会议纪要
+     * @param meetsId
+     * @return
+     */
     @Override
-    public AjhMeetingMinutes queryByMeetId(String meetId) {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        //获取会议记录信息
-        AjhMeetingSend ajhMeetingSend = ajhMeetingSendService.getById(meetId);
-        //获取会议纪要
-        AjhMeetingMinutes ajhMeetingMinutes = ajhMeetingMinutesMapper.queryByMeetId(meetId);
-        if(ajhMeetingMinutes != null){
-            //会议时间
-            if(ajhMeetingSend.getMeetTime()!=null){
-                ajhMeetingMinutes.setAnnTime(ajhMeetingSend.getMeetTime());
-            }
-            //主持人
-            SysUser user = sysUserService.getById(ajhMeetingSend.getMeetCompere());
-            ajhMeetingMinutes.setCompere(user.getRealname());
-            //参与人
-            //创建会议时间
-            ajhMeetingMinutes.setSendDate(formatter.format(ajhMeetingSend.getCreateTime()));
-            //组织单位
-            SysDepart sysDepart = sysDepartService.getById(ajhMeetingSend.getDepartId());
-            ajhMeetingMinutes.setOrgDepart(sysDepart.getDepartName());
-            return ajhMeetingMinutes;
-        }else{
-            return new AjhMeetingMinutes();
-        }
+    public AjhMeetingMinutes queryByMeetsId(String meetsId) {
+
+        AjhMeetingMinutes ajhMeetingMinutes = ajhMeetingMinutesMapper.queryByMeetsId(meetsId);
+
+        return ajhMeetingMinutes;
     }
 
     @Override

@@ -149,7 +149,7 @@ public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper,
         dataMap.put("departMeetContent" ,meetingSend.getMeetContent() );//会议内容
 
         //会议纪要
-        AjhMeetingMinutes ajhMeetingMinutes = ajhMeetingMinutesMapper.queryByMeetId(meetingSend.getId());
+        AjhMeetingMinutes ajhMeetingMinutes = ajhMeetingMinutesMapper.queryByMeetsId(meetingSend.getId());
         if(ajhMeetingMinutes != null ){
            // dataMap.put("meetImage", Pictures.ofLocal(upLoadPath+ File.separator+ ajhMeetingMinutes.getImage() ).size(550, 500).create());
             //dataMap.put("meetImage" ,ajhMeetingMinutes.getImage() );//会议图片  需要转化为图片

@@ -83,29 +83,7 @@ public class DateUtil {
     }
 
 
-    /***
-     * 字符串日期格式化
-     * @param date
-     * @param format
-     * @return
-     */
-    public static String formatDate(String date , String format){
-        if(format == null ){
-            format = "yyyy-MM-dd";
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        SimpleDateFormat formatSDF = new SimpleDateFormat(format);
-        // 转化成日期类型
-        try {
-            Date startDate = sdf.parse(date);
-            date = formatSDF.format(startDate);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return date;
-
-    }
     /**
      *  获取两个日期之间的所有日期 (年月日)
      *
@@ -271,4 +249,42 @@ public class DateUtil {
     public static LocalDateTime dateToLocalDateTime(Date date){
         return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
     }
+
+
+    /***
+     * 字符串日期格式化
+     * @param date
+     * @param format
+     * @return
+     */
+    public static String formatDate(String date , String format){
+        if(format == null ){
+            format = "yyyy-MM-dd";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        SimpleDateFormat formatSDF = new SimpleDateFormat(format);
+        // 转化成日期类型
+        try {
+            Date startDate = sdf.parse(date);
+            date = formatSDF.format(startDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+    public  static  String formatDate(Date dateTime , String format){
+        if(format == null ){
+            format = "yyyy-MM-dd";
+        }
+        String date = "";
+        SimpleDateFormat formatSDF = new SimpleDateFormat(format);
+        // 转化成日期类型
+        try {
+            date = formatSDF.format(dateTime);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
 }

@@ -104,6 +104,21 @@
 			'${item}'
 		</foreach>
 	</select>
+
+
+	<select id="getUserNameByUserIds" resultType="java.lang.String">
+		SELECT
+		username
+		FROM
+		sys_user
+		WHERE
+		id IN
+		<foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+			'${item}'
+		</foreach>
+	</select>
+
+
 	<select id="getUserByUserIds" resultType="com.skua.modules.system.entity.SysUser">
 		SELECT
 		 *

@@ -146,4 +146,11 @@ public interface ISysUserService extends IService<SysUser> {
 	List<SysUser> getUserByUserIds(String userIds);
 
     List<SysUser> operationUserList(String departId);
+
+	/***
+	 * 根据userids返回userName
+	 * @param userIds
+	 * @return
+	 */
+	public String getUserNameByUserIds(String userIds);
 }

@@ -304,6 +304,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return list;
 	}
 
+	/***
+	 * 根据userids返回userName
+	 * @param userIds
+	 * @return
+	 */
+	public String getUserNameByUserIds(String userIds){
+		List<SysUser> userList =  baseMapper.getUserByUserIds(userIds);
+
+		StringBuffer sb = new StringBuffer("");
+		if(userList != null ){
+			for(SysUser  user : userList){
+				if(sb.length() >0 ) sb.append(",");
+				sb.append(user.getUsername());
+			}
+		}
+		return sb.toString();
+	}
+
 	@Override
 	public List<SysUser> operationUserList(String departId) {
 		return userMapper.operationUserList(departId);