Browse Source

技术成果,技术需求BUG修改

anderx 8 years ago
parent
commit
2bbf565c2e

+ 1 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -296,6 +296,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != hot) {
 			params.put("hot", hot);
 		}
+		
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("techBrokerId", TokenManager.getAdminId());
 		}

+ 7 - 2
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -94,8 +94,13 @@ public class AdminAchievementApiController extends CertifyApiController {
         if (StringUtils.isNumeric(pageNo)) {
             pNo = Integer.parseInt(pageNo);
         }
-        res.setData(achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
+        
+        Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize,boutique,hot);
+        
+        res.setData(o);
+        
+        
         return res;
     }
     /**

+ 6 - 8
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -865,7 +865,7 @@
 	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="techBrokerId != null">
-		a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%') 	
@@ -903,9 +903,7 @@
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
+	
 	<if test="boutique != null">
 		and a.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
@@ -938,7 +936,7 @@
 	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="techBrokerId != null">
-		a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
@@ -976,9 +974,7 @@
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
+	
 	<if test="hot != null and hot == 0"><!-- 不在首页 -->
 		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
 	</if>
@@ -1039,6 +1035,7 @@
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
+	
 	order by serial_number desc
 	<if test="page_sql!=null">
 			${page_sql}
@@ -1080,6 +1077,7 @@
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
+	
   </select>
   
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">

+ 12 - 0
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -133,6 +133,18 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer boutique;
 	
+	@Max(value = 500, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer remark;
+	
+	public Integer getRemark() {
+		return remark;
+	}
+
+	public void setRemark(Integer remark) {
+		this.remark = remark;
+	}
+
 	public String getId() {
 		return id;
 	}