Browse Source

接口新增返回播报创建人

tags/dev-23-08-04
yk 2 years ago
parent
commit
ae693b24e2
2 changed files with 9 additions and 0 deletions
  1. +7
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmBroadcastController.java
  2. +2
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/domain/dto/DmBroadcastDto.java

+ 7
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmBroadcastController.java View File

@@ -12,6 +12,7 @@ import com.xueyi.common.security.annotation.Logical;
import com.xueyi.common.security.annotation.RequiresPermissions;
import com.xueyi.common.web.entity.controller.BaseController;
import com.xueyi.system.api.digitalmans.domain.vo.DmBroadcastVo;
import com.xueyi.system.api.organize.domain.po.SysUserPo;
import com.xueyi.system.digitalmans.domain.dto.DmBroadcastDto;
import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto;
import com.xueyi.system.digitalmans.domain.merge.DmBroadcastResourceMerge;
@@ -20,6 +21,7 @@ import com.xueyi.system.digitalmans.domain.query.DmDigitalmanQuery;
import com.xueyi.system.digitalmans.manager.impl.DmBroadcastManager;
import com.xueyi.system.digitalmans.service.IDmBroadcastService;
import com.xueyi.system.digitalmans.service.IDmDigitalmanService;
import com.xueyi.system.organize.service.ISysUserService;
import com.xueyi.system.resource.domain.dto.DmResourcesDto;
import com.xueyi.system.resource.domain.model.DmResourcesConverter;
import com.xueyi.system.resource.mapper.DmResourcesMapper;
@@ -57,6 +59,9 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr
@Autowired
private IDmDigitalmanService digitalmanService;

@Autowired
private ISysUserService sysUserService;

/**
* 查询播报列表
*/
@@ -107,6 +112,8 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr

for (DmBroadcastDto dto : list) {
List<DmBroadcastResourceMerge> mergeDtos = broadcastManager.selectBroadcastResourceMerge(dto.getId());
SysUserPo user = sysUserService.selectById(dto.getCreateBy());
dto.setUserName(user.getName());
List<JSONObject> temp = new ArrayList<>();
for (DmBroadcastResourceMerge merge : mergeDtos) {
if (merge.getResourceId() != null && merge.getResourceId() > 0) {


+ 2
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/domain/dto/DmBroadcastDto.java View File

@@ -25,4 +25,6 @@ public class DmBroadcastDto extends DmBroadcastPo {

private List<JSONObject> objList;

private String userName;

}

Loading…
Cancel
Save