|
@@ -9,12 +9,15 @@ import com.github.pagehelper.PageHelper;
|
|
|
import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
|
|
|
import com.platform.dao.dto.repair.RepairApplicationFormDTO;
|
|
|
import com.platform.dao.dto.sb.SbInfoDTO;
|
|
|
+import com.platform.dao.dto.sbUnusedVerifyRecord.SbUnusedVerifyRecordDTO;
|
|
|
import com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO;
|
|
|
+import com.platform.dao.entity.sbUnusedVerifyRecord.SbUnusedVerifyRecord;
|
|
|
import com.platform.dao.entity.sbUnuseddetail.SbUnusedDetail;
|
|
|
import com.platform.dao.enums.SbUnusedStatusEnum;
|
|
|
import com.platform.dao.enums.SysConfigEnum;
|
|
|
import com.platform.dao.enums.WorkplaceBacklogDetailTypeEnum;
|
|
|
import com.platform.dao.enums.WorkplaceBacklogTypeEnum;
|
|
|
+import com.platform.dao.mapper.sbUnusedVerifyRecord.SbUnusedVerifyRecordMapper;
|
|
|
import com.platform.dao.mapper.sbUnuseddetail.SbUnusedDetailMapper;
|
|
|
import com.platform.dao.util.MessageTemplateUtil;
|
|
|
import com.platform.dao.vo.query.project.ProjectVO;
|
|
@@ -22,6 +25,7 @@ import com.platform.dao.vo.query.sbUnused.SbUnusedVO;
|
|
|
import com.platform.dao.dto.sbUnused.SbUnusedDTO;
|
|
|
import com.platform.dao.entity.sbUnused.SbUnused;
|
|
|
import com.platform.dao.mapper.sbUnused.SbUnusedMapper;
|
|
|
+import com.platform.dao.vo.query.sbUnusedVerifyRecord.SbUnusedVerifyRecordVO;
|
|
|
import com.platform.dao.vo.query.sbUnuseddetail.SbUnusedDetailVO;
|
|
|
import com.platform.service.event.WorkplaceBacklogEvent;
|
|
|
import com.platform.service.sbUnused.SbUnusedService;
|
|
@@ -48,6 +52,7 @@ import java.util.List;
|
|
|
public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnused, SbUnusedDTO> implements SbUnusedService {
|
|
|
|
|
|
private SbUnusedDetailMapper sbUnusedDetailMapper;
|
|
|
+ private SbUnusedVerifyRecordMapper sbUnusedVerifyRecordMapper;
|
|
|
|
|
|
@Override
|
|
|
public void modModelByDTO(SbUnusedDTO model) {
|
|
@@ -83,11 +88,16 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
|
queryDetail.setSbUnusedId(id);
|
|
|
List<SbUnusedDetailVO> sbUnusedDetailVOS = sbUnusedDetailMapper.selectList(queryDetail);
|
|
|
vo.setSbUnusedDetailVOS(sbUnusedDetailVOS);
|
|
|
+ SbUnusedVerifyRecordDTO dto = new SbUnusedVerifyRecordDTO();
|
|
|
+ dto.setSbUnusedId(id);
|
|
|
+ List<SbUnusedVerifyRecordVO> sbUnusedVerifyRecordVOS = sbUnusedVerifyRecordMapper.selectList(dto);
|
|
|
+ vo.setSbUnusedVerifyRecordVOS(sbUnusedVerifyRecordVOS);
|
|
|
return vo;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void unusedVerify(String id, SbUnusedDTO dto) {
|
|
|
+ UserInfo userInfo = SecurityUtils.getUserInfo();
|
|
|
SbUnused unused = mapper.selectByPrimaryKey(id);
|
|
|
List<String> userIds = new ArrayList<>();
|
|
|
|
|
@@ -96,17 +106,20 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
|
//审核被拒,通知申请人
|
|
|
if (dto.getStatus()==SbUnusedStatusEnum.refused.getValue()){
|
|
|
userIds.add(unused.getApplyUserId());
|
|
|
+ addRecord(userInfo,unused,"审核被拒",dto.getAdvice());
|
|
|
String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
String info = MessageTemplateUtil.getRefuseUnusedSbVmHtmlContent(unusedUrl,
|
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
|
}else if (dto.getStatus()==SbUnusedStatusEnum.verifying_two.getValue()){
|
|
|
userIds.add("636c57bd3abe1415981b18ec");//何经理
|
|
|
+ addRecord(userInfo,unused,"审核通过",dto.getAdvice());
|
|
|
String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
|
}else if (dto.getStatus()==SbUnusedStatusEnum.success.getValue()){
|
|
|
+ addRecord(userInfo,unused,"完成",dto.getAdvice());
|
|
|
//何经理审核通过
|
|
|
userIds.add(unused.getApplyUserId());
|
|
|
// String unusedUrl = domain + "sbUnused/unused?no=" + unused.getNo();
|
|
@@ -150,6 +163,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
|
sbUnusedDetails.add(detail);
|
|
|
}
|
|
|
sbUnusedDetailMapper.insertListforComplex(sbUnusedDetails);
|
|
|
+ addRecord(userInfo, unused,"已申请",null);
|
|
|
|
|
|
List<String> userIds = new ArrayList<>();
|
|
|
userIds.add(model.getVerityUserId());
|
|
@@ -162,6 +176,20 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
|
return unused;
|
|
|
}
|
|
|
|
|
|
+ public void addRecord(UserInfo userInfo, SbUnused unused, String statusStr,String advice) {
|
|
|
+ //添加流程记录
|
|
|
+ SbUnusedVerifyRecord record = new SbUnusedVerifyRecord();
|
|
|
+ record.setId(IdGeneratorUtils.getObjectId());
|
|
|
+ record.setCreatedTime(LocalDateTime.now());
|
|
|
+ record.setCreatedUserId(userInfo.getUserId());
|
|
|
+ record.setUpdateTime(LocalDateTime.now());
|
|
|
+ record.setUpdateUserId(userInfo.getUserId());
|
|
|
+ record.setStatusStr(statusStr);
|
|
|
+ record.setSbUnusedId(unused.getId());
|
|
|
+ record.setAdvice(advice);
|
|
|
+ sbUnusedVerifyRecordMapper.insert(record);
|
|
|
+ }
|
|
|
+
|
|
|
public void sendWorkplaceAndEmailNew(List<String> mails,List<String> userIds,String repairId,String content,Integer detailType){
|
|
|
// 通过给当天值班维修人员
|
|
|
SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(), detailType,
|