Commit dc431b6c by 涂亚平

92-online版本

1 parent 716cd459
...@@ -521,6 +521,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -521,6 +521,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
classDetailVO.setSignCounts(set); classDetailVO.setSignCounts(set);
//人所在部门
List<DepartmentDictDO> departmentDictDOS = memberMapper.getDepartments(classDetailVO.getId());
classDetailVO.setDeps(departmentDictDOS);
} }
classDetailVOIPage.setRecords(classDetailVOS); classDetailVOIPage.setRecords(classDetailVOS);
return classDetailVOIPage; return classDetailVOIPage;
......
package com.subsidy.vo.classdict; package com.subsidy.vo.classdict;
import com.subsidy.model.DepartmentDictDO;
import com.subsidy.util.excel.ExcelColumn; import com.subsidy.util.excel.ExcelColumn;
import com.subsidy.vo.done.GetMaxScoreVO; import com.subsidy.vo.done.GetMaxScoreVO;
import lombok.Data; import lombok.Data;
...@@ -90,4 +91,5 @@ public class ClassDetailVO{ ...@@ -90,4 +91,5 @@ public class ClassDetailVO{
private List<GetMaxScoreVO> getMaxScoreVOS; private List<GetMaxScoreVO> getMaxScoreVOS;
private List<DepartmentDictDO> deps;
} }
# 本地环境配置 # 本地环境配置
spring.server.port=23457 spring.server.port=23462
# 数据源配置 # 数据源配置
spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!