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

APP发布成果 类型默认设置为0-成果

anderx лет назад: 8
Родитель
Сommit
8d565df1e8

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

@@ -95,7 +95,7 @@ public interface AchievementService {
 	AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id);
 	AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id);
 
 
 
 
-	void saveAppAchievement(Achievement a, String[] keywords);
+	int saveAppAchievement(Achievement a, String[] keywords);
 
 
 	Pagination<AchievementListBo> listManageAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 	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 name, String keyword, Integer category, Integer status, String releaseDateStartDate,

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

@@ -823,7 +823,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 	}
 
 
 	@Override
 	@Override
-	public void saveAppAchievement(Achievement a, String[] keywords) {
+	public int saveAppAchievement(Achievement a, String[] keywords) {
 		a.setId(UUID.randomUUID().toString());
 		a.setId(UUID.randomUUID().toString());
 		a.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 		a.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 		Calendar now = Calendar.getInstance();
 		Calendar now = Calendar.getInstance();
@@ -850,9 +850,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 				a.setOwnerName(u.getNickname());
 				a.setOwnerName(u.getNickname());
 			}
 			}
 		}
 		}
+		a.setDataCategory(0);
 		a.setCreateTime(now.getTime());
 		a.setCreateTime(now.getTime());
-		achievementMapper.insert(a);
 		disposeAchievementKeyword(keywords, a, false);
 		disposeAchievementKeyword(keywords, a, false);
+		return achievementMapper.insert(a);
 	}
 	}
 
 
 }
 }

+ 5 - 5
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -53,7 +53,7 @@ import com.goafanti.user.service.UserInterestService;
 import com.goafanti.user.service.UserService;
 import com.goafanti.user.service.UserService;
 
 
 @RestController
 @RestController
-@RequestMapping(path = "/open/app/user", method = RequestMethod.GET)
+@RequestMapping(path = "/app/user", method = RequestMethod.GET)
 public class AppUserController extends BaseApiController {
 public class AppUserController extends BaseApiController {
 	@Resource
 	@Resource
 	private UserService userServiceImpl;
 	private UserService userServiceImpl;
@@ -379,7 +379,7 @@ public class AppUserController extends BaseApiController {
      */
      */
     
     
 	@RequestMapping(value = "/appAddAchievement", method = RequestMethod.POST)
 	@RequestMapping(value = "/appAddAchievement", method = RequestMethod.POST)
-    private Result apply(@Valid InputAchievement ia, BindingResult bindingResult,
+    private Result appAddAchievement(@Valid InputAchievement ia, BindingResult bindingResult,
             String keyword1,String keyword2,String keyword3) {
             String keyword1,String keyword2,String keyword3) {
         Result res = new Result();
         Result res = new Result();
         String[] keywords ;
         String[] keywords ;
@@ -404,7 +404,7 @@ public class AppUserController extends BaseApiController {
         }
         }
         Achievement a = new Achievement();
         Achievement a = new Achievement();
         BeanUtils.copyProperties(ia, a);
         BeanUtils.copyProperties(ia, a);
-        achievementService.saveAppAchievement(a, keywords);
+        res.setData(achievementService.saveAppAchievement(a, keywords));
         return res;
         return res;
     }
     }
     
     
@@ -443,7 +443,7 @@ public class AppUserController extends BaseApiController {
 	 * 新增需求
 	 * 新增需求
 	 */
 	 */
 	@RequestMapping(value = "/appAddDemand", method = RequestMethod.POST)
 	@RequestMapping(value = "/appAddDemand", method = RequestMethod.POST)
-	public Result userApply(@Valid InputDemand demand, BindingResult bindingResult,
+	public Result appAddDemand(@Valid InputDemand demand, BindingResult bindingResult,
 			String keyword1,String keyword2,String keyword3,
 			String keyword1,String keyword2,String keyword3,
 			String validityPeriodFormattedDate) {
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
 		Result res = new Result();
@@ -473,7 +473,7 @@ public class AppUserController extends BaseApiController {
 		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
 		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
 			d.setUrgentMoney(demand.getUrgentMoney());
 			d.setUrgentMoney(demand.getUrgentMoney());
 		}
 		}
-		demandService.saveAppUserDemand(d, validityPeriodFormattedDate, keywords);
+		res.setData(demandService.saveAppUserDemand(d, validityPeriodFormattedDate, keywords));
 		return res;
 		return res;
 	}
 	}
 	
 	

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

@@ -95,7 +95,7 @@ public interface DemandService {
 	Pagination<DemandSearchListBo> listMyDemand(Integer pNo, Integer pSize);
 	Pagination<DemandSearchListBo> listMyDemand(Integer pNo, Integer pSize);
 
 
 
 
-	void saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
+	int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
 
 
 
 	Pagination<DemandManageListBo> selectMyDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 	Pagination<DemandManageListBo> selectMyDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,

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

@@ -946,7 +946,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	}
 	}
 
 
 
 
-	public void saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords) {
+	public int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords) {
 		Date validityPeriod = null;
 		Date validityPeriod = null;
 		if (!StringUtils.isBlank(validityPeriodFormattedDate)) {
 		if (!StringUtils.isBlank(validityPeriodFormattedDate)) {
 			try {
 			try {
@@ -954,9 +954,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			} catch (ParseException e) {
 			} catch (ParseException e) {
 			}
 			}
 		}
 		}
+		d.setInfoSources(1);
 		if (null!=TokenManager.getUserId()) {
 		if (null!=TokenManager.getUserId()) {
 			d.setEmployerId(TokenManager.getUserId());
 			d.setEmployerId(TokenManager.getUserId());
-			d.setInfoSources(1);
 			User u=userMapper.selectByPrimaryKey(TokenManager.getUserId());
 			User u=userMapper.selectByPrimaryKey(TokenManager.getUserId());
 			if (null!=u.getType()) {
 			if (null!=u.getType()) {
 				d.setDataCategory(u.getType());
 				d.setDataCategory(u.getType());
@@ -990,8 +990,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		}
 		}
 
 
 		d.setCreateTime(now.getTime());
 		d.setCreateTime(now.getTime());
-		demandMapper.insert(d);
 		disposeDemandKeyword(keywords, d, false);
 		disposeDemandKeyword(keywords, d, false);
+		return demandMapper.insert(d);
 	}
 	}