diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 8548e72e..b053ea5a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -4,6 +4,7 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; +import cn.hutool.core.collection.CollectionUtil; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.enums.RepairTaskStatusEnum; import com.bonus.common.biz.enums.TmTaskTypeEnum; @@ -22,6 +23,7 @@ import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.material.task.domain.TmTask; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.service.IRepairAuditDetailsService; @@ -62,8 +64,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService @Override public List getRepairRecord(RepairAuditDetails repairAuditDetails) { RepairAuditDetails bean = repairAuditDetailsMapper.getRepairId(repairAuditDetails); - List list = repairAuditDetailsMapper.getRepairRecord(bean); - return list; + return repairAuditDetailsMapper.getRepairRecord(bean); } /** @@ -72,12 +73,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService */ @Override public List getRepairAuditList(RepairAuditDetails repairAuditDetails) { - List repairAuditDetailsList = repairAuditDetailsMapper.selectRepairAuditDetailsList(repairAuditDetails); - return repairAuditDetailsList; + return repairAuditDetailsMapper.selectRepairAuditDetailsList(repairAuditDetails); } @Override - public void queryTimeCope(RepairAuditDetails repairAuditDetails) { + public void queryTimeCope(@NotNull RepairAuditDetails repairAuditDetails) { Map params = repairAuditDetails.getParams(); if (params != null && !params.isEmpty()) { formatTimeParam(params, "beginTime", " 00:00:00"); @@ -94,8 +94,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService /** * 查询试验审核列表 * - * @param repairAuditDetails - * @return + * @param repairAuditDetails 查询参数 */ @Override public List selectRepairQuestList(RepairAuditDetails repairAuditDetails) { @@ -127,7 +126,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService return repairQuestList; } catch (Exception e) { // 异常处理 - e.printStackTrace(); + System.err.println("Error occurred while selecting repair quest list: " + e.getMessage()); throw new ServiceException("Failed to get repair quest list" + e.getMessage()); } } @@ -140,15 +139,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService */ @Override @Transactional(rollbackFor = Exception.class) - public int auditRepair(ScrapAudit scrapAudit) throws Exception { + public int auditRepair(@NotNull ScrapAudit scrapAudit) throws Exception { String checkResult = scrapAudit.getCheckResult(); List auditDetailList = scrapAudit.getAuditDetailList(); List taskIdList = scrapAudit.getTaskIdList(); Integer b = 0; + char status; for (Long taskId : taskIdList) { - char status; TmTask tmTask = taskMapper.selectTmTaskByTaskId(taskId); - if (tmTask.getTaskStatus() == 47) { + if (Objects.equals(tmTask.getTaskStatus(), RepairTaskStatusEnum.TASK_STATUS_REVIEW.getStatus())) { throw new Exception("任务已审核已通过"); } @@ -164,7 +163,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService status = 1; List repairInputList = new ArrayList<>(); List scrapNumList = new ArrayList<>(); - if (auditDetailList != null && auditDetailList.size() > 0) { + if (CollectionUtil.isNotEmpty(auditDetailList)) { for (RepairAuditDetails bean : auditDetailList) { if (bean.getRepairedNum().compareTo(b) > 0) { repairInputList.add(bean); @@ -179,7 +178,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapNumList = repairAuditDetailsMapper.selectScrapNumByTaskId(taskId); } - if (repairInputList != null && repairInputList.size() > 0) { + if (CollectionUtil.isNotEmpty(repairInputList)) { if (repairInputList.get(0).getCompanyId() != null) { companyId = repairInputList.get(0).getCompanyId(); } @@ -217,7 +216,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } } } - if (scrapNumList != null && scrapNumList.size() > 0) { + if (CollectionUtil.isNotEmpty(scrapNumList)) { if (scrapNumList.get(0).getCompanyId() != null) { companyId = scrapNumList.get(0).getCompanyId(); } @@ -267,12 +266,12 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } else { status = 2; List repairDetailList = new ArrayList<>(); - if (auditDetailList != null && auditDetailList.size() > 0) { + if (CollectionUtil.isNotEmpty(auditDetailList)) { repairDetailList.addAll(auditDetailList); } else { repairDetailList.addAll(auditAllList); } - if (repairDetailList.size() > 0) { + if (CollectionUtil.isNotEmpty(repairDetailList)) { if (repairDetailList.get(0).getCompanyId() != null) { companyId = repairDetailList.get(0).getCompanyId(); } @@ -302,14 +301,14 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService tmTaskNotExam.setTaskId(taskId); tmTaskNotExam.setRemark(scrapAudit.getRemark()); if (repairDetailList.size() == notAuditList.size()) { - tmTaskNotExam.setTaskStatus(48); + tmTaskNotExam.setTaskStatus(RepairTaskStatusEnum.TASK_STATUS_NO_REVIEW.getStatus()); } tmTaskNotExam.setUpdateTime(new Date()); tmTaskNotExam.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); taskMapper.updateTmTask(tmTaskNotExam); } - if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0) { - if (auditDetailList != null) { + if (CollectionUtil.isNotEmpty(scrapAudit.getAuditDetailList())) { + if (CollectionUtil.isNotEmpty(auditDetailList)) { for (RepairAuditDetails bean : auditDetailList) { bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); bean.setStatus(status); @@ -334,16 +333,14 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } /**采购单号编码生成规则*/ - private String purchaseCodeRule(String code, Integer taskType) { + private @NotNull String purchaseCodeRule(String code, Integer taskType) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); String taskNum = taskMapper.selectTaskNumByMonths(nowDate, taskType); if (StringUtils.isNotEmpty(taskNum)){ - // 将字符串转换为整数 - int num = Integer.parseInt(taskNum); - // 执行加一操作 - num++; + // 将字符串转换为整数并加一 + int num = Integer.parseInt(taskNum) + 1; // 将结果转换回字符串格式,并确保结果是四位数,不足四位则在前面补0 taskNum = String.format("%04d", num); }else { @@ -356,7 +353,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService /** * 生成任务并返回任务id */ - private long genTask(String taskCode, int taskType, int taskStatus, TmTaskAgreement tmTaskAgreement, int companyId) { + private long genTask(String taskCode, int taskType, int taskStatus, @NotNull TmTaskAgreement tmTaskAgreement, int companyId) { TmTask task = new TmTask(); task.setCode(taskCode); task.setTaskStatus(taskStatus); @@ -395,7 +392,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService * 公共方法来处理时间格式化 */ @Override - public void formatTimeParam(Map params, String key, String suffix) { + public void formatTimeParam(@NotNull Map params, String key, String suffix) { String time = (String) params.get(key); if (time != null && !time.isEmpty()) { params.put(key, time.trim() + suffix); @@ -422,7 +419,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService * @return 结果 */ @Override - public int insertRepairAuditDetails(RepairAuditDetails repairAuditDetails) { + public int insertRepairAuditDetails(@NotNull RepairAuditDetails repairAuditDetails) { repairAuditDetails.setCreateTime(DateUtils.getNowDate()); try { return repairAuditDetailsMapper.insertRepairAuditDetails(repairAuditDetails); @@ -438,7 +435,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService * @return 结果 */ @Override - public int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails) { + public int updateRepairAuditDetails(@NotNull RepairAuditDetails repairAuditDetails) { repairAuditDetails.setUpdateTime(DateUtils.getNowDate()); try { return repairAuditDetailsMapper.updateRepairAuditDetails(repairAuditDetails);