Browse Source

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

Conflicts:
	src/main/java/com/goafanti/achievement/service/AchievementService.java
	src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
	src/main/resources/props/config_local.properties
wanghui 8 years ago
parent
commit
fde005087f
32 changed files with 824 additions and 155 deletions
  1. 1 1
      schema/201707012-lecture.sql
  2. 5 0
      schema/data/permission.sql
  3. 5 0
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  4. 3 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  5. 127 0
      src/main/java/com/goafanti/activityUser/bo/ActivityUserListBo.java
  6. 12 0
      src/main/java/com/goafanti/activityUser/service/ActivityUserService.java
  7. 74 2
      src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java
  8. 11 0
      src/main/java/com/goafanti/admin/controller/AdminActivityApiController.java
  9. 75 0
      src/main/java/com/goafanti/admin/controller/AdminActivityUserApiController.java
  10. 64 0
      src/main/java/com/goafanti/admin/controller/AdminAuditApiController.java
  11. 2 2
      src/main/java/com/goafanti/admin/controller/AdminLectureApiController.java
  12. 51 50
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  13. 4 0
      src/main/java/com/goafanti/common/dao/ActivityUserMapper.java
  14. 1 1
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  15. 126 0
      src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml
  16. 32 28
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  17. 28 0
      src/main/java/com/goafanti/common/model/ActivityUser.java
  18. 15 0
      src/main/java/com/goafanti/common/model/Lecture.java
  19. 2 0
      src/main/java/com/goafanti/demand/service/DemandService.java
  20. 47 31
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  21. 2 2
      src/main/resources/props/config_dev.properties
  22. 79 0
      src/main/resources/props/config_local.properties
  23. 2 2
      src/main/resources/props/config_test.properties
  24. 25 7
      src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
  25. 3 3
      src/main/webapp/WEB-INF/views/portal/activity/details.html
  26. 6 6
      src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html
  27. 2 2
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  28. 4 4
      src/main/webapp/WEB-INF/views/portal/highTech/authentication.html
  29. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/iso.html
  30. 9 7
      src/main/webapp/WEB-INF/views/portal/news/newsIndex.html
  31. 3 3
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html
  32. 3 3
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

+ 1 - 1
schema/201707012-lecture.sql

@@ -1,6 +1,6 @@
 CREATE TABLE `lecture` (
   `id` VARCHAR(36) CHARACTER SET 'utf8mb4' NOT NULL,
-  `uid` VARCHAR(36) CHARACTER SET 'utf8mb4' NOT NULL COMMENT '开展讲座人ID',
+  `uid` VARCHAR(36) CHARACTER SET 'utf8mb4'  NULL COMMENT '开展讲座人ID',
   `lecture_time` DATETIME NOT NULL COMMENT '讲座开展时间',
   `create_time` DATETIME NULL COMMENT '记录创建时间',
   `last_update_time` DATETIME NULL COMMENT '记录最后更新时间',

+ 5 - 0
schema/data/permission.sql

@@ -510,3 +510,8 @@ insert into `permission`(`id`, `url`, `name`)
 values
 (UUID(), 'api/admin/cognizanceRecord/search', '高企信息管理--高企信息查询'),
 (UUID(), 'api/admin/cognizanceRecord/import', '高企信息管理--高企信息批量导入');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/audit/modifyAchievementTechBroker', '科技成果技术经纪人流转(审核员)'),
+(UUID(), 'api/admin/audit/modifyDemandTechBroker', '科技需求技术经纪人流转(审核员)');

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

@@ -68,7 +68,12 @@ public interface AchievementService {
 	List<AchievementPortalSimilarListBo> findByFieldA(Integer fieldA, String id, Integer type);
 
 	int updateByPrimaryKeySelective(Achievement a);
+<<<<<<< HEAD
 	
 	/** 查询国际化技术 **/
 	List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementKey);
+=======
+
+
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 }

+ 3 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -603,6 +603,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.updateByPrimaryKey(a);
 	}
 
+<<<<<<< HEAD
 	@Override
 	@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
 	public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
@@ -614,4 +615,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		LoggerUtils.debug(logger, "清除国际化技术列表");
 	}
 
+=======
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 }

+ 127 - 0
src/main/java/com/goafanti/activityUser/bo/ActivityUserListBo.java

