|
@ -8,6 +8,7 @@ import java.util.Map; |
|
|
import com.ruoyi.common.utils.DateUtils; |
|
|
import com.ruoyi.common.utils.DateUtils; |
|
|
import com.ruoyi.common.utils.SecurityUtils; |
|
|
import com.ruoyi.common.utils.SecurityUtils; |
|
|
import com.ruoyi.common.utils.uuid.IdUtils; |
|
|
import com.ruoyi.common.utils.uuid.IdUtils; |
|
|
|
|
|
import com.ruoyi.system.service.ISysDeptService; |
|
|
import com.zc.business.domain.*; |
|
|
import com.zc.business.domain.*; |
|
|
import com.zc.business.mapper.*; |
|
|
import com.zc.business.mapper.*; |
|
|
import com.zc.business.service.IDcEventService; |
|
|
import com.zc.business.service.IDcEventService; |
|
@ -54,6 +55,9 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; |
|
|
private DcProcessConfigMapper dcProcessConfigMapper; |
|
|
private DcProcessConfigMapper dcProcessConfigMapper; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private DcWarningMapper dcWarningMapper; |
|
|
private DcWarningMapper dcWarningMapper; |
|
|
|
|
|
//部门信息
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ISysDeptService deptService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -89,6 +93,16 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper; |
|
|
String replace1 = dcEvent.getEndStakeMark().replace(" ", "+"); |
|
|
String replace1 = dcEvent.getEndStakeMark().replace(" ", "+"); |
|
|
dcEvent.setEndStakeMark(replace1); |
|
|
dcEvent.setEndStakeMark(replace1); |
|
|
} |
|
|
} |
|
|
|
|
|
List<DcEvent> dcEventList = dcEventMapper.selectDcEventList(dcEvent); |
|
|
|
|
|
|
|
|
|
|
|
for (DcEvent dcEvents : dcEventList) { |
|
|
|
|
|
// 根据 deptId 获取部门名称
|
|
|
|
|
|
Long deptId = dcEvents.getDeptId(); |
|
|
|
|
|
String deptName = deptService.selectDeptById(deptId).getDeptName(); |
|
|
|
|
|
|
|
|
|
|
|
// 将部门名称赋值给 deptName 字段
|
|
|
|
|
|
dcEvents.setDeptName(deptName); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return dcEventMapper.selectDcEventList(dcEvent); |
|
|
return dcEventMapper.selectDcEventList(dcEvent); |
|
|
} |
|
|
} |
|
|