diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java index 7b7cb58..99728f4 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeService.java @@ -112,7 +112,7 @@ public class NegativeService extends ServiceImpl { .stream().map(leaderIdCode -> { VerifyData.BlameLeader blameLeader = new VerifyData.BlameLeader(); List blames = blameList.stream().filter(blameObj -> leaderIdCode.equals(blameObj.getLeadIdCode())).toList(); - // 取第一�? + // 取第一个 Blame blame = blames.get(0); BeanUtil.copyProperties(blame, blameLeader); blameLeader.setBlameIdCodes(blames.stream().map(Blame::getBlameIdCode).toList()); @@ -133,7 +133,7 @@ public class NegativeService extends ServiceImpl { .setFlowActions(flowActions) .setApproves(approveService.list(id)) .setIsFav(favService.existsByCurrentUser(id)); - // 签收退�? + // 签收退回 if (!flows.isEmpty() && AppConstants.SIGN_RETURN_ACTION_NAME.equals(flows.get(flows.size() - 1).getActionName())) { detail.setSignReturns(signReturnService.list(id)); } @@ -146,11 +146,11 @@ public class NegativeService extends ServiceImpl { if (FlowNodeEnum.isSignFlow(negative.getFlowKey())) { detail.setMaxDuration(NumberUtil.mul(negative.getMaxSignDuration(), TimeUtil.SECONDS_OF_A_DAY).longValue()); } - // 未延�? + // 未延期 else if (Objects.isNull(negative.getExtensionDays())) { detail.setMaxDuration(NumberUtil.mul(negative.getMaxHandleDuration(), TimeUtil.SECONDS_OF_A_DAY).longValue()); } else { - // 已延�? + // 已延期 Integer maxDuration = negative.getMaxHandleDuration() + negative.getExtensionDays(); detail.setMaxDuration(NumberUtil.mul(maxDuration, TimeUtil.SECONDS_OF_A_DAY).longValue()); } @@ -160,7 +160,7 @@ public class NegativeService extends ServiceImpl { negative.getExtensionDays(), negative.getFlowKey())); } - // 判断当前是否 是认定办结环�? + // 判断当前是否 是认定办结环节 if (Objects.nonNull(workId)) { Boolean confirmationCompletionFlag = (ApprovalFlowEnum.SECOND_APPROVAL.getValue().equals(negative.getApprovalFlow()) && FlowNodeEnum.SECOND_APPROVE.getKey().equals(negative.getFlowKey())) || FlowNodeEnum.FIRST_APPROVE.getKey().equals(negative.getFlowKey()); @@ -189,7 +189,7 @@ public class NegativeService extends ServiceImpl { if (StrUtil.isBlank(negativeDto.getOriginId())) { String originId = generateOriginId(negativeDto.getProblemSourcesCode(), negativeDto.getBusinessTypeCode()); - negative.setOriginId(originId); // 如果是空就生成随机的线索�? + negative.setOriginId(originId); // 如果是空就生成随机的线索源 } if (StrUtil.isNotBlank(negativeDto.getBusinessTypeCode())) { @@ -206,7 +206,7 @@ public class NegativeService extends ServiceImpl { negative.setThreeInvolveDepartId(depart.getId()); negative.setSecondInvolveDepartId(depart.getPid()); } else { - throw new RuntimeException("涉及单位请选择二级或三级单�?); + throw new RuntimeException("涉及单位请选择二级或三级单位"); } LocalDateTime now = LocalDateTime.now(); boolean secondFlag = false; @@ -240,7 +240,7 @@ public class NegativeService extends ServiceImpl { log.warn("未获取到用户上下文，问题ID：{}", negative.getId()); } } - save(negative); // 添加一�?negative 数据 + save(negative); // 添加一条 negative 数据 negativeDto.setId(negative.getId()); if (!negativeDto.getThingFiles().isEmpty()) { List files = negativeDto.getThingFiles().stream().map(item -> { @@ -270,7 +270,7 @@ public class NegativeService extends ServiceImpl { .setProblemSourcesCode(negative.getProblemSourcesCode()) .setUpdateTime(now) .setCreateTime(now); - workService.save(work); // 添加一�?negative_work 数据 工作状�? + workService.save(work); // 添加一条 negative_work 数据 工作状态 FirstDistributeData firstDistributeData = new FirstDistributeData(); BeanUtil.copyProperties(negativeDto, firstDistributeData); @@ -282,7 +282,7 @@ public class NegativeService extends ServiceImpl { .setWorkId(work.getId()) .setNextFlowKey(FlowNodeEnum.SECOND_SIGN.getKey()) .setData(firstDistributeData); - SpringUtil.getBean(FlowService.class).execute(actionDto); // 创建一条历史数�? + SpringUtil.getBean(FlowService.class).execute(actionDto); // 创建一条历史数据 return negative; } @@ -301,10 +301,10 @@ public class NegativeService extends ServiceImpl { .setBusinessTypeCode(businessTypeCode) .setPoliceType(NegativeApiDto.BusinessType.getPoliceType(item.getBusinessTypeName())) .setPoliceTypeName(NegativeApiDto.BusinessType.getPoliceTypeName(item.getBusinessTypeName())) - // 导入的数据都是警务调�? + // 导入的数据都是警务调查 .setProblemSources(ProblemSourcesEnum.JWDC.getLabel()) .setProblemSourcesCode(ProblemSourcesEnum.JWDC.getValue()) - // 警务调查默认�?37工作�? + // 警务调查默认为137工作制 .setTimeLimit(TimeLimitEnum.WORK_137.getValue()) .setMaxSignDuration(TimeLimitEnum.WORK_137.getMaxSignDuration()) .setMaxHandleDuration(TimeLimitEnum.WORK_137.getMaxHandleDuration()) @@ -341,7 +341,7 @@ public class NegativeService extends ServiceImpl { .setCurrentProcessingObject(String.format("%s专班", dept.getShortName())); } } - // jwpy直接算现场督察大�? + // jwpy直接算现场督察大队 negative.setIssuingDepartId(JWPY_DEPARTID); negative.setIssuingDepartName(JWPY_DEPART_NAME); save(negative); @@ -373,7 +373,7 @@ public class NegativeService extends ServiceImpl { .setCreateTime(now); workService.save(firstWork); } else { - log.error("未匹配上单位：{}�?code: {}", item.getDepartName(), item.getDepartCode()); + log.error("未匹配上单位：{}， code: {}", item.getDepartName(), item.getDepartCode()); departId = AppConstants.ROOT_DEPART_ID; departName = AppConstants.ROOT_DEPART_NAME; roleCode = RoleCodeEnum.FIRST_ADMIN.getCode(); @@ -417,17 +417,17 @@ public class NegativeService extends ServiceImpl { public boolean remove(String id) { removeById(id); negativeHistoryService.removeById(id); - // 工作�? + // 工作表 workService.remove(new LambdaQueryWrapper().eq(NegativeWork::getNegativeId, id)); - // 收藏�? + // 收藏表 favService.remove(new LambdaQueryWrapper().eq(NegativeFav::getNegativeId, id)); - // 事件详情描述�? + // 事件详情描述表 thingFileService.remove(new LambdaQueryWrapper().eq(NegativeThingFile::getNegativeId, id)); // 涉及人员 blameService.remove(id); // 核查附件 fileService.remove(new LambdaQueryWrapper().eq(NegativeFile::getNegtiveId, id)); - // 签收退�? + // 签收退回 signReturnService.remove(new LambdaQueryWrapper().eq(NegativeSignReturn::getNegativeId, id)); // 申请延期 extensionApplyService.remove(new LambdaQueryWrapper().eq(NegativeExtensionApply::getNegativeId, id)); @@ -442,7 +442,7 @@ public class NegativeService extends ServiceImpl { if (CollUtil.isEmpty(histories) || CollUtil.isEmpty(applys)) { return; } - // 1. 按部�? + // 1. 按部门 Map countersignHistoryMap = new HashMap<>(); for (NegativeHistory history : histories) { if ("提交会签".equals(history.getActionName()) && StrUtil.isNotBlank(history.getDepartName())) { @@ -452,7 +452,7 @@ public class NegativeService extends ServiceImpl { if (countersignHistoryMap.isEmpty()) { return; } - // 2. 回填会签人信�? 校验部门 + // 2. 回填会签人信息 校验部门 for (CountersignApply apply : applys) { List countersigns = apply.getCountersigns(); if (CollUtil.isEmpty(countersigns)) { @@ -527,5 +527,4 @@ public class NegativeService extends ServiceImpl { } - }