@@ -0,0 +1,127 @@
+package com.goafanti.activityUser.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.ActivityUser;
+
+public class ActivityUserListBo extends ActivityUser {
+	private String	activityName;
+
+	private Integer	number;
+
+	private String	mobile;
+
+	private String	username;
+
+	private String	unitName;
+
+	private Date	startTime;
+
+	private Date	endTime;
+
+	private Date	enrollDeadline;
+
+	public String getActivityName() {
+		return activityName;
+	}
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Date getEnrollDeadline() {
+		return enrollDeadline;
+	}
+
+	public void setEnrollDeadline(Date enrollDeadline) {
+		this.enrollDeadline = enrollDeadline;
+	}
+
+	public String getStartTimeFormattedDate() {
+		if (this.startTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setCreateTimeFormattedDate(String startTimeFormattedDate) {
+
+	}
+
+	public String getEndTimeFormattedDate() {
+		if (this.endTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
+
+	}
+	
+	public String getEnrollDeadlineFormattedDate() {
+		if (this.enrollDeadline == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setEnrollDeadlineFormattedDate(String enrollDeadlineFormattedDate) {
+
+	}
+
+}

+ 12 - 0
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -1,6 +1,10 @@
 package com.goafanti.activityUser.service;
 
+import java.util.List;
+
+import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.common.model.ActivityUser;
+import com.goafanti.core.mybatis.page.Pagination;
 
 public interface ActivityUserService {
 
@@ -10,4 +14,12 @@ public interface ActivityUserService {
 
 	int update(ActivityUser au);
 
+	Pagination<ActivityUserListBo> listActivityUser(String activityName, String mobile, String username, Integer number,
+			Integer pageSize, Integer pageNo);
+
+	Pagination<ActivityUserListBo> listActivityOrg(String activityName, String mobile, String unitName, Integer number,
+			Integer pSize, Integer pNo);
+
+	int batchDeleteByPrimaryKey(List<String> asList);
+
 }

+ 74 - 2
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -1,19 +1,28 @@
 package com.goafanti.activityUser.service.impl;
 
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.activityUser.service.ActivityUserService;
 import com.goafanti.common.dao.ActivityUserMapper;
 import com.goafanti.common.model.ActivityUser;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+
 @Service
-public class ActivityUserServiceImpl implements ActivityUserService {
-	
+public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper> implements ActivityUserService {
+
 	@Autowired
 	private ActivityUserMapper activityUserMapper;
+
 	@Override
 	public ActivityUser selectByUid(String uid) {
 		return activityUserMapper.selectByUid(uid);
@@ -39,4 +48,67 @@ public class ActivityUserServiceImpl implements ActivityUserService {
 		return activityUserMapper.updateByPrimaryKey(au);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ActivityUserListBo> listActivityUser(String activityName, String mobile, String username,
+			Integer number, Integer pSize, Integer pNo) {
+
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+
+		return (Pagination<ActivityUserListBo>) findPage("findActivityUserListByPage", "findActivityUserCount",
+				disposeActivityList(activityName, mobile, number, username, null), pNo, pSize);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ActivityUserListBo> listActivityOrg(String activityName, String mobile, String unitName,
+			Integer number, Integer pSize, Integer pNo) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<ActivityUserListBo>) findPage("findActivityOrgListByPage", "findActivityOrgCount",
+				disposeActivityList(activityName, mobile, number, null, unitName), pNo, pSize);
+	}
+
+	private Map<String, Object> disposeActivityList(String activityName, String mobile, Integer number, String username,
+			String unitName) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (StringUtils.isNotBlank(mobile)) {
+			params.put("mobile", mobile);
+		}
+
+		if (null != number) {
+			params.put("number", number);
+		}
+
+		if (StringUtils.isNotBlank(activityName)) {
+			params.put("activityName", activityName);
+		}
+
+		if (StringUtils.isNotBlank(username)) {
+			params.put("username", username);
+		}
+		
+		if (StringUtils.isNotBlank(unitName)){
+			params.put("unitName", unitName);
+		}
+		return params;
+	}
+
+	@Override
+	public int batchDeleteByPrimaryKey(List<String> id) {
+		return activityUserMapper.batchDeleteByPrimaryKey(id);
+	}
+
 }

+ 11 - 0
src/main/java/com/goafanti/admin/controller/AdminActivityApiController.java

@@ -37,6 +37,15 @@ public class AdminActivityApiController extends BaseApiController {
 	private ActivityService	activityService;
 	@Autowired
 	JDBCIdGenerator			idGenerator;
+	
+	/**
+	 * 活动报名列表
+	 */
+	@RequestMapping(value = "/signUpList", method = RequestMethod.GET)
+	public Result signUpList(){
+		Result res = new Result();
+		return res;
+	}
 
 	/**
 	 * 活动列表
@@ -171,6 +180,8 @@ public class AdminActivityApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	
 
 	private Result disposeInputActivity(Result res, InputActivity ia, String startTimeFormattedDate) {
 		if (StringUtils.isBlank(ia.getName())) {

+ 75 - 0
src/main/java/com/goafanti/admin/controller/AdminActivityUserApiController.java

@@ -0,0 +1,75 @@
+package com.goafanti.admin.controller;
+
+import java.util.Arrays;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.activityUser.service.ActivityUserService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
+
+@RestController
+@RequestMapping(value = "/api/admin/activityUser")
+public class AdminActivityUserApiController extends BaseApiController {
+	@Resource
+	private ActivityUserService activityUserService;
+
+	/**
+	 * 活动圈个人用户报名列表
+	 */
+	@RequestMapping(value = "/userList", method = RequestMethod.GET)
+	public Result activityUserList(String activityName, String mobile, String username, Integer number, String pageSize,
+			String pageNo) {
+		Result res = new Result();
+		res.setData(activityUserService.listActivityUser(activityName, mobile, username, number, getPSize(pageSize), getPNo(pageNo)));
+		return res;
+	}
+
+	/**
+	 * 活动圈组织用户报名列表
+	 */
+	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
+	public Result activityOrgList(String activityName, String mobile, String unitName, Integer number, String pageSize,
+			String pageNo) {
+		Result res = new Result();
+		res.setData(activityUserService.listActivityOrg(activityName, mobile, unitName, number, getPSize(pageSize), getPNo(pageNo)));
+		return res;
+	}
+	
+	/**
+	 * 批量删除活动报名记录
+	 */
+	@RequestMapping(value = "/delete", method = RequestMethod.POST)
+	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
+		Result res = new Result();
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			res.setData(activityUserService.batchDeleteByPrimaryKey(Arrays.asList(ids)));
+		}
+		return res;
+	}
+
+	private Integer getPNo(String pageNo) {
+		Integer pNo = 1;
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		return pNo;
+	}
+
+	private Integer getPSize(String pageSize) {
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		return pSize;
+	}
+}

+ 64 - 0
src/main/java/com/goafanti/admin/controller/AdminAuditApiController.java

@@ -27,6 +27,70 @@ public class AdminAuditApiController extends CertifyApiController {
 	private DemandService		demandService;
 	@Resource
 	private AchievementService	achievementService;
+	
+	/**
+	 * 科技成果技术经纪人流转
+	 */
+	@RequestMapping(value = "/modifyAchievementTechBroker", method = RequestMethod.POST)
+	public Result modifyAchievementTechBroker(String id, String techBrokerId){
+		Result res =new Result();
+		if (StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "科技成果ID"));
+			return res;
+		}
+		
+		if(StringUtils.isBlank(techBrokerId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "技术经纪人ID"));
+			return res;
+		}
+		
+		Achievement a = achievementService.selectByPrimaryKey(id);
+		if (null == a){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果ID"));
+			return res;
+		}
+		
+		if (!AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())){
+			res.getError().add(buildError("", "当前状态无法更改技术经纪人!"));
+			return res;
+		}
+		
+		
+		a.setTechBrokerId(techBrokerId);
+		res.setData(achievementService.updateByPrimaryKeySelective(a));
+		return res;
+	}
+	
+	/**
+	 * 科技需求技术经纪人流转
+	 */
+	@RequestMapping(value = "/modifyDemandTechBroker", method = RequestMethod.POST)
+	public Result modifyDemandTechBroker(String id, String techBrokerId){
+		Result res =new Result();
+		if (StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "科技需求ID"));
+			return res;
+		}
+		
+		if(StringUtils.isBlank(techBrokerId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "技术经纪人ID"));
+			return res;
+		}
+		
+		Demand d = demandService.selectByPrimaryKey(id);
+		if (null == d){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技需求ID"));
+			return res;
+		}
+		
+		if (!DemandAuditStatus.AUDITED.getCode().equals(d.getAuditStatus())){
+			res.getError().add(buildError("", "当前状态无法更改技术经纪人!"));
+			return res;
+		}
+		d.setTechBrokerId(techBrokerId);
+		res.setData(demandService.updateByPrimaryKeySelective(d));
+		return res;
+	}
 
 	/**
 	 * 获取技术经纪人下拉

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminLectureApiController.java

@@ -216,10 +216,10 @@ public class AdminLectureApiController extends BaseApiController {
 
 	private Result disposeLecture(Result res, InputLecture il, String lectureTimeFormattedDate,
 			String endTimeFormattedDate) {
-		if (StringUtils.isBlank(il.getUid())) {
+		/*if (StringUtils.isBlank(il.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "讲堂开展人ID"));
 			return res;
-		}
+		}*/
 
 		if (StringUtils.isBlank(il.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "讲堂名称"));

