浏览代码

Merge branch 'patch' of https://git.coding.net/aft/AFT.git into patch

Michael 8 年之前
父节点
当前提交
ddab86f33d

+ 11 - 0
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -171,6 +171,17 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer    boutique;
 	private Integer    boutique;
 	
 	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer internationalFlag;
+	public Integer getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(Integer internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
+
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
 	}
 	}

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

@@ -41,7 +41,7 @@ public interface AchievementService {
 
 
 	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, 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 name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			String releaseDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id);
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id);
 
 

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

@@ -96,7 +96,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			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(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique, hot);
+				boutique,null, hot);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -117,11 +117,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	@Override
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(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, Integer releaseStatus, Integer pNo, Integer pSize,
+			String releaseDateStartDate, String releaseDateEndDate, 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(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique, hot);
+				boutique,internationalFlag, hot);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -212,14 +212,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
-						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null, null),
+						status, releaseDateStartDate, releaseDateEndDate, 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(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, Integer releaseStatus, Integer type,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,
-			Integer boutique, Integer hot) {
+			Integer boutique,String internationalFlag, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 
 
 		Date rStart = null;
 		Date rStart = null;
@@ -296,6 +296,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != hot) {
 		if (null != hot) {
 			params.put("hot", hot);
 			params.put("hot", hot);
 		}
 		}
+		if (null != internationalFlag) {
+			params.put("internationalFlag", internationalFlag);
+		}
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("techBrokerId", TokenManager.getAdminId());
 			params.put("techBrokerId", TokenManager.getAdminId());
 		}
 		}

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

@@ -84,7 +84,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(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
-            Integer releaseStatus, 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();
         Integer pNo = 1;
         Integer pNo = 1;
         Integer pSize = 10;
         Integer pSize = 10;
@@ -94,8 +94,13 @@ public class AdminAchievementApiController extends CertifyApiController {
         if (StringUtils.isNumeric(pageNo)) {
         if (StringUtils.isNumeric(pageNo)) {
             pNo = Integer.parseInt(pageNo);
             pNo = Integer.parseInt(pageNo);
         }
         }
-        res.setData(achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
+        
+        Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
+        
+        res.setData(o);
+        
+        
         return res;
         return res;
     }
     }
     /**
     /**

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

@@ -865,7 +865,7 @@
 	</if>
 	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="techBrokerId != null">
   	<if test="techBrokerId != null">
-		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},'%') 	
@@ -903,9 +903,7 @@
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
+	
 	<if test="boutique != null">
 	<if test="boutique != null">
 		and a.boutique = #{boutique,jdbcType=INTEGER}
 		and a.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -938,7 +936,7 @@
 	</if>
 	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="techBrokerId != null">
   	<if test="techBrokerId != null">
-		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},'%')
@@ -976,9 +974,7 @@
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
+	
 	<if test="hot != null and hot == 0"><!-- 不在首页 -->
 	<if test="hot != null and hot == 0"><!-- 不在首页 -->
 		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
 		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
 	</if>
 	</if>
@@ -1039,6 +1035,7 @@
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
+	
 	order by serial_number desc
 	order by serial_number desc
 	<if test="page_sql!=null">
 	<if test="page_sql!=null">
 			${page_sql}
 			${page_sql}
@@ -1080,6 +1077,7 @@
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
+	
   </select>
   </select>
   
   
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">
@@ -1141,7 +1139,7 @@
     	 name, keyword, category,
     	 name, keyword, category,
     	 owner_name, owner_type, owner_id_number,
     	 owner_name, owner_type, owner_id_number,
     	 owner_mobile, owner_email, owner_postal_address,
     	 owner_mobile, owner_email, owner_postal_address,
-    	 cooperation_mode, introduction, tech_broker_id
+    	 cooperation_mode, introduction, tech_broker_id,international_flag
     	 )
     	 )
     values 
     values 
     <foreach item="item" index="index" collection="list" separator=",">
     <foreach item="item" index="index" collection="list" separator=",">
@@ -1151,7 +1149,8 @@
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
-      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR},#{item.techBrokerId,jdbcType=VARCHAR}
+      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR},#{item.techBrokerId,jdbcType=VARCHAR},
+      	#{item.internationalFlag,jdbcType=INTEGER}
       )
       )
     </foreach>
     </foreach>
   </insert>
   </insert>

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

@@ -889,7 +889,7 @@
   		d.budget_cost as budgetCost, d.fixed_cycle as fixedCycle, d.people_number as peopleNumber,
   		d.budget_cost as budgetCost, d.fixed_cycle as fixedCycle, d.people_number as peopleNumber,
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
   		oi.postal_address as address, u.email as mailbox,  d.contacts, d.audit_status as auditStatus,
   		oi.postal_address as address, u.email as mailbox,  d.contacts, d.audit_status as auditStatus,
-  		d.tech_broker_id as techBrokerId,d.remark
+  		d.tech_broker_id as techBrokerId,d.remark,
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
   		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg

+ 12 - 0
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -133,6 +133,18 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer boutique;
 	private Integer boutique;
 	
 	
+	@Max(value = 500, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer remark;
+	
+	public Integer getRemark() {
+		return remark;
+	}
+
+	public void setRemark(Integer remark) {
+		this.remark = remark;
+	}
+
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
 	}
 	}