Browse Source

在发布成果、需求、专家时新增判断,如果同平台、客户端、页面时会默认跳过

anderx 8 years ago
parent
commit
117a8f3689

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

@@ -700,6 +700,7 @@ public class AdminAchievementApiController extends CertifyApiController {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果", "成果"));
             return res;
         }
+    	
         res.setData(achievementPublishService.insertachievementPublish(a));     
         return res;
     }

+ 2 - 0
src/main/java/com/goafanti/achievement/service/AchievementPublishService.java

@@ -18,4 +18,6 @@ public interface AchievementPublishService {
 	Pagination<AchievementPublishBo> listPublish(String name, String publishPlatform, Integer publishClient, String publishPage, Integer ifTop,
 			Integer pageNo, Integer pageSize);
 
+	
+
 }

+ 5 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementPublishServiceImpl.java

@@ -33,6 +33,9 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 		String [] aid=a.getAchievementId().split(",");
 		for (String s : aid) {
 			a.setAchievementId(s);
+			if (achievementPublishMapper.checkExisting(a)>0) {
+				continue;
+			}
 			a.setId(UUID.randomUUID().toString());
 			if (null!=TokenManager.getAdminId()) {
 				a.setPublisher(TokenManager.getAdminId());
@@ -98,6 +101,8 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 		}
 		return p;
 	}
+
+	
 	
 
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/AchievementPublishMapper.java

@@ -93,4 +93,6 @@ public interface AchievementPublishMapper {
      * @mbg.generated Tue Jan 30 11:16:40 CST 2018
      */
     int updateByPrimaryKey(AchievementPublish record);
+
+	int checkExisting(AchievementPublish a);
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/DemandPublishMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.AchievementPublish;
 import com.goafanti.common.model.DemandPublish;
 import com.goafanti.common.model.DemandPublishExample;
 import java.util.List;
@@ -72,4 +73,6 @@ public interface DemandPublishMapper {
 	 * @mbg.generated  Wed Jan 31 09:34:27 CST 2018
 	 */
 	int updateByPrimaryKey(DemandPublish record);
+	
+	int checkExisting(DemandPublish a);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpertPublishMapper.java

@@ -93,4 +93,6 @@ public interface ExpertPublishMapper {
      * @mbg.generated Wed Jan 31 14:57:15 CST 2018
      */
     int updateByPrimaryKey(ExpertPublish record);
+
+	int checkExisting(ExpertPublish e);
 }

+ 9 - 1
src/main/java/com/goafanti/common/mapper/AchievementPublishMapper.xml

@@ -421,7 +421,15 @@ where 1=1
 	</if>
 	<if test="ifTop != null">
 		and ap.if_top=#{ifTop,jdbcType=INTEGER}
-
 	</if>
 	</select>
+	 <select id="checkExisting"  resultType="java.lang.Integer">
+	 	select count(1) 
+	 	from achievement_publish
+	 	where 1=1
+	 	and achievement_id= #{achievementId,jdbcType=VARCHAR}
+	 	and publish_platform= #{publishPlatform,jdbcType=VARCHAR}
+	 	and publish_client= #{publishClient,jdbcType=INTEGER}
+	 	and publish_page= #{publishPage,jdbcType=VARCHAR}
+	 </select>
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/common/mapper/DemandPublishMapper.xml

@@ -417,4 +417,14 @@ where 1=1
 
 	</if>
 	</select>
+	
+	<select id="checkExisting"  resultType="java.lang.Integer">
+	 	select count(1) 
+	 	from demand_publish
+	 	where 1=1
+	 	and demand_id= #{demandId,jdbcType=VARCHAR}
+	 	and publish_platform= #{publishPlatform,jdbcType=VARCHAR}
+	 	and publish_client= #{publishClient,jdbcType=INTEGER}
+	 	and publish_page= #{publishPage,jdbcType=VARCHAR}
+	 </select>
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/common/mapper/ExpertPublishMapper.xml

@@ -412,4 +412,14 @@ where 1=1
 	</if>
 		order by ep.if_top, ep.top_number,ep.show_number asc
 	</select>
+	
+	<select id="checkExisting"  resultType="java.lang.Integer">
+	 	select count(1) 
+	 	from expert_publish
+	 	where 1=1
+	 	and expert_id= #{expertId,jdbcType=VARCHAR}
+	 	and publish_platform= #{publishPlatform,jdbcType=VARCHAR}
+	 	and publish_client= #{publishClient,jdbcType=INTEGER}
+	 	and publish_page= #{publishPage,jdbcType=VARCHAR}
+	 </select>
 </mapper>

+ 0 - 1
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
-import com.goafanti.achievement.service.AchievementPublishPageService;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;

+ 3 - 0
src/main/java/com/goafanti/demand/service/impl/DemandPublishServiceImpl.java

@@ -33,6 +33,9 @@ public class DemandPublishServiceImpl extends BaseMybatisDao<DemandPublishMapper
 		String [] did=d.getDemandId().split(",");
 		for (String s : did) {
 			d.setDemandId(s);
+			if (demandPublishMapper.checkExisting(d)>0) {
+				continue;
+			}
 			d.setId(UUID.randomUUID().toString());
 			if (null!=TokenManager.getAdminId()) {
 				d.setPublisher(TokenManager.getAdminId());

+ 3 - 0
src/main/java/com/goafanti/user/service/impl/ExpertPublishServiceImpl.java

@@ -33,6 +33,9 @@ public class ExpertPublishServiceImpl extends BaseMybatisDao<ExpertPublishMapper
 		String [] aid=e.getExpertId().split(",");
 		for (String s : aid) {
 			e.setExpertId(s);
+			if (expertPublishMapper.checkExisting(e)>0) {
+				continue;
+			}
 			e.setId(UUID.randomUUID().toString());
 			if (null!=TokenManager.getAdminId()) {
 				e.setPublisher(TokenManager.getAdminId());