+ 51 - 50
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -2,103 +2,104 @@ package com.goafanti.common.constant;
 
 public class ErrorConstants {
 
-	public static final String	NON_LOGIN						= "NON_LOGIN";
+	public static final String	NON_LOGIN							= "NON_LOGIN";
 
-	public static final String	VCODE_ERROR						= "VCODE_ERROR";
+	public static final String	VCODE_ERROR							= "VCODE_ERROR";
 
-	public static final String	NO_AUTH_ERROR					= "NO_AUTH_ERROR";
+	public static final String	NO_AUTH_ERROR						= "NO_AUTH_ERROR";
 
-	public static final String	PARAM_ERROR						= "PARAM_ERROR";
+	public static final String	PARAM_ERROR							= "PARAM_ERROR";
 
-	public static final String	PARAM_INTEGER_ERROR				= "PARAM_INTEGER_ERROR";
+	public static final String	PARAM_INTEGER_ERROR					= "PARAM_INTEGER_ERROR";
 
-	public static final String	PARAM_EMPTY_ERROR				= "PARAM_EMPTY_ERROR";
+	public static final String	PARAM_EMPTY_ERROR					= "PARAM_EMPTY_ERROR";
 
-	public static final String	PARAM_SIZE_ERROR				= "PARAM_SIZE_ERROR";
+	public static final String	PARAM_SIZE_ERROR					= "PARAM_SIZE_ERROR";
 
-	public static final String	PARAM_PATTERN_ERROR				= "PARAM_PATTERN_ERROR";
+	public static final String	PARAM_PATTERN_ERROR					= "PARAM_PATTERN_ERROR";
 
-	public static final String	EMAIL_SIZE_ERROR				= "EMAIL_SIZE_ERROR";
+	public static final String	EMAIL_SIZE_ERROR					= "EMAIL_SIZE_ERROR";
 
-	public static final String	EMAIL_PATTERN_ERROR				= "EMAIL_PATTERN_ERROR";
+	public static final String	EMAIL_PATTERN_ERROR					= "EMAIL_PATTERN_ERROR";
 
-	public static final String	DUNPLICATE_KAY_ERROR			= "DUNPLICATE_KAY_ERROR";
+	public static final String	DUNPLICATE_KAY_ERROR				= "DUNPLICATE_KAY_ERROR";
 
-	public static final String	DATA_EMPTY_ERROR				= "DATA_EMPTY_ERROR";
+	public static final String	DATA_EMPTY_ERROR					= "DATA_EMPTY_ERROR";
 
-	public static final String	PWD_NOT_MATCH_ERROR				= "PWD_NOT_MATCH_ERROR";
+	public static final String	PWD_NOT_MATCH_ERROR					= "PWD_NOT_MATCH_ERROR";
 
-	public static final String	PWD_SAME_ERROR					= "PWD_SAME_ERROR";
+	public static final String	PWD_SAME_ERROR						= "PWD_SAME_ERROR";
 
-	public static final String	USER_ALREADY_EXIST				= "USER_ALREADY_EXIST";
+	public static final String	USER_ALREADY_EXIST					= "USER_ALREADY_EXIST";
 
-	public static final String	MOBILE_PATTERN_ERROR			= "MOBILE_PATTERN_ERROR";
+	public static final String	MOBILE_PATTERN_ERROR				= "MOBILE_PATTERN_ERROR";
 
-	public static final String	MOBILE_SIZE_ERROR				= "MOBILE_SIZE_ERROR";
+	public static final String	MOBILE_SIZE_ERROR					= "MOBILE_SIZE_ERROR";
 
-	public static final String	MOBILE_SAME_ERROR				= "MOBILE_SAME_ERROR";
+	public static final String	MOBILE_SAME_ERROR					= "MOBILE_SAME_ERROR";
 
-	public static final String	MOBILE_EMPTY_ERROR				= "MOBILE_EMPTY_ERROR";
+	public static final String	MOBILE_EMPTY_ERROR					= "MOBILE_EMPTY_ERROR";
 
-	public static final String	IDNUMBER_SIZE_ERROR				= "IDNUMBER_SIZE_ERROR";
+	public static final String	IDNUMBER_SIZE_ERROR					= "IDNUMBER_SIZE_ERROR";
 
-	public static final String	IDNUMBER_PATTERN_ERROR			= "IDNUMBER_PATTERN_ERROR";
+	public static final String	IDNUMBER_PATTERN_ERROR				= "IDNUMBER_PATTERN_ERROR";
 
-	public static final String	MCODE_ERROR						= "MCODE_ERROR";
+	public static final String	MCODE_ERROR							= "MCODE_ERROR";
 
-	public static final String	MCODE_OVERTIME_ERROR			= "MCODE_OVERTIME_ERROR";
+	public static final String	MCODE_OVERTIME_ERROR				= "MCODE_OVERTIME_ERROR";
 
-	public static final String	NON_REGISTER					= "NON_REGISTER";
+	public static final String	NON_REGISTER						= "NON_REGISTER";
 
-	public static final String	RESET_CODE_ERROR				= "RESET_CODE_ERROR";
+	public static final String	RESET_CODE_ERROR					= "RESET_CODE_ERROR";
 
-	public static final String	RESET_CODE_OVERTIME				= "RESET_CODE_OVERTIME";
+	public static final String	RESET_CODE_OVERTIME					= "RESET_CODE_OVERTIME";
 
-	public static final String	FILE_NON_EXISTENT				= "FILE_NON_EXISTENT";
+	public static final String	FILE_NON_EXISTENT					= "FILE_NON_EXISTENT";
 
-	public static final String	INSUFFICIENT_AUTHORITY_ERROR	= "INSUFFICIENT_AUTHORITY_ERROR";
+	public static final String	INSUFFICIENT_AUTHORITY_ERROR		= "INSUFFICIENT_AUTHORITY_ERROR";
 
-	public static final String	NON_CERTIFIED					= "NON_CERTIFIED";
+	public static final String	NON_CERTIFIED						= "NON_CERTIFIED";
 
-	public static final String	DUPLICATE_DATA_ERROR			= "DUPLICATE_DATA_ERROR";
+	public static final String	DUPLICATE_DATA_ERROR				= "DUPLICATE_DATA_ERROR";
 
-	public static final String	FILE_PATTERN_ERROR				= "FILE_PATTERN_ERROR";
+	public static final String	FILE_PATTERN_ERROR					= "FILE_PATTERN_ERROR";
 
-	public static final String	RECORD_CALLBACK					= "RECORD_CALLBACK";
+	public static final String	RECORD_CALLBACK						= "RECORD_CALLBACK";
 
-	public static final String	RECORD_SETTLEMENT				= "RECORD_SETTLEMENT";
+	public static final String	RECORD_SETTLEMENT					= "RECORD_SETTLEMENT";
 
-	public static final String	STATUS_ERROR					= "STATUS_ERROR";
+	public static final String	STATUS_ERROR						= "STATUS_ERROR";
 
-	public static final String	CONTRACT_PATENT_CREATED			= "CONTRACT_PATENT_CREATED";
+	public static final String	CONTRACT_PATENT_CREATED				= "CONTRACT_PATENT_CREATED";
 
-	public static final String	CONTRACT_COPYRIGHT_CREATED		= "CONTRACT_COPYRIGHT_CREATED";
+	public static final String	CONTRACT_COPYRIGHT_CREATED			= "CONTRACT_COPYRIGHT_CREATED";
 
-	public static final String	CONTRACT_TECHPROJECT_CREATED	= "CONTRACT_TECHPROJECT_CREATED";
+	public static final String	CONTRACT_TECHPROJECT_CREATED		= "CONTRACT_TECHPROJECT_CREATED";
 
-	public static final String	CONTRACT_COGNIZANCE_CREATED		= "CONTRACT_COGNIZANCE_CREATED";
+	public static final String	CONTRACT_COGNIZANCE_CREATED			= "CONTRACT_COGNIZANCE_CREATED";
 
-	public static final String	RECORD_REJECT					= "RECORD_REJECT";
+	public static final String	RECORD_REJECT						= "RECORD_REJECT";
 
-	public static final String	EVALUATE_ID						= "EVALUATE_ID";
+	public static final String	EVALUATE_ID							= "EVALUATE_ID";
 
-	public static final String	EVALUATE_STEP					= "EVALUATE_STEP";
+	public static final String	EVALUATE_STEP						= "EVALUATE_STEP";
 
-	public static final String	EVALUATE_PARAM					= "EVALUATE_PARAM";
+	public static final String	EVALUATE_PARAM						= "EVALUATE_PARAM";
 
-	public static final String	CONTRACT_YEAR_SECTION			= "CONTRACT_YEAR_SECTION";
+	public static final String	CONTRACT_YEAR_SECTION				= "CONTRACT_YEAR_SECTION";
 
-	public static final String	VCODE_EMPTY_ERROR				= "VCODE_EMPTY_ERROR";
+	public static final String	VCODE_EMPTY_ERROR					= "VCODE_EMPTY_ERROR";
 
-	public static final String	MCODE_FREQUENCY_ERROR			= "MCODE_FREQUENCY_ERROR";
+	public static final String	MCODE_FREQUENCY_ERROR				= "MCODE_FREQUENCY_ERROR";
 
-	public static final String	MCODE_EMPTY_ERROR				= "MCODE_EMPTY_ERROR";
+	public static final String	MCODE_EMPTY_ERROR					= "MCODE_EMPTY_ERROR";
 
-	public static final String	IDENTITY_PAY_OVER_TIME			= "IDENTITY_PAY_OVER_TIME";
+	public static final String	IDENTITY_PAY_OVER_TIME				= "IDENTITY_PAY_OVER_TIME";
 
-	public static final String	OVER_MAX_WRONG_COUNT			= "OVER_MAX_WRONG_COUNT";
+	public static final String	OVER_MAX_WRONG_COUNT				= "OVER_MAX_WRONG_COUNT";
 
-	public static final String	WRONG_MONEY						= "WRONG_MONEY";
+	public static final String	WRONG_MONEY							= "WRONG_MONEY";
+
+	public static final String	M_CODE_ERROR						= "M_CODE_ERROR";
 
-	public static final String	M_CODE_ERROR					= "M_CODE_ERROR";
 }

