Просмотр исходного кода

科技成果组织、个人合并列表查询修正

Michael лет назад: 8
Родитель
Сommit
3a9aaed82b

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

@@ -61,7 +61,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      * 个人成果列表
      * 个人成果列表
      */
      */
     @RequestMapping(value = "/userList", method = RequestMethod.GET)
     @RequestMapping(value = "/userList", method = RequestMethod.GET)
-    private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
+    private Result userList(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
             Integer serialNumber, String name, String keyword, Integer category, Integer status,
             Integer serialNumber, String name, String keyword, Integer category, Integer status,
             String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String pageNo,
             String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String pageNo,
             String pageSize,Integer boutique,Integer hot) {
             String pageSize,Integer boutique,Integer hot) {
@@ -75,7 +75,7 @@ public class AdminAchievementApiController extends CertifyApiController {
             pNo = Integer.parseInt(pageNo);
             pNo = Integer.parseInt(pageNo);
         }
         }
        
        
-        res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
+        res.setData(achievementService.listUserOwnerAchievement(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name,
                 keyword, category, status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
                 keyword, category, status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
         return res;
         return res;
     }
     }
@@ -83,7 +83,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      * 组织用户成果列表
      * 组织用户成果列表
      */
      */
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
-    private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
+    private Result orgList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
             Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
             Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
         Result res = new Result();
@@ -96,7 +96,7 @@ public class AdminAchievementApiController extends CertifyApiController {
             pNo = Integer.parseInt(pageNo);
             pNo = Integer.parseInt(pageNo);
         }
         }
         
         
-        Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+        Object o = achievementService.listOrgOwnerAchievement(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
                 keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
                 keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
         
         
         res.setData(o);
         res.setData(o);

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

@@ -19,7 +19,7 @@ import com.goafanti.portal.bo.InternationalListBo;
 
 
 public interface AchievementService {
 public interface AchievementService {
 
 
-	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
 
 
@@ -39,7 +39,7 @@ public interface AchievementService {
 
 
 	int updateReleaseStatus(Achievement a);
 	int updateReleaseStatus(Achievement a);
 
 
-	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 

+ 10 - 8
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -94,11 +94,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
+	public Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 			Integer boutique, Integer hot) {
-		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+		Map<String, Object> params = disposeParams(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,null, hot);
 				boutique,null, hot);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
@@ -119,11 +119,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
+	public Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 			Integer boutique, Integer hot) {
-		Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,internationalFlag, hot);
 				boutique,internationalFlag, hot);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
@@ -215,12 +215,12 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 			pSize = 10;
 		}
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
-				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
+				disposeParams(ownerType,null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
 						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
 						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
 				pNo, pSize);
 				pNo, pSize);
 	}
 	}
 
 
-	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
+	private Map<String, Object> disposeParams(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
 			Integer boutique,String internationalFlag, Integer hot) {
 			Integer boutique,String internationalFlag, Integer hot) {
@@ -230,7 +230,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		Date rEnd = null;
 		Date rEnd = null;
 		Date cStart = null;
 		Date cStart = null;
 		Date cEnd = null;
 		Date cEnd = null;
-
+		if (null != ownerType) {
+			params.put("ownerType", ownerType);
+		}
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 			try {
 			try {
 				rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
 				rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
@@ -725,7 +727,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 			pSize = 10;
 		}
 		}
-		Map<String, Object> params=disposeParams(null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
+		Map<String, Object> params=disposeParams(ownerType,null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
 				status, releaseDateStartDate, releaseDateEndDate,null, null,  releaseStatus, null, null,null, null);
 				status, releaseDateStartDate, releaseDateEndDate,null, null,  releaseStatus, null, null,null, null);
 		if (null!=fieldA) {
 		if (null!=fieldA) {
 			params.put("fieldA", fieldA);
 			params.put("fieldA", fieldA);

+ 15 - 9
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -855,7 +855,7 @@
   	select 
   	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		oi.unit_name as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
+  		<!-- oi.unit_name as username,  -->a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
   		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
   		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
 		,1 as hot
@@ -868,7 +868,7 @@
 	</if>
 	</if>
   	from achievement a
   	from achievement a
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
+	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
 	<if test="adminId != null">
 	<if test="adminId != null">
 		LEFT JOIN user u on a.owner_id = u.id
 		LEFT JOIN user u on a.owner_id = u.id
 	</if>
 	</if>
@@ -878,16 +878,19 @@
 	<if test="hot == null"> <!-- 无首页参数 -->
 	<if test="hot == null"> <!-- 无首页参数 -->
 		left join marketing_management mm on a.id = mm.product_id 
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
 	</if>
-  	where a.deleted_sign = 0 and a.owner_type = 1
+  	where a.deleted_sign = 0 
+  	<if test="ownerType != null">
+		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
+	</if>
   	<if test="techBrokerId != null">
   	<if test="techBrokerId != null">
 		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
 	</if>
   	<if test="ownerName != null">
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%') 	
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%') 	
   	</if>
   	</if>
-  	<if test="unitName != null">
+  	<!-- <if test="unitName != null">
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if>
+  	</if> -->
   	<if test="ownerId != null">
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
 	</if>
@@ -945,7 +948,7 @@
   		count(1)
   		count(1)
   	from achievement a
   	from achievement a
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
+	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
 	<if test="adminId != null">
 	<if test="adminId != null">
 		LEFT JOIN user u on a.owner_id = u.id
 		LEFT JOIN user u on a.owner_id = u.id
 	</if>
 	</if>
@@ -955,16 +958,19 @@
 	<if test="hot == null"> <!-- 无首页参数 -->
 	<if test="hot == null"> <!-- 无首页参数 -->
 		left join marketing_management mm on a.id = mm.product_id 
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
 	</if>
-  	where a.deleted_sign = 0 and a.owner_type = 1
+  	where a.deleted_sign = 0 
+  	<if test="ownerType != null">
+		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
+	</if>
   	<if test="techBrokerId != null">
   	<if test="techBrokerId != null">
 		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
 	</if>
   	<if test="ownerName != null">
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
-  	<if test="unitName != null">
+  	<!-- <if test="unitName != null">
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if>
+  	</if> -->
   	<if test="ownerId != null">
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
 	</if>