Procházet zdrojové kódy

外出详情修改

Administrator před 4 roky
rodič
revize
c5a55fb311

+ 15 - 1
src/main/java/com/goafanti/admin/bo/OutPublicRelease.java

@@ -14,7 +14,9 @@ public class OutPublicRelease extends PublicRelease {
 	private String releaseEnds;
 	private String createTimes;
 	private Integer status;
-	
+	private String suprId;
+	/** 审核权限*/
+	private Integer permission;
 	public String getNickname() {
 		return nickname;
 	}
@@ -57,6 +59,18 @@ public class OutPublicRelease extends PublicRelease {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+	public String getSuprId() {
+		return suprId;
+	}
+	public void setSuprId(String suprId) {
+		this.suprId = suprId;
+	}
+	public Integer getPermission() {
+		return permission;
+	}
+	public void setPermission(Integer permission) {
+		this.permission = permission;
+	}
 	
 	
 }

+ 2 - 1
src/main/java/com/goafanti/admin/service/PublicReleaseService.java

@@ -1,6 +1,7 @@
 package com.goafanti.admin.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.goafanti.admin.bo.InputPublicDtails;
 import com.goafanti.admin.bo.InputPublicRelease;
@@ -11,7 +12,7 @@ import com.goafanti.admin.bo.outPublicReleaseLog;
 
 public interface PublicReleaseService {
 
-	int addPublicRelease(InputPublicRelease in);
+	Map<String, Object> addPublicRelease(InputPublicRelease in);
 
 	Object listPublicRelease(InputPublicReleaseList in);
 

+ 18 - 4
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -71,7 +71,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private SystemWebSocketHandler	systemWebSocketHandler;
 	
 	@Override
-	public int addPublicRelease(InputPublicRelease in) {
+	public Map<String, Object> addPublicRelease(InputPublicRelease in) {
 		Date date =new Date();
 		in.setCreateTime(date);
 		in.setStatus(1);
@@ -92,16 +92,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		User u=userMapper.selectByPrimaryKey(in.getUid());
 		String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
 		sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
+		Map<String, Object>map=new HashMap<String, Object>();
+		map.put("id", in.getId());
 		if (openid!=null) {
 			Integer res= weChatUtils.addNotice(openid, in.getStatus(),date,my.getName(),str);
 			if (res!=0) {
 				sendEmail(my, a,1);
 			}
-			return  res;
+			map.put("code", res);
+			
+			
 		}else {
 			sendEmail(my, a,1);
-			return 2;
+			map.put("code", 2);
 		}
+		return map;
 	}
 
 
@@ -244,7 +249,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public OutPublicRelease dtails(Integer id) {
-		return	publicReleaseMapper.selectDtails(id,null); 
+		OutPublicRelease out=publicReleaseMapper.selectDtails(id,null);
+		//如果不是本人和审核人员则不返回信息
+		if(out!=null&&!TokenManager.getAdminId().equals( out.getAid())&&!TokenManager.getAdminId().equals(out.getSuprId())) {
+			out=null;
+		}else if(TokenManager.getAdminId().equals(out.getSuprId())) {
+			out.setPermission(1);
+		}else {
+			out.setPermission(0);
+		}
+		return out;	 
 	}
 	
 	@Override

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -521,7 +521,7 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
   <select id="selectDtails" resultType="com.goafanti.admin.bo.OutPublicRelease">
   		select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
 date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
-a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude 
+a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid
 	from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
 	where 1=1
 	<if test="id !=null">

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserChannelMapper.xml

@@ -373,6 +373,6 @@
     select 
     <include refid="Base_Column_List" />
     from user_channel
-    where uid = #{id}
+    where uid = #{id} limit 1
   </select>
 </mapper>