--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/resource/ResourceLibraryController.java

@@ -268,7 +268,7 @@ public class ResourceLibraryController {
 			}
 			this.updateSignLanguageStatus(vi);
 			this.updateSignLanguageRelationStatus(vi);
-			System.out.println("任建宇修改團隊積分");
+			
 			if (status == 1) {
 				vi.setStatus_1(status);
 				User user1 = userService.selectByPrimaryKey(vi.getUserId());
@@ -277,7 +277,7 @@ public class ResourceLibraryController {
 					//采集任务个人积分
 					this.saveIntegral(user1.getUserId(), user1.getUserType());
 				    //采集任务团队积分
-					System.out.println("任建宇修改團隊積分");
+					
 					this.saveIntegralTeam(user1.getUserId(), user1.getUserType(),vi);
 				}
 			}
@@ -1061,7 +1061,7 @@ public class ResourceLibraryController {
 		.andEqualTo("deptId",deptId).andNotEqualTo("status", 4).andIn("role", role);
 		
 		Integer count = signLanguageUserRelationService.selectCountByExample(example);
-		System.out.println("任建宇修改團隊積分开始："+count);	
+		
 		
 		//查不到数据证明完成了都完成了任务,进行增加团队积分
 		if(count == 0 || count == null) {
@@ -1079,7 +1079,6 @@ public class ResourceLibraryController {
 				integral.setDepartmentId(deptId);
 			
 		}
-		System.out.println("任建宇修改團隊積分开始");
 		//采集任务ID
 		integral.setSignId(vi.getSignLanguageId());
 		integral.setUploadTime(new Date());
@@ -1087,7 +1086,6 @@ public class ResourceLibraryController {
 		example =	integralTeamService.createExample();
 		example.createCriteria().andEqualTo("departmentId",deptId).andEqualTo("signId",vi.getSignLanguageId());
 		List<IntegralTeam> team = integralTeamService.selectByExample(example);
-		System.out.println("任建宇修改團隊積分开始修改：");	
 		if(team.size() >0) {
 			integral.setId(team.get(0).getId());
 			return integralTeamService.updateByPrimaryKeySelective(integral);

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/community/ExcellentVideoMapper.java

@@ -17,7 +17,7 @@ import com.zrqx.core.vo.sysuser.bg.community.ExcellentVideoListVo;
  */
 public interface ExcellentVideoMapper extends BaseMapper<ExcellentVideo> {
 	@Select("<script>" 
-			+ "SELECT cc.commentNum,cc.department,cc.id,cc.status,text,a.title,cc.uploadTime,cc.userName,cc.video FROM sys_excellent_video cc  left JOIN sys_sign_language a on a.id =cc.signId where 1=1 "
+			+ "SELECT cc.commentNum,cc.department,cc.id,cc.status,text,(select text from sys_content where id =a.contentid )title,cc.uploadTime,cc.userName,cc.video FROM sys_excellent_video cc  left JOIN sys_sign_language a on a.id =cc.signId where 1=1 "
 			+ "<if test = '" + NOTBLANK + "(form.text)'>"  
 		    + " and (cc.title like concat('%',#{form.text},'%') OR cc.userName like concat('%',#{form.text},'%'))"
 		    + "</if>" 

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/information/InformationMapper.java

@@ -13,7 +13,7 @@ import com.zrqx.core.vo.system.bg.information.InformationListVo;
 
 public interface InformationMapper extends BaseMapper<Information> {
 	@Select("<script>" 
-			+ "SELECT id,title,columnId,DATE_FORMAT(publishTime,'%Y-%m-%d %H:%i:%s') publishTime,source,top,"
+			+ "SELECT id,title,columnId,DATE_FORMAT(publishTime,'%Y-%m-%d') publishTime,source,top,"
 			+ "publishUser,lookNum FROM sys_information   where 1=1 "
 			+ "<if test='"+ NOTBLANK +"(form.title)'>"
     		+ " and title like concat('%',#{form.title},'%') "