Browse Source

科技成果"感兴趣列表"

Antiloveg 8 years ago
parent
commit
458f1a9389

+ 2 - 2
src/main/java/com/goafanti/common/mapper/AchievementInterestMapper.xml

@@ -89,7 +89,7 @@
   	left join achievement a on a.id = ai.achievement_id
   	where 1=1
   	<if test="uid != null">
-  		ai.uid = #{uid,jdbcType=VARCHAR}
+  		and ai.uid = #{uid,jdbcType=VARCHAR}
   	</if> 
   	order by ai.create_time desc
   	<if test="page_sql!=null">
@@ -104,7 +104,7 @@
   	left join achievement a on a.id = ai.achievement_id
   	where 1=1
   	<if test="uid != null">
-  		ai.uid = #{uid,jdbcType=VARCHAR}
+  		and	ai.uid = #{uid,jdbcType=VARCHAR}
   	</if> 
   </select>
   

+ 8 - 4
src/main/java/com/goafanti/portal/bo/AchievementInterestListBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class AchievementInterestListBo {
@@ -14,13 +16,13 @@ public class AchievementInterestListBo {
 	private Date	createTime;
 
 	private String	name;
-	
-	private Integer serialNumber;
+
+	private Integer	serialNumber;
 
 	private Integer	deletedSign;
 
 	private Integer	auditStatus;
-	
+
 	public String getName() {
 		return name;
 	}
@@ -61,6 +63,7 @@ public class AchievementInterestListBo {
 		this.createTime = createTime;
 	}
 
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getDeletedSign() {
 		return deletedSign;
 	}
@@ -68,7 +71,8 @@ public class AchievementInterestListBo {
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
 	}
-
+	
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;
 	}