Procházet zdrojové kódy

日志新增ufid查看

Administrator před 4 roky
rodič
revize
d726923531

+ 3 - 12
src/main/java/com/goafanti/admin/controller/AdminReleaseApiController.java

@@ -133,22 +133,13 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/listPublicReleaseLog", method = RequestMethod.GET)
-	public Result listPublicReleaseLog(Integer id){
+	public Result listPublicReleaseLog(Integer id,String ufid){
 		Result res =new Result();
-		res.data(publicReleaseService.listPublicReleaseLog(id));
+		res.data(publicReleaseService.listPublicReleaseLog(id,ufid));
 		return res;
 	}
 	
-	/**
-	 * 外出审核日志列表
-	 * @return
-	 */
-	@RequestMapping(value = "/unreadPublicReleaseLog", method = RequestMethod.GET)
-	public Result unreadPublicReleaseLog(){
-		Result res =new Result();
-		res.data(publicReleaseService.unreadPublicReleaseLog());
-		return res;
-	}
+	
 	
 	/**
 	 * 公出统计

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

@@ -19,7 +19,7 @@ public interface PublicReleaseService {
 	int pushExaminePublicRelease(Integer id, Integer status, String remarks, Double duration);
 
 
-	List<outPublicReleaseLog> listPublicReleaseLog(Integer id);
+	List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid);
 
 	int updatePublicRelease(InputPublicRelease in);
 
@@ -33,8 +33,4 @@ public interface PublicReleaseService {
 
 	OutPublicRelease followDtails(String id);
 
-	List<outPublicReleaseLog> unreadPublicReleaseLog();
-
-
-
 }

+ 3 - 7
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -214,16 +214,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 	
 	@Override
-	public List<outPublicReleaseLog> listPublicReleaseLog(Integer id) {
-		List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id);
+	public List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid) {
+		List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id,ufid);
 		return list;
 	}
 
-	@Override
-	public List<outPublicReleaseLog> unreadPublicReleaseLog() {
-		List<outPublicReleaseLog> list=publicReleaseLogMapper.unreadPublicReleaseLog(TokenManager.getAdminId());
-		return list;
-	}
+	
 	@Override
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl) {
 		PublicRelease p=new PublicRelease();

+ 1 - 1
src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java

@@ -45,7 +45,7 @@ public interface PublicReleaseLogMapper {
 	 */
 	int updateByPrimaryKey(PublicReleaseLog record);
 
-	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id);
+	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id,@Param ("ufid")String ufid);
 
 	void updateNoRead();
 

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

@@ -146,11 +146,15 @@
   <select id="listPublicReleaseLog" resultType="com.goafanti.admin.bo.outPublicReleaseLog">
   select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,
 	date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes
-	from public_release_log a left join admin b on a.aid =b.id 
+	from public_release_log a left join admin b on a.aid =b.id
+	left  join public_release pr  on a.prid =pr.id
 	where 1=1
 	<if test="id !=null">
 	and a.prid = #{id}
 	</if>
+	<if test="ufid !=null">
+	and pr.ufid  = #{ufid}
+	</if>
   </select>
 
 </mapper>