+ 4 - 0
src/main/java/com/goafanti/common/dao/ActivityUserMapper.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
 
@@ -17,4 +19,6 @@ public interface ActivityUserMapper {
     int updateByPrimaryKey(ActivityUser record);
 
 	ActivityUser selectByUid(String uid);
+
+	int batchDeleteByPrimaryKey(List<String> id);
 }

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

@@ -1085,7 +1085,7 @@
   	and a.audit_status = 3
   	order by a.release_date desc
   	<if test="page_sql!=null">
-			${page_sql}
+		${page_sql}
 	</if>
   </select>
   

+ 126 - 0
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -86,4 +86,130 @@
     from activity_user
     where  uid = #{uid,jdbcType=VARCHAR}
   </select>
+  
+  <select id="findActivityUserListByPage" parameterType="String" resultType="com.goafanti.activityUser.bo.ActivityUserListBo">
+  	select
+  		au.aid,
+  		au.uid,
+  		au.create_time as createTime,
+  		au.last_update_time as lastUpdateTime,
+  		a.name as activityName,
+  		u.number,
+  		u.mobile,
+  		ui.username,
+  		a.start_time as startTime,
+  		a.end_time as endTime,
+  		a.enroll_deadline as enrollDeadline
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join user_identity ui on ui.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 0 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by au.last_update_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findActivityUserCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join user_identity ui on ui.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 0 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
+  
+  <select id="findActivityOrgListByPage" parameterType="String" resultType="com.goafanti.activityUser.bo.ActivityUserListBo">
+  	select
+  		au.aid,
+  		au.uid,
+  		au.create_time as createTime,
+  		au.last_update_time as lastUpdateTime,
+  		a.name as activityName,
+  		u.number,
+  		u.mobile,
+  		oi.unit_name as unitName,
+  		a.start_time as startTime,
+  		a.end_time as endTime,
+  		a.enroll_deadline as enrollDeadline
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join organization_identity oi on oi.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by au.last_update_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findActivityOrgCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join organization_identity oi on oi.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
+  
+  <delete id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  	delete
+  		from activity_user
+  	where id in
+  	<foreach item="item" index="index" collection="list" open="("
+			separator="," close=")">
+			#{item}
+	</foreach>
+  </delete>
 </mapper>

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

