浏览代码

Merge branch 'master' of ssh://admin@git.jishutao.com:55555/jishutao/jitao-server.git

wanghui 7 年之前
父节点
当前提交
5c3a82441b

+ 10 - 1
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -121,9 +121,18 @@ public class InputAchievement {
 	private String remark;
 	
 
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer isHot;
 
-	
 
+	public Integer getIsHot() {
+		return isHot;
+	}
+
+	public void setIsHot(Integer isHot) {
+		this.isHot = isHot;
+	}
 
 	public String getRemark() {
 		return remark;

+ 1 - 1
src/main/java/com/goafanti/achievement/controller/UserAchievementApiController.java

@@ -36,7 +36,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 
 @RestController
-@RequestMapping(value = "/open/api/user/achievement")
+@RequestMapping(value = "/api/user/achievement")
 public class UserAchievementApiController extends CertifyApiController {
 	@Resource
 	private AchievementService		achievementService;

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

@@ -90,7 +90,7 @@
       transfer_mode, bargaining_mode, transfer_price,  patent_case, 
       awards, team_des, parameter,  status, 
       create_time, release_status, release_date, 
-      deleted_sign, audit_status,international_flag,boutique)
+      deleted_sign, audit_status,international_flag,boutique,is_hot)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
       #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
@@ -103,7 +103,7 @@
     #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
       #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER},
-       #{internationalFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER})
+       #{internationalFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER}),#{isHot,jdbcType=INTEGER}
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Achievement">
     insert into achievement
@@ -547,6 +547,9 @@
        <if test="boutique != null">
         boutique = #{boutique,jdbcType=INTEGER},
       </if>
+       <if test="isHot != null">
+        is_hot = #{isHot,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -1255,7 +1258,7 @@ audit_status=2
 and info_sources=1
 order by release_date limit #{0}
 </select>
-<select id="listMyAchievementByPage"   resultType="com.goafanti.demand.bo.DemandAchievementListBo">
+<select id="listMyAchievementByPage"   resultType="com.goafanti.portal.bo.AchievementObject">
 	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory,
   		a.name, a.release_date as releaseDate, a.audit_status as auditStatus 

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -68,7 +68,7 @@
 	                    <div class="detail_btn">	
 	                       <a href="javascript:;" onclick="_MEIQIA('showPanel')">我要咨询</a><a href="javascript:;" id="purchase">立即购买</a>
 	                        <input type="hidden" th:val="${achievementdetail.id}" id="Id_" />
-							<input type="hidden" th:typ="${achievementdetail.ownerType}" id="ownerType_" />
+		
 							<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
 	                    </div>