Browse Source

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 8 years ago
parent
commit
839531fdd1

+ 4 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -91,5 +91,9 @@ public interface AchievementService {
 			Integer releaseStatus,String ownerId,Integer fieldA, Integer pNo, Integer pSize);
 
 	Pagination<AchievementPartnerListBo> listAppMyAchievement(Integer pNo, Integer pSize);
+
+	AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id);
+
+	
 	
 }

+ 9 - 5
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -214,7 +214,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
+		return (Pagination<AchievementListBo>) findPage("findAppAchievementListByPage", "findAppAchievementCount",
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
 						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
 				pNo, pSize);
@@ -400,8 +400,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 
 	@Override
-	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
-		
+	public AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id) {
 		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
 		int i=achievementMapper.countInterest(a.getId());
 		a.setCountInterest(String.valueOf(i));
@@ -418,6 +417,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public AchievementOrgOwnerDetailBo selectOrgOwnerDetail(String id) {
 		return achievementMapper.selectOrgOwnerDetail(id);
 	}
+	
+	@Override
+	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
+		return achievementMapper.selectUserOwnerDetail(id);
+	}
 
 	@Override
 	public List<DemandAchievementListBo> selectAchievementDemandListByAchievementId(String id) {
@@ -728,8 +732,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
-		}
-		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAchievementListByPage", "findAchievementCount",
+		}																					
+		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAppAchievementListByPage", "findAppAchievementCount",
 				params,pNo, pSize);
 		
 		return p;

+ 14 - 4
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -263,8 +263,13 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		Demand d = new Demand();
 		BeanUtils.copyProperties(demand, d);
-		d.setUrgentDays(demand.getUrgentDays());
-		d.setUrgentMoney(demand.getUrgentMoney());
+		if (StringUtils.isNotBlank(demand.getUrgentDays())) {
+			d.setUrgentDays(demand.getUrgentDays());
+		}
+		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
+			d.setUrgentMoney(demand.getUrgentMoney());
+		}
+			
 		
 		demandService.saveUserDemand(d, validityPeriodFormattedDate, keywords);
 		if (null != hot && hot == 1) { // 属于营销活动
@@ -425,8 +430,13 @@ public class AdminDemandApiController extends CertifyApiController {
 
 		Demand d = new Demand();
 		BeanUtils.copyProperties(demand, d);
-		d.setUrgentDays(demand.getUrgentDays());
-		d.setUrgentMoney(demand.getUrgentMoney());
+		BeanUtils.copyProperties(demand, d);
+		if (StringUtils.isNotBlank(demand.getUrgentDays())) {
+			d.setUrgentDays(demand.getUrgentDays());
+		}
+		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
+			d.setUrgentMoney(demand.getUrgentMoney());
+		}
 		res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, switchSign));
 		// 更新营销活动
 		MarketingManagement mm = marketingManagementService.selectMarket(MarketingPage.mainDemand.getPageUrl(),

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppAchievementDemandController.java

@@ -157,7 +157,7 @@ public class AppAchievementDemandController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"成果必须指定","成果"));
 			return res;
 		}
-		res.setData(achievementService.selectUserOwnerDetail(id));
+		res.setData(achievementService.selectAppUserOwnerDetail(id));
 		return res;
 	}
 	/**

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

@@ -1023,8 +1023,93 @@
 		#{item}
 	</foreach>
   </update>
+  	<select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  	
+	select 
+  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, a.boutique,
+  		a.name, a.keyword, a.category, a.introduction,owner_postal_address as ownerPostalAddress,
+  		a.owner_name as ownerName, a.owner_type as ownerType, a.owner_mobile as ownerMobile,a.field_a as fieldA,a.field_b ,a.field_c as fieldC,
+  		a.status, a.release_date as releaseDate, a.audit_status as auditStatus,f.name as field,f2.name as fieldB,ifnull(b.countInterest,0) as countInterest
+  	from achievement a
+  	left join (
+	select count(0)  as countInterest,achievement_id from achievement_interest group by achievement_id
+			)b on a.id = b.achievement_id 
+  	left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
+  	where deleted_sign = 0 
+	<if test="ownerId != null">
+  	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="serialNumber != null">
+		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="auditStatus != null">
+		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+
+		and  a.name = #{name,jdbcType=VARCHAR}
+
+	</if>
+	<if test="keyword != null">
+
+		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+
+	</if>
+	<if test="dataCategory != null and dataCategory != ''">
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
+  	</if>
+  	<if test="category != null">
+  		and a.category = #{category,jdbcType=INTEGER}
+  	</if>
+	<if test="ownerType != null">
+		and  a.owner_type = #{ownerType,jdbcType=INTEGER}
+	</if>
+	<if test="fieldA != null">
+		and a.field_a  = #{fieldA,jdbcType=VARCHAR}
+	</if>
+	<if test="status != null">
+		and  a.status = #{status,jdbcType=INTEGER}
+	</if>
+	<if test="rStart != null">
+       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rEnd != null">
+	   and  a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="releaseStatus != null">
+	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
+	</if>
+	
+	order by serial_number desc
+	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
   
-   <select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  <select id="findAchievementCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement a
+  	left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
+  	where deleted_sign = 0 
+	<if test="ownerId != null">
+  	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="serialNumber != null">
+		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="auditStatus != null">
+		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+
+		and  a.name = #{name,jdbcType=VARCHAR}
+
+	</if>
+	</select>
+   <select id="findAppAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
   	
 	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, a.boutique,
@@ -1089,13 +1174,14 @@
 	</if>
   </select>
   
-  <select id="findAchievementCount" parameterType="String" resultType="java.lang.Integer">
+  <select id="findAppAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
   		count(1)
   	from achievement a
   	left join field_glossory f on a.field_a=f.id
   	left join field_glossory f2 on a.field_b=f2.id
   	where deleted_sign = 0 
+  	and audit_status = 3
 	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>