@@ -481,18 +481,19 @@
 	from  demand d 
 	LEFT JOIN user_identity ui on d.employer_id = ui.uid
 	LEFT JOIN admin a on a.id = d.tech_broker_id
-	<if test="mid != null">
+	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
 	</if>
 	where d.deleted_sign = 0 and d.data_category = 0 
-	<if test="mid != null">
-		and u.mid = #{mid,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		and (u.mid = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="principal != null">
-		and  d.principal_id = #{principal,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="techBroker != null">
-		and  d.tech_broker_id = #{techBroker,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
+		)
 	</if>
 	<if test="province != null">
 		and  ui.province = #{province,jdbcType=INTEGER}
@@ -551,18 +552,19 @@
 	from  demand d 
 	LEFT JOIN user_identity ui on d.employer_id = ui.uid
 	LEFT JOIN admin a on a.id = d.tech_broker_id
-	<if test="mid != null">
+	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
 	</if>
 	where d.deleted_sign = 0 and d.data_category = 0 
-	<if test="mid != null">
-		and u.mid = #{mid,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		and (u.mid = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="principal != null">
-		and  d.principal_id = #{principal,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="techBroker != null">
-		and  d.tech_broker_id = #{techBroker,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
+		)
 	</if>
 	<if test="serialNumber != null">
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
@@ -623,18 +625,19 @@
 	from  demand d 
 	LEFT JOIN organization_identity oi on d.employer_id = oi.uid
 	LEFT JOIN admin a on a.id = d.tech_broker_id
