|
|
|
@ -5,10 +5,12 @@ import cn.hutool.core.bean.copier.CopyOptions; |
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import cn.hutool.core.lang.Assert; |
|
|
|
import cn.hutool.core.lang.Assert; |
|
|
|
import cn.hutool.core.lang.Opt; |
|
|
|
import cn.hutool.core.lang.Opt; |
|
|
|
|
|
|
|
import cn.hutool.core.util.IdUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.alibaba.excel.EasyExcel; |
|
|
|
import com.alibaba.excel.EasyExcel; |
|
|
|
import com.alibaba.excel.ExcelWriter; |
|
|
|
import com.alibaba.excel.ExcelWriter; |
|
|
|
import com.alibaba.excel.write.metadata.WriteSheet; |
|
|
|
import com.alibaba.excel.write.metadata.WriteSheet; |
|
|
|
|
|
|
|
import com.alibaba.fastjson2.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
@ -105,6 +107,8 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
private final DataCaseVerifResourceService dataCaseVerifResourceService; |
|
|
|
private final DataCaseVerifResourceService dataCaseVerifResourceService; |
|
|
|
private final NegativeProblemRelationService negativeProblemRelationService; |
|
|
|
private final NegativeProblemRelationService negativeProblemRelationService; |
|
|
|
private final MailResourceService mailResourceService; |
|
|
|
private final MailResourceService mailResourceService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final NegativeHistoryService negativeHistoryService; |
|
|
|
private static final DateTimeFormatter INITIAL_REVIEW_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); |
|
|
|
private static final DateTimeFormatter INITIAL_REVIEW_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); |
|
|
|
private static final int CHECK_LIMIT_DAYS = 4; |
|
|
|
private static final int CHECK_LIMIT_DAYS = 4; |
|
|
|
|
|
|
|
|
|
|
|
@ -589,6 +593,16 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
return res; |
|
|
|
return res; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public Result<Boolean> saveInvolveJson(ComplaintCollectionSaveInvolveJsonRequest request) { |
|
|
|
|
|
|
|
ComplaintCollectionUpdateParam updateParam = ComplaintCollectionTransfer.INSTANCE.JsonRequestToUpdateParam(request); |
|
|
|
|
|
|
|
updateParam.setId(request.getComplaintId()); |
|
|
|
|
|
|
|
updateParam.setUpdateBy(UserContextHolder.getCurrentUser().getUserName()); |
|
|
|
|
|
|
|
updateParam.setUpdateTime(LocalDateTime.now()); |
|
|
|
|
|
|
|
boolean updated = complaintCollectionResourceService.updateSelectiveById(updateParam); |
|
|
|
|
|
|
|
return Result.success(updated); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Result<Boolean> initialReview(ComplaintCollectionInitialReviewRequest request) { |
|
|
|
public Result<Boolean> initialReview(ComplaintCollectionInitialReviewRequest request) { |
|
|
|
@ -610,9 +624,35 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
updateParam.setGwf2(LocalDateTime.now().format(INITIAL_REVIEW_FMT)); |
|
|
|
updateParam.setGwf2(LocalDateTime.now().format(INITIAL_REVIEW_FMT)); |
|
|
|
updateParam.setGwf3(initialReviewStatus); |
|
|
|
updateParam.setGwf3(initialReviewStatus); |
|
|
|
complaintCollectionResourceService.updateSelectiveById(updateParam); |
|
|
|
complaintCollectionResourceService.updateSelectiveById(updateParam); |
|
|
|
|
|
|
|
saveInitialReviewHistory(complaintCollection, request); |
|
|
|
return Result.success(Boolean.TRUE); |
|
|
|
return Result.success(Boolean.TRUE); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void saveInitialReviewHistory(ComplaintCollection complaintCollection, ComplaintCollectionInitialReviewRequest request) { |
|
|
|
|
|
|
|
if (StrUtil.isBlank(complaintCollection.getNegativeId())) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
NegativeHistory history = new NegativeHistory() |
|
|
|
|
|
|
|
.setHistoryId(IdUtil.fastSimpleUUID()) |
|
|
|
|
|
|
|
.setNegativeId(complaintCollection.getNegativeId()) |
|
|
|
|
|
|
|
.setActionName("初核反馈") |
|
|
|
|
|
|
|
.setCrtTime(LocalDateTime.now()) |
|
|
|
|
|
|
|
.setDataJson(JSON.toJSONString(request)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
|
|
|
|
history.setCrtUser(user.getUserId()) |
|
|
|
|
|
|
|
.setCrtUserName(user.getUserName()) |
|
|
|
|
|
|
|
.setCrtName(user.getNickName()) |
|
|
|
|
|
|
|
.setDepartName(user.getDepartName()); |
|
|
|
|
|
|
|
} catch (RuntimeException e) { |
|
|
|
|
|
|
|
history.setCrtName("系统"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
negativeHistoryService.save(history); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Result<ComplaintCollectionDetailVo> getComplaintCollectionDetail(ComplaintCollectionDetailRequest request) { |
|
|
|
public Result<ComplaintCollectionDetailVo> getComplaintCollectionDetail(ComplaintCollectionDetailRequest request) { |
|
|
|
// 1. 查询主表数据
|
|
|
|
// 1. 查询主表数据
|
|
|
|
|