|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.sc.service.impl;
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -16,6 +17,7 @@ import com.goafanti.common.model.ScPublisher;
|
|
|
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;
|
|
|
import com.goafanti.sc.bo.ScAchievementListBo;
|
|
|
import com.goafanti.sc.bo.ScDemandListBo;
|
|
|
import com.goafanti.sc.bo.inputAchievement;
|
|
|
@@ -44,9 +46,28 @@ public class ScDmandServiceImpl extends BaseMybatisDao<ScDemandMapper> implement
|
|
|
if(StringUtils.isNotBlank(name))params.put("name", name);
|
|
|
if(StringUtils.isNotBlank(reserveButtUnit))params.put("reserveButtUnit", reserveButtUnit);
|
|
|
if(StringUtils.isNotBlank(type))params.put("type", type);
|
|
|
- return (Pagination<ScDemandListBo>) findPage("findDemandListByPage",
|
|
|
+ Pagination<ScDemandListBo> p= (Pagination<ScDemandListBo>) findPage("findDemandListByPage",
|
|
|
"findDemandCount",params,
|
|
|
pNo, pSize);
|
|
|
+ List<ScDemandListBo> l=(List<ScDemandListBo>) p.getList();
|
|
|
+ for (ScDemandListBo s : l) {
|
|
|
+ if(s!=null&&s.getIndustry()!=null){
|
|
|
+ if (s.getIndustry().equals("0")) {
|
|
|
+ s.setIndustry( "先进制造与自动化");
|
|
|
+ }if (s.getIndustry().equals("1")) {
|
|
|
+ s.setIndustry( "电子信息技术");
|
|
|
+ }if (s.getIndustry().equals("2")) {
|
|
|
+ s.setIndustry( "新材料技术");
|
|
|
+ }if (s.getIndustry().equals("3")) {
|
|
|
+ s.setIndustry( "生物与新药");
|
|
|
+ }if (s.getIndustry().equals("4")) {
|
|
|
+ s.setIndustry( "资源与环境");
|
|
|
+ }if (s.getIndustry().equals("5")) {
|
|
|
+ s.setIndustry( "新能源");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return p;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -86,6 +107,7 @@ public class ScDmandServiceImpl extends BaseMybatisDao<ScDemandMapper> implement
|
|
|
|
|
|
@Override
|
|
|
public inputDemands demandDetails(String id) {
|
|
|
+
|
|
|
return scDemandMapper.selectById(id);
|
|
|
}
|
|
|
|