-	<if test="mid != null">
+	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
 	</if>
 	where d.deleted_sign = 0 and d.data_category = 1 
-	<if test="mid != null">
-		and u.mid = #{mid,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		and (u.mid = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="principal != null">
-		and  d.principal_id = #{principal,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="techBroker != null">
-		and  d.tech_broker_id = #{techBroker,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
+		)
 	</if>
 	<if test="province != null">
 		and  oi.licence_province = #{province,jdbcType=INTEGER}
@@ -693,18 +696,19 @@
 	from  demand d 
 	LEFT JOIN organization_identity oi on d.employer_id = oi.uid
 	LEFT JOIN admin a on a.id = d.tech_broker_id
-	<if test="mid != null">
+	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
 	</if>
 	where d.deleted_sign = 0 and d.data_category = 1
-	<if test="mid != null">
-		and u.mid = #{mid,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		and (u.mid = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="principal != null">
-		and  d.principal_id = #{principal,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
 	</if>
-	<if test="techBroker != null">
-		and  d.tech_broker_id = #{techBroker,jdbcType=VARCHAR}
+	<if test="adminId != null">
+		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
+		)
 	</if>
 	<if test="serialNumber != null">
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}

+ 28 - 0
src/main/java/com/goafanti/common/model/ActivityUser.java

@@ -2,6 +2,10 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+
 public class ActivityUser extends ActivityUserKey {
     /**
     * 报名时间
@@ -28,4 +32,28 @@ public class ActivityUser extends ActivityUserKey {
     public void setLastUpdateTime(Date lastUpdateTime) {
         this.lastUpdateTime = lastUpdateTime;
     }
+    
+    public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.createTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+    
+    public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
+	}
+    
+    public String getLastUpdateTimeFormattedDate() {
+		if (this.lastUpdateTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.lastUpdateTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+    
+    public void setLastUpdateTimeFormattedDate(String lastUpdateTimeFormattedDate) {
+
+	}
 }

+ 15 - 0
src/main/java/com/goafanti/common/model/Lecture.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.enums.ActivityStatus;
 
 public class Lecture {
 	private String	id;
@@ -187,4 +188,18 @@ public class Lecture {
 	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
 
 	}
+	
+	public Integer getLectureStatus(){
+		if (this.lectureTime == null){
+			return ActivityStatus.ENROLL.getCode();
+		} 
+		if (new Date().getTime() > this.lectureTime.getTime()){
+			return ActivityStatus.CLOSED.getCode();
+		}
+		return ActivityStatus.ENROLL.getCode();
+	}
+	
+	public void setLectureStatus(Integer lectureStatus){
+		
+	}
 }

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

@@ -70,6 +70,8 @@ public interface DemandService {
 
 	List<DemandPortalSimilarListBo> findByIndustryCategoryA(Integer industryCategoryA, String id);
 
+	int updateByPrimaryKeySelective(Demand d);
+
 
 
 }

+ 47 - 31
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -85,10 +85,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	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) {
+	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) {
 
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
@@ -102,23 +103,27 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			pSize = 10;
 		}
 
-		if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
-			params.put("principal", TokenManager.getAdminId());
-		}
+		/*
+		 * if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) ||
+		 * TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
+		 * params.put("principal", TokenManager.getAdminId()); }
+		 * 
+		 * if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
+		 * params.put("mid", TokenManager.getAdminId()); }
+		 * 
+		 * if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
+		 * params.put("techBroker", TokenManager.getAdminId()); }
+		 */
 
-		if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
-			params.put("mid", TokenManager.getAdminId());
-		}
-
-		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
-			params.put("techBroker", TokenManager.getAdminId());
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
+			params.put("adminId", TokenManager.getAdminId());
 		}
 		
