|
|
@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import com.goafanti.common.model.ScDemand;
|
|
|
+import com.goafanti.sc.bo.inputAchievement;
|
|
|
+import com.goafanti.sc.bo.inputDemands;
|
|
|
import com.goafanti.sc.service.CommonService;
|
|
|
import com.goafanti.sc.service.ScAchievementService;
|
|
|
import com.goafanti.sc.service.ScDemandService;
|
|
|
@@ -28,7 +30,25 @@ public class ScWebController {
|
|
|
public ModelAndView achievementDetails(HttpServletRequest request, ModelAndView modelview,String id) {
|
|
|
ModelAndView mv = new ModelAndView();
|
|
|
mv.setViewName("sc/achievement");
|
|
|
- mv.addObject("achievementList", scAchievementService.AchievementDetails(id));
|
|
|
+ inputAchievement s=scAchievementService.AchievementDetails(id);
|
|
|
+ mv.addObject("achievementList",s);
|
|
|
+
|
|
|
+ if(s!=null&&s.getIndustry()!=null){
|
|
|
+ if (s.getIndustry().equals("1")) {
|
|
|
+ s.setIndustryName( "先进制造与自动化");
|
|
|
+ }if (s.getIndustry().equals("2")) {
|
|
|
+ s.setIndustryName( "电子信息技术");
|
|
|
+ }if (s.getIndustry().equals("3")) {
|
|
|
+ s.setIndustryName( "新材料技术");
|
|
|
+ }if (s.getIndustry().equals("4")) {
|
|
|
+ s.setIndustryName( "生物与新药");
|
|
|
+ }if (s.getIndustry().equals("6")) {
|
|
|
+ s.setIndustryName( "资源与环境");
|
|
|
+ }if (s.getIndustry().equals("7")) {
|
|
|
+ s.setIndustryName( "新能源");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/*List<ScMessageListBo> obj = (List<ScMessageListBo>)commonService.listMessage(id,10,1).getList();
|
|
|
JSONObject jo = new JSONObject();
|
|
|
System.out.println(jo.toJSON(obj).toString());*/
|
|
|
@@ -39,13 +59,29 @@ public class ScWebController {
|
|
|
@RequestMapping(value = "/open/demandDetails", method = RequestMethod.GET)
|
|
|
public ModelAndView demandDetails(HttpServletRequest request, ModelAndView modelview,String id) {
|
|
|
ModelAndView mv = new ModelAndView();
|
|
|
- ScDemand s= scDemandService.demandDetails(id);
|
|
|
- if (s.getType()==0) {
|
|
|
+ ScDemand sd= scDemandService.demandDetails(id);
|
|
|
+ if (sd.getType()==0) {
|
|
|
mv.setViewName("sc/demand");
|
|
|
}else {
|
|
|
mv.setViewName("sc/man");
|
|
|
}
|
|
|
- mv.addObject("demandList", scDemandService.demandDetails(id));
|
|
|
+ inputDemands s=scDemandService.demandDetails(id);
|
|
|
+ mv.addObject("demandList", s);
|
|
|
+ if(s!=null&&s.getIndustry()!=null){
|
|
|
+ if (s.getIndustry().equals("1")) {
|
|
|
+ s.setIndustryName( "先进制造与自动化");
|
|
|
+ }if (s.getIndustry().equals("2")) {
|
|
|
+ s.setIndustryName( "电子信息技术");
|
|
|
+ }if (s.getIndustry().equals("3")) {
|
|
|
+ s.setIndustryName( "新材料技术");
|
|
|
+ }if (s.getIndustry().equals("4")) {
|
|
|
+ s.setIndustryName( "生物与新药");
|
|
|
+ }if (s.getIndustry().equals("6")) {
|
|
|
+ s.setIndustryName( "资源与环境");
|
|
|
+ }if (s.getIndustry().equals("7")) {
|
|
|
+ s.setIndustryName( "新能源");
|
|
|
+ }
|
|
|
+ }
|
|
|
mv.addObject("listMessage", commonService.listMessage(id,10,1).getList());
|
|
|
return mv;
|
|
|
}
|