Antiloveg 8 years ago
parent
commit
f76887cf4d

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

@@ -18,7 +18,7 @@ import com.goafanti.portal.bo.AchievementSearchListBo;
 
 public interface AchievementService {
 
-	Pagination<AchievementListBo> listUserOwnerAchievement(String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
 
@@ -38,7 +38,7 @@ public interface AchievementService {
 
 	int updateReleaseStatus(Achievement a);
 
-	Pagination<AchievementListBo> listOrgOwnerAchievement(String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
 

+ 27 - 13
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -82,8 +82,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listUserOwnerAchievement(String ownerId, Integer auditStatus,
-			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
+			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -93,15 +93,16 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
-				"findUserOwnerAchievementCount", disposeParams(ownerId, auditStatus, serialNumber, name, keyword,
-						category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
+				"findUserOwnerAchievementCount",
+				disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.PERSONAL.getCode()),
 				pNo, pSize);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listOrgOwnerAchievement(String ownerId, Integer auditStatus,
-			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
+			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -111,8 +112,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
-				"findOrgOwnerAchievementCount", disposeParams(ownerId, auditStatus, serialNumber, name, keyword,
-						category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
+				"findOrgOwnerAchievementCount",
+				disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode()),
 				pNo, pSize);
 	}
 
@@ -193,14 +195,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage",
-				"findAchievementCount", disposeParams(TokenManager.getUserId(), auditStatus, serialNumber, name,
-						keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
+				"findAchievementCount", disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber,
+						name, keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null),
 				pNo, pSize);
 	}
 
-	private Map<String, Object> disposeParams(String ownerId, Integer auditStatus, Integer serialNumber, String name,
-			String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
-			Integer releaseStatus) {
+	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
+			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
@@ -220,6 +222,18 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			}
 		}
 
+		if (StringUtils.isNotBlank(ownerName)) {
+			params.put("ownerName", ownerName);
+		}
+
+		if (null != type && StringUtils.isNotBlank(username)) {
+			if (UserType.PERSONAL.getCode().equals(type) ) {
+				params.put("username", username);
+			} else {
+				params.put("unitName", username);
+			}
+		}
+
 		if (null != rStart) {
 			params.put("rStart", rStart);
 		}

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

@@ -62,9 +62,10 @@ public class AdminAchievementApiController extends CertifyApiController {
 	 * 个人成果列表
 	 */
 	@RequestMapping(value = "/userList", method = RequestMethod.GET)
-	private Result userList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
-			Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
-			Integer releaseStatus, String pageNo, String pageSize) {
+	private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
+			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String pageNo,
+			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -74,8 +75,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(achievementService.listUserOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
-				category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+		res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
+				keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 	}
 
@@ -83,8 +84,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 	 * 组织用户成果列表
 	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
-	private Result orgList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
-			Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+	private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
+			String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
 			Integer releaseStatus, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -96,8 +97,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(achievementService.listOrgOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
-				category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+		res.setData(achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+				keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 	}
 
@@ -638,6 +639,5 @@ public class AdminAchievementApiController extends CertifyApiController {
 		res.setData(data);
 		return res;
 	}
-	
 
 }

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

@@ -189,7 +189,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 个人用户--需求列表
 	 */
 	@RequestMapping(value = "/userList", method = RequestMethod.GET)
-	public Result userList(Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
+	public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate, String pageNo, String pageSize) {
@@ -203,7 +203,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.selectUserDemandManageList(auditStatus, province, serialNumber, name, keyword,
+		res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
 				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize));
 		return res;
@@ -213,9 +213,9 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 组织用户--需求列表
 	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
-	public Result orgList(Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
+	public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
-			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
+			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -227,8 +227,8 @@ public class AdminDemandApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.selectOrgDemandManageList(auditStatus, province, serialNumber, name, keyword,
-				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
+		res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
+				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
 				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize));
 		return res;
 	}

+ 24 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -655,6 +655,12 @@
   	LEFT JOIN admin ad on a.id = a.tech_broker_id
   	LEFT JOIN user_identity ui on a.owner_id = ui.uid
   	where a.deleted_sign = 0 and a.owner_type = 0
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -699,6 +705,12 @@
   		count(1)
   	from achievement
   	where deleted_sign = 0 and owner_type = 0
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -746,6 +758,12 @@
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
   	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
   	where a.deleted_sign = 0 and a.owner_type = 1
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -790,6 +808,12 @@
   		count(1)
   	from achievement a
   	where a.deleted_sign = 0 and a.owner_type = 1
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>

+ 18 - 6
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -510,7 +510,10 @@
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
 	<if test="username != null">
-		and  ui.username = #{username,jdbcType=VARCHAR}
+		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -577,7 +580,10 @@
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
 	<if test="username != null">
-		and  ui.username = #{username,jdbcType=VARCHAR}
+		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -645,8 +651,11 @@
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
-	<if test="username != null">
-		and  oi.unit_name = #{username,jdbcType=VARCHAR}
+	<if test="unitName != null">
+		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -712,8 +721,11 @@
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
-	<if test="username != null">
-		and  oi.unit_name = #{username,jdbcType=VARCHAR}
+	<if test="unitName != null">
+		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}

+ 3 - 3
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -18,12 +18,12 @@ import com.goafanti.portal.bo.DemandSearchListBo;
 
 public interface DemandService {
 
-	Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, Integer province,
+	Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
-			String validityPeriodStartDate, String validityPeriodEndDate, String employerName, Integer status,
+			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
 
-	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, Integer province, Integer serialNumber,
+	Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);

+ 12 - 4
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -85,7 +85,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, Integer province,
+	public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
@@ -113,6 +113,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
 		}
+		
+		if (StringUtils.isNotBlank(employerName)){
+			params.put("employerName", employerName);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageUserDemandListByPage", "findManageUserDemandCount",
 				params, pNo, pSize);
@@ -121,7 +125,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, Integer province,
+	public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
@@ -148,6 +152,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
 		}
+		
+		if (StringUtils.isNotBlank(employerName)){
+			params.put("employerName", employerName);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageOrgDemandListByPage", "findManageOrgDemandCount",
 				params, pNo, pSize);
@@ -537,9 +545,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			params.put("keyword", keyword);
 		}
 
-		if (!StringUtils.isBlank(username)) {
+		/*if (!StringUtils.isBlank(username)) {
 			params.put("username", username);
-		}
+		}*/
 
 		if (null != infoSources) {
 			params.put("infoSources", infoSources);