瀏覽代碼

微信接口修改

anderx 4 年之前
父節點
當前提交
8441c2b16f

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

@@ -537,10 +537,10 @@
   </select>
 
   <select id="selectDtails" resultType="com.goafanti.weChat.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.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
+  	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.aid ,c.superior_id suprId,a.uid,
+  	a.clock_in clockIn 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">
 	and a.id= #{id}

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

@@ -97,7 +97,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		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());
+		map.put("data", publicReleaseMapper.selectDtails(in.getId(),null));
 		if (openid!=null) {
 			Integer res= weChatUtils.addNotice(openid, in.getStatus(),in.getId(),date,my.getName(),"["+my.getName()+"]发起外出申请");
 			if (res!=0) {
@@ -284,10 +284,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		//如果不是本人和审核人员则不返回信息
 		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 {
+		}else if(TokenManager.getAdminId().equals(out.getAid())) {
 			out.setPermission(0);
+		}else {
+			out.setPermission(1);
 		}
 		return out;	 
 	}