|
|
@@ -1451,10 +1451,10 @@ public class ProjectcontentinfoController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping("getAchievementTypeList")
|
|
|
@ResponseBody
|
|
|
- public AjaxJson getAchievementTypeList(String achievementParentId){
|
|
|
+ public AjaxJson getAchievementTypeList(String achievementParentId,Integer type){
|
|
|
AjaxJson ajaxJson = new AjaxJson();
|
|
|
try {
|
|
|
- List<MainDictDetail> getAchievementTypeList = projectcontentinfoService.getAchievementTypeList(achievementParentId);
|
|
|
+ List<MainDictDetail> getAchievementTypeList = projectcontentinfoService.getAchievementTypeList(achievementParentId,type);
|
|
|
ajaxJson.getBody().put("list",getAchievementTypeList);
|
|
|
ajaxJson.setMsg("获取数据成功");
|
|
|
}catch (Exception e){
|
|
|
@@ -1466,6 +1466,67 @@ public class ProjectcontentinfoController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 根据工作内容查询成果类型
|
|
|
+ * @param achievementParentId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping("getAchievementTypeList2")
|
|
|
+ @ResponseBody
|
|
|
+ public AjaxJson getAchievementTypeList2(String achievementParentId,Integer type){
|
|
|
+ AjaxJson ajaxJson = new AjaxJson();
|
|
|
+ try {
|
|
|
+ List<MainDictDetail> getAchievementTypeList = projectcontentinfoService.getAchievementTypeList(achievementParentId,type);
|
|
|
+ List<Map<String,Object>> mapList= new ArrayList<>();
|
|
|
+ for (int i =0; i<getAchievementTypeList.size(); i++){
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
+ map.put("name",getAchievementTypeList.get(i).getLabel());
|
|
|
+ map.put("value",getAchievementTypeList.get(i).getValue());
|
|
|
+ /*Map<String,Object> maps = new HashMap<>();
|
|
|
+ maps.put("level",0);
|
|
|
+ maps.put("loading",null);
|
|
|
+ maps.put("parent",null);
|
|
|
+ map.put("_node",maps);
|
|
|
+ String mapToString = getMapToString(map);*/
|
|
|
+ mapList.add(map);
|
|
|
+ }
|
|
|
+ ajaxJson.getBody().put("list",mapList);
|
|
|
+ ajaxJson.setMsg("获取数据成功");
|
|
|
+ }catch (Exception e){
|
|
|
+ logger.error("获取数据异常!",e);
|
|
|
+ ajaxJson.setSuccess(false);
|
|
|
+ ajaxJson.setMsg("获取数据异常");
|
|
|
+ }
|
|
|
+ return ajaxJson;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Map转String
|
|
|
+ * @param map
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static String getMapToString(Map<String,Object> map){
|
|
|
+ Set<String> keySet = map.keySet();
|
|
|
+ //将set集合转换为数组
|
|
|
+ String[] keyArray = keySet.toArray(new String[keySet.size()]);
|
|
|
+ //给数组排序(升序)
|
|
|
+ Arrays.sort(keyArray);
|
|
|
+ //因为String拼接效率会很低的，所以转用StringBuilder
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ for (int i = 0; i < keyArray.length; i++) {
|
|
|
+ // 参数值为空，则不参与签名 这个方法trim()是去空格
|
|
|
+ if ((String.valueOf(map.get(keyArray[i]))).trim().length() > 0) {
|
|
|
+ sb.append(keyArray[i]).append(":").append(String.valueOf(map.get(keyArray[i])).trim());
|
|
|
+ }
|
|
|
+ if(i != keyArray.length-1){
|
|
|
+ sb.append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return sb.toString();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
* 根据成果类型查询复核条件
|
|
|
* @param reviewStandardParentId
|
|
|
* @return
|
user5