Browse Source

Merge remote-tracking branch 'origin/master' into test

anderx 8 years ago
parent
commit
fe95dcd473

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

@@ -96,7 +96,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     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,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
+            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
         Result res = new Result();
         Integer pNo = 1;
         Integer pSize = 10;
@@ -108,7 +108,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         }
         
         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, recordPerson);
         
         res.setData(o);
         
@@ -674,7 +674,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/manageList", method = RequestMethod.GET)
     private Result manageList(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,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
+            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
         Result res = new Result();
         Integer pNo = 1;
         Integer pSize = 10;
@@ -686,7 +686,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         }
         String techBrokerId=TokenManager.getAdminId();
         Object o = achievementService.listManageAchievement(techBrokerId,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,recordPerson);
         res.setData(o);     
         return res;
     }

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

@@ -43,7 +43,7 @@ public interface AchievementService {
 
 	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 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,String recordPerson);
 
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id );
 
@@ -101,7 +101,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listManageAchievement(String techBrokerId,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, 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,String recordPerson);
 	
 	Pagination<AchievementListBo> listMyAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,

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

@@ -106,7 +106,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,null, hot);
+				boutique,null, hot,null);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -128,10 +128,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public 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 releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot) {
+			Integer boutique, Integer hot,String recordPerson) {
 		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot);
+				boutique,internationalFlag, hot,recordPerson);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -258,14 +258,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				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,null),
 				pNo, pSize);
 	}
 
 	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,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
-			Integer boutique,String internationalFlag, Integer hot) {
+			Integer boutique,String internationalFlag, Integer hot,String recordPerson) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
@@ -275,6 +275,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != ownerType) {
 			params.put("ownerType", ownerType);
 		}
+		if (null != recordPerson) {
+			params.put("recordPerson", recordPerson);
+		}
+		
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 			try {
 				rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
@@ -778,7 +782,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		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,null);
 		if (null!=fieldA) {
 			params.put("fieldA", fieldA);
 		}
@@ -817,7 +821,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot);
+				boutique,internationalFlag, hot,null);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -839,10 +843,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public Pagination<AchievementListBo> listManageAchievement(String techBrokerId,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, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot) {
+			Integer boutique, Integer hot,String recordPerson) {
 		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot);
+				boutique,internationalFlag, hot,recordPerson);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

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

@@ -876,6 +876,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>
@@ -946,6 +949,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>
@@ -1996,6 +2002,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>
@@ -2077,6 +2086,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -736,6 +736,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name= #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="dataCategory != null">
 		and d.data_category = #{dataCategory,jdbcType=VARCHAR}
 	</if>
@@ -813,6 +816,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name= #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="dataCategory != null">
 		and d.data_category = #{dataCategory,jdbcType=VARCHAR}
 	</if>
@@ -1931,6 +1937,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="techBrokerId != null">
 		and (d.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} or a.department_id=(select department_id from admin where id=#{techBrokerId,jdbcType=VARCHAR}))
 	</if>
@@ -2018,6 +2027,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="techBrokerId != null">
 		and (d.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} or a.department_id=(select department_id from admin where id=#{techBrokerId,jdbcType=VARCHAR}))
 	</if>

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

@@ -224,7 +224,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result orgList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -237,7 +237,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.selectOrgDemandManageList(dataCategory,employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId(),recordPerson));
 		return res;
 	}
 
@@ -696,7 +696,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result manageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -709,7 +709,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.selectManageDemandManageList(dataCategory,employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId(),recordPerson));
 		return res;
 	}
 	/**

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

@@ -29,7 +29,7 @@ public interface DemandService {
 	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer dataCategory,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 createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId,String recordPerson);
 
 	void saveUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
@@ -106,5 +106,5 @@ public interface DemandService {
 	Pagination<DemandManageListBo> selectManageDemandManageList(Integer dataCategory,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 createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId,String recordPerson);
 }

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

@@ -169,11 +169,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			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 createDateStartDate, String createDateEndDate, Integer pNo,
-			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
+			Integer pSize, Integer boutique, Integer hot, String techBrokerId,String recordPerson) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
-
+		
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -196,6 +196,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
 		}
+		if (null!=recordPerson) {
+			params.put("recordPerson",  recordPerson);
+		}
 
 		/*if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
@@ -1058,7 +1061,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			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 createDateStartDate, String createDateEndDate, Integer pNo,
-			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
+			Integer pSize, Integer boutique, Integer hot, String techBrokerId,String recordPerson) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
@@ -1072,8 +1075,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		}
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
+		} 
+		if (null != recordPerson) {
+			params.put("recordPerson", recordPerson);
 		}
-
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
 		}