Browse Source

修改任务相关信息

tags/v1.1.0
qiujinyang 2 years ago
parent
commit
ca50a6258f
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/QuestionTypeCountVO.java
  2. +2
    -2
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java
  3. +1
    -1
      tuoheng-system/src/main/resources/mapper/MenuMapper.xml

+ 1
- 1
tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/QuestionTypeCountVO.java View File

private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@ApiModelProperty(value = "问题类型") @ApiModelProperty(value = "问题类型")
private Integer type;
private String type;


@ApiModelProperty(value = "问题内容") @ApiModelProperty(value = "问题内容")
private String content; private String content;

+ 2
- 2
tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java View File

}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
} }
Map<Integer,String> codeMap=new HashMap<>();
Map<String,String> codeMap=new HashMap<>();
for (Object questionTypeObject : questionTypeList) { for (Object questionTypeObject : questionTypeList) {
JSONObject question=(JSONObject)questionTypeObject; JSONObject question=(JSONObject)questionTypeObject;
codeMap.put(question.getIntValue("code"),question.getString("content"));
codeMap.put(question.getString("code"),question.getString("content"));
} }
for (QuestionTypeCountVO questionTypeCountVO : questionTypeCountList) { for (QuestionTypeCountVO questionTypeCountVO : questionTypeCountList) {
questionTypeCountVO.setContent(codeMap.get(questionTypeCountVO.getType())); questionTypeCountVO.setContent(codeMap.get(questionTypeCountVO.getType()));

+ 1
- 1
tuoheng-system/src/main/resources/mapper/MenuMapper.xml View File

INNER JOIN sys_role_menu AS rm ON m.id=rm.menu_id INNER JOIN sys_role_menu AS rm ON m.id=rm.menu_id
INNER JOIN sys_user_role AS ur ON ur.role_id=rm.role_id INNER JOIN sys_user_role AS ur ON ur.role_id=rm.role_id
WHERE ur.user_id=#{userId} AND m.type=1 AND m.`status`=1 AND m.mark=1 WHERE ur.user_id=#{userId} AND m.type=1 AND m.`status`=1 AND m.mark=1
ORDER BY m.sort ASC;
<!--ORDER BY m.sort ASC;-->
</select> </select>


</mapper> </mapper>

Loading…
Cancel
Save