-		if (StringUtils.isNotBlank(employerName)){
+		if (StringUtils.isNotBlank(employerName)) {
 			params.put("employerName", employerName);
 		}
-		
-		if (StringUtils.isNotBlank(username)){
+
+		if (StringUtils.isNotBlank(username)) {
 			params.put("username", username);
 		}
 
@@ -129,10 +134,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	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) {
+	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) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate);
@@ -145,7 +151,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			pSize = 10;
 		}
 
-		if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
+		/*if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
 
@@ -155,13 +161,17 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
-		}
+		}*/
 		
-		if (StringUtils.isNotBlank(employerName)){
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
+			params.put("adminId", TokenManager.getAdminId());
+		}
+
+		if (StringUtils.isNotBlank(employerName)) {
 			params.put("employerName", employerName);
 		}
-		
-		if (StringUtils.isNotBlank(username)){
+
+		if (StringUtils.isNotBlank(username)) {
 			params.put("unitName", username);
 		}
 
@@ -314,12 +324,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			d.setReleaseDate(now.getTime());
 			d.setReleaseStatus(DemandReleaseStatus.RELEASED.getCode());
 			d.setTechBrokerId(techBroderId);
-			
-			if (StringUtils.isNotBlank(d.getKeyword())){
+
+			if (StringUtils.isNotBlank(d.getKeyword())) {
 				String[] keywords = d.getKeyword().trim().split(",|,");
 				disposeDemandKeyword(keywords, d, false);
 			}
-			
+
 			String employerId = d.getEmployerId();
 			if (StringUtils.isNotBlank(employerId)) {
 				if (UserType.PERSONAL.getCode().equals(d.getDataCategory())) {
@@ -553,9 +563,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			params.put("keyword", keyword);
 		}
 
-		/*if (!StringUtils.isBlank(username)) {
-			params.put("username", username);
-		}*/
+		/*
+		 * if (!StringUtils.isBlank(username)) { params.put("username",
+		 * username); }
+		 */
 
 		if (null != infoSources) {
 			params.put("infoSources", infoSources);
@@ -706,4 +717,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.findByIndustryCategoryA(industryCategoryA, id);
 	}
 
+	@Override
+	public int updateByPrimaryKeySelective(Demand d) {
+		return demandMapper.updateByPrimaryKeySelective(d);
+	}
+
 }

+ 2 - 2
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.36
+static.host=//afts.hnzhiming.com/1.0.37
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -67,7 +67,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.4
+portal.host=//afts.hnzhiming.com/portal/1.0.5
 
 patentTemplate=SMS_72005286
 

+ 79 - 0
src/main/resources/props/config_local.properties

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
@@ -74,3 +75,81 @@ portal.host=//afts.hnzhiming.com/portal/1.0.5
 patentTemplate=SMS_72005286
 
 avatar.upload.host=//afts.hnzhiming.com/upload
+=======
+#Driver
+jdbc.driverClassName=com.mysql.jdbc.Driver
+#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
+jdbc.url=jdbc:mysql://127.0.0.1:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#\u5e10\u53f7
+jdbc.username=root
+#\u5bc6\u7801
+jdbc.password=123456
+#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
+jdbc.validationQuery=SELECT 'x'
+#\u521d\u59cb\u8fde\u63a5\u6570
+jdbc.initialSize=3
+#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
+jdbc.maxActive=20
+#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
+#jdbc.maxIdle=20
+#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
+jdbc.minIdle=0
+#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
+jdbc.maxWait=120000
+#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
+jdbc.testOnBorrow=false
+#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
+jdbc.testOnReturn=false
+#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
+jdbc.testWhileIdle=true
+#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
+#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
+jdbc.timeBetweenEvictionRunsMillis=60000
+#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
+jdbc.minEvictableIdleTimeMillis=300000
+#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
+jdbc.removeAbandoned=true
+#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
+jdbc.removeAbandonedTimeout=300
+#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
+jdbc.logAbandoned=true
+#\u7edf\u8ba1\u76d1\u63a7
+jdbc.filters=stat
+
+logging.level.com.goafanti=DEBUG
+
+jedis.host=127.0.0.1
+jedis.port=6379
+jedis.timeout=5000
+jedis.password=123456
+
+pwd.hash_algorithm_name=md5
+pwd.hash_iterations=2
+
+session.timeout=12000000
+session.validate.timespan=18000000
+
+app.name=AFT
+
+static.host=//afts.hnzhiming.com/1.0.37
+
+upload.path=/Users/xiaolong/Sites/upload
+upload.private.path=/Users/xiaolong/Sites/doc
+
+accessKey=LTAIqTgQLLwz252Z
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+
+avatar.host=//afts.hnzhiming.com
+
+aesSecretKey=aft1234567890123
+
+template.cacheable=false
+
+mobileCodeTemplate=SMS_37845022
+
+portal.host=//afts.hnzhiming.com/portal/1.0.5
+
+patentTemplate=SMS_72005286
+
+avatar.upload.host=//afts.hnzhiming.com/upload
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git

+ 2 - 2
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.36
+static.host=//aftts.hnzhiming.com/1.0.37
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload
@@ -69,7 +69,7 @@ template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//aftts.hnzhiming.com/portal/1.0.4
+portal.host=//aftts.hnzhiming.com/portal/1.0.5
 
 patentTemplate=SMS_72005286
 

File diff suppressed because it is too large
+ 25 - 7
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html


File diff suppressed because it is too large
+ 3 - 3
src/main/webapp/WEB-INF/views/portal/activity/details.html


File diff suppressed because it is too large
+ 6 - 6
src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html


File diff suppressed because it is too large
+ 2 - 2
src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html


+ 4 - 4
src/main/webapp/WEB-INF/views/portal/highTech/authentication.html

@@ -124,10 +124,10 @@
 			</div>
 			<div class="advantage_nav">
 				<ul id="myTab">
-					<li><a href="#tab1" data-toggle="tab">专业服务十六年</a></li>
-					<li><a href="#tab2" data-toggle="tab">遍布全国26家分子公司</a></li>
-					<li><a href="#tab3" data-toggle="tab">20000+企业服务</a></li>
-					<li><a href="#tab4" data-toggle="tab">1000+高校院所服务</a></li>
+					<li><a href="#" data-toggle="tab">专业服务十六年</a></li>
+					<li><a href="#" data-toggle="tab">遍布全国26家分子公司</a></li>
+					<li><a href="#" data-toggle="tab">20000+企业服务</a></li>
+					<li><a href="#" data-toggle="tab">1000+高校院所服务</a></li>
 				</ul>
 			</div>
 			<div id="myTabContent" class="content_list tab-content">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/ipr/iso.html

@@ -208,7 +208,7 @@
             </div>
           </div> <span class="sp1 tab8_span">                            <span class="sp2"></span> </span>
         </div>
-      </div> <a href="#" class="iso_btn">我要服务</a> </div>
+      </div> <a href="#" class="iso_btn customer-service">我要服务</a> </div>
   </div>
   <footer>
     <div th:replace="common::copyright"></div>

+ 9 - 7
src/main/webapp/WEB-INF/views/portal/news/newsIndex.html

@@ -85,11 +85,13 @@
 		<div class="government_contacts_list">
 			<ul>
 				<li th:each="it: ${zfwl}">
-					<img th:src="${staticDomain + '/upload' + it.titleImg}">
-					<div class="government_contacts_txt">
-						<h4 th:text="${it.title}" th:title="${it.title}"></h4>
-						<span class="date" th:text="${#calendars.format(it.createTime,'yyyy-MM-dd')}"></span>
-					</div>
+					<a th:href="${'/portal/news/newsDetail.html?newsId=' + it.id}" target="_blank">
+						<img th:src="${staticDomain + '/upload' + it.titleImg}">
+						<div class="government_contacts_txt">
+							<h4 th:text="${it.title}" th:title="${it.title}"></h4>
+							<span class="date" th:text="${#calendars.format(it.createTime,'yyyy-MM-dd')}"></span>
+						</div>
+					</a>
 				</li>
 			</ul>
 		</div>
@@ -113,7 +115,7 @@
 				<div class="national_policy_list">
 					<ul>
 						<li th:each="it : ${gjzc}">
-							<a href="#">
+							<a th:href="${'/portal/news/newsDetail.html?newsId=' + it.id}" target="_blank">
 								<p th:text="${it.title}" th:title="${it.title}"></p> 
 								<span th:text="${#calendars.format(it.createTime,'MM/dd')}"></span>
 							</a>
@@ -129,7 +131,7 @@
 				<div class="national_policy_list">
 					<ul>
 						<li th:each="it : ${dfzc}">
-							<a href="#">
+							<a th:href="${'/portal/news/newsDetail.html?newsId=' + it.id}" target="_blank">
 								<p th:text="${it.title}" th:title="${it.title}"></p>
 								<span th:text="${#calendars.format(it.createTime,'MM/dd')}"></span>
 							</a>

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html

@@ -52,10 +52,10 @@
 					<img  th:if="${lecture.lectureUrl} != null" th:src="${avatarUploadHost + lecture.lectureUrl}">
 					</div>
 					<div class="lecture_content_info">
-						<h4 th:text="${lecture.name}" th:title="${lecture.name}">张泽院士的讲堂</h4>
-						<p th:text="${lecture.summary}" th:title="${lecture.summary}">关于从事准晶结构及其向晶体雷声变的中间过程和准晶中的缺陷的研究</p>
+						<h4 th:text="${lecture.name}" th:title="${lecture.name}"></h4>
+						<p th:text="${lecture.summary}" th:title="${lecture.summary}"></p>
 						<p th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}">2017-07-02 09:30:00</p>
-						<span class="customer-service">报名中</span>
+						<span th:class="${lecture.lectureStatus} == 0 ? 'customer-service' : ''" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'"></span>
 					</div>
 				</li>
 			</ul>

File diff suppressed because it is too large
+ 3 - 3
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html