|
@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsUpkeep.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.jeecg.dingtalk.api.user.vo.User;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
|
|
@@ -108,6 +109,9 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
|
|
|
* @return 保养工单集合
|
|
|
*/
|
|
|
public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
|
|
|
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ cmmsUpkeepDto.setCreateBy(user.getUsername());
|
|
|
+ cmmsUpkeepDto.setChargeruser(user.getUsername());
|
|
|
return cmmsUpkeepMapper.selectMyRelateList(page, cmmsUpkeepDto);
|
|
|
}
|
|
|
|
|
@@ -118,6 +122,8 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
|
|
|
* @return 保养工单集合
|
|
|
*/
|
|
|
public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
|
|
|
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ cmmsUpkeepDto.setChargeruser(user.getUsername());
|
|
|
return cmmsUpkeepMapper.selectMyChargeList(page, cmmsUpkeepDto);
|
|
|
}
|
|
|
|
|
@@ -217,8 +223,8 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
|
|
|
cmmsUpkeep.setOpinion(cmmsUpkeepDto.getOpinion());
|
|
|
|
|
|
// 附件
|
|
|
+ sysUploadFileService.deleteFileByRelId(cmmsUpkeepDto.getId());//删除之前的附件
|
|
|
if(cmmsUpkeepDto.getFiles()!=null && cmmsUpkeepDto.getFiles().size()>0) {
|
|
|
- sysUploadFileService.deleteFileByRelId(cmmsUpkeepDto.getId());//删除之前的附件
|
|
|
sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");//新增附件
|
|
|
}
|
|
|
|