diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java index febaa032..77af7f45 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java @@ -57,6 +57,9 @@ public class MaterialConstants { /** 领料单号的开头字母 */ public static final String LEASE_TASK_TYPE_LABEL = "L"; + /** 维修单号的开头字母 */ + public static final String REPAIR_TASK_TYPE_LABEL = "WX"; + public static final String INNER_PROTOCAL = "1"; //内部单位协议 public static final String OUTER_PROTOCAL = "2"; //外部单位协议 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairApplyRecordController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairApplyRecordController.java index 77a776c8..74ecee31 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairApplyRecordController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairApplyRecordController.java @@ -1,12 +1,12 @@ package com.bonus.material.repair.controller; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -27,14 +27,14 @@ import com.bonus.common.core.web.page.TableDataInfo; /** * 维修记录Controller * - * @author xsheng - * @date 2024-10-16 + * @author syruan */ @Api(tags = "维修记录接口") @RestController @RequestMapping("/repair_apply_record") public class RepairApplyRecordController extends BaseController { - @Autowired + + @Resource private IRepairApplyRecordService repairApplyRecordService; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index 8f1fd3f2..2447a78d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -49,17 +49,11 @@ public class RepairAuditDetailsController extends BaseController { */ @ApiOperation("查询修试审核任务列表") @GetMapping("/questList") + @SysLog(title = "查询修试审核任务列表", businessType = OperaType.QUERY, logType = 1,module = "机具系统->查询修试审核任务列表") @RequiresPermissions("service:auditing:list") public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { startPage(); - Map params = repairAuditDetails.getParams(); - if (params != null && !params.isEmpty()) { - String beginTime = (String) params.get("beginTime"); - String endTime = (String) params.get("endTime"); - params.put("beginTime", beginTime + " 00:00:00"); - params.put("endTime", endTime + " 23:59:59"); - repairAuditDetails.setParams(params); - } + repairAuditDetailsService.queryTimeCope(repairAuditDetails); List list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); return getDataTable(list); } @@ -68,15 +62,9 @@ public class RepairAuditDetailsController extends BaseController { * 导出修试审核任务列表 */ @PostMapping("/export") + @SysLog(title = "导出修试审核任务列表", businessType = OperaType.EXPORT, logType = 1,module = "机具系统->导出修试审核任务列表") public void exportAudit(HttpServletResponse response, RepairAuditDetails bean) { - Map params = bean.getParams(); - if (!params.isEmpty()) { - String beginTime = (String) params.get("beginTime"); - String endTime = (String) params.get("endTime"); - params.put("beginTime", beginTime + " 00:00:00"); - params.put("endTime", endTime + " 23:59:59"); - bean.setParams(params); - } + repairAuditDetailsService.queryTimeCope(bean); List list = repairAuditDetailsService.exportRepairQuestList(bean); ExcelUtil util = new ExcelUtil<>(RepairAuditDetailsVO.class); util.exportExcel(response, list, "修试审核任务列表"); @@ -87,7 +75,7 @@ public class RepairAuditDetailsController extends BaseController { */ @ApiOperation("查看修饰审核任务详细列表") @GetMapping("/getRepairAuditList") - @RequiresPermissions("service:auditing") + @RequiresPermissions("service:auditing:list") public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); @@ -128,7 +116,7 @@ public class RepairAuditDetailsController extends BaseController { - //--------------------TOP--COPY--------------------------BUTTON--GENDER--------------- + //-----------------------------TOP--COPY--BUTTON--GENDER------------------------------ /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index c95e0579..d1858f84 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -1,6 +1,8 @@ package com.bonus.material.repair.domain; import java.util.Date; + +import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -9,6 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; + /** * 修试审核详细对象 repair_audit_details * @@ -29,18 +32,22 @@ public class RepairAuditDetails extends BaseEntity { @ApiModelProperty(value = "任务ID") private Long taskId; + @ApiModelProperty(value = "任务状态") + @Excel(name = "任务状态") + private String taskStatus; + + @ApiModelProperty(value = "任务类型编码") + private Integer taskTypeCode = TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId(); + /** 维修ID */ - @Excel(name = "维修ID") @ApiModelProperty(value = "维修ID") private Long repairId; /** 机具ID */ - @Excel(name = "机具ID") @ApiModelProperty(value = "机具ID") private Long maId; /** 规格ID */ - @Excel(name = "规格ID") @ApiModelProperty(value = "规格ID") private Long typeId; @@ -67,7 +74,7 @@ public class RepairAuditDetails extends BaseEntity { /** 审核时间 */ @ApiModelProperty(value = "审核时间") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") private Date auditTime; /** 备注备注 */ @@ -76,17 +83,14 @@ public class RepairAuditDetails extends BaseEntity { private String auditRemark; /** 0未审核1已审核2驳回 */ - @Excel(name = "0未审核1已审核2驳回") + @Excel(name = "状态", readConverterExp = "0=未审核,1=已审核,2=驳回") @ApiModelProperty(value = "0未审核1已审核2驳回") - private String status; + private char status; /** 数据所属组织 */ - @Excel(name = "数据所属组织") @ApiModelProperty(value = "数据所属组织") private Integer companyId; - @ApiModelProperty(value = "任务状态") - private String taskStatus; /**传入参数*/ @ApiModelProperty(value = "单位id") @@ -99,6 +103,8 @@ public class RepairAuditDetails extends BaseEntity { private String backCode; @ApiModelProperty(value = "关键字") private String keyword; - @ApiModelProperty(value = "规格型号") + + @Excel(name = "设备类型") + @ApiModelProperty(value = "设备类型") private String typeName; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java index acb2d27f..4fcf5db4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java @@ -72,4 +72,6 @@ public class RepairTaskDetails extends BaseEntity { @ApiModelProperty(value = "组织id") private Long companyId; + + private Long backId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java index 123c3dc8..8daf2d61 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java @@ -8,9 +8,8 @@ import lombok.Data; import java.util.List; /** - * @Author 阮世耀 - * @Create 2023/12/13 15:45 - * @Version 1.0 + * @author : 阮世耀 + * @version : 2.0 */ @Data public class ScrapApplyDetailsVO { @@ -38,9 +37,9 @@ public class ScrapApplyDetailsVO { private String projectName; /** - * 班组名称 + * 维修班组名称 */ - @ApiModelProperty(value = "班组名称") + @ApiModelProperty(value = "维修班组名称") private String teamName; /** @@ -53,6 +52,7 @@ public class ScrapApplyDetailsVO { * 机具类型 */ private String itemType; + /** * 创建时间 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index 19176faa..9e12add8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -1,6 +1,8 @@ package com.bonus.material.repair.mapper; import java.util.List; +import java.util.Map; + import com.bonus.material.repair.domain.RepairAuditDetails; import com.bonus.material.repair.domain.RepairPart; import com.bonus.material.repair.domain.RepairRecord; @@ -11,8 +13,7 @@ import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; /** * 修试审核详细Mapper接口 * - * @author xsheng - * @date 2024-10-16 + * @author syruan */ public interface RepairAuditDetailsMapper { @@ -33,7 +34,7 @@ public interface RepairAuditDetailsMapper { * @param id 修试审核详细主键 * @return 修试审核详细 */ - public RepairAuditDetails selectRepairAuditDetailsById(Long id); + RepairAuditDetails selectRepairAuditDetailsById(Long id); /** * 查询修试审核详细列表 @@ -41,7 +42,7 @@ public interface RepairAuditDetailsMapper { * @param repairAuditDetails 修试审核详细 * @return 修试审核详细集合 */ - public List selectRepairAuditDetailsList(RepairAuditDetails repairAuditDetails); + List selectRepairAuditDetailsList(RepairAuditDetails repairAuditDetails); /** * 新增修试审核详细 @@ -49,7 +50,7 @@ public interface RepairAuditDetailsMapper { * @param repairAuditDetails 修试审核详细 * @return 结果 */ - public int insertRepairAuditDetails(RepairAuditDetails repairAuditDetails); + int insertRepairAuditDetails(RepairAuditDetails repairAuditDetails); /** * 修改修试审核详细 @@ -57,7 +58,7 @@ public interface RepairAuditDetailsMapper { * @param repairAuditDetails 修试审核详细 * @return 结果 */ - public int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails); + int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails); /** * 删除修试审核详细 @@ -65,7 +66,7 @@ public interface RepairAuditDetailsMapper { * @param id 修试审核详细主键 * @return 结果 */ - public int deleteRepairAuditDetailsById(Long id); + int deleteRepairAuditDetailsById(Long id); /** * 批量删除修试审核详细 @@ -73,15 +74,29 @@ public interface RepairAuditDetailsMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteRepairAuditDetailsByIds(Long[] ids); + int deleteRepairAuditDetailsByIds(Long[] ids); List selectRepairQuestList(RepairAuditDetails repairAuditDetails); + /** + * 根据taskId查询单个规格名称---单个 + * @param taskId 任务id + */ String selectTypeNameByTaskId(Long taskId); + /** + * 根据taskIds批量查询规格名称---批量 + * @param taskIds 任务id集合 + */ + Map selectTypeNamesByTaskIds(List taskIds); + List selectRepairAuditDetailsByTaskId(Long taskId); - List selectnotAuditByTaskId(Long taskId); + /** + * 根据taskId查询未审核的数据 + * @param taskId 任务id + */ + List selectNotAuditByTaskId(Long taskId); List selectRepairInputByTaskId(Long taskId); @@ -89,7 +104,7 @@ public interface RepairAuditDetailsMapper { void updateStatus(RepairAuditDetails bean); - void updateRepairCost(RepairAuditDetails inputDetails, String status); + void updateRepairCost(RepairAuditDetails inputDetails, char status); void insertRepairDetails(RepairTaskDetails repairTaskDetails); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java index daf282d7..02166752 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java @@ -1,6 +1,8 @@ package com.bonus.material.repair.service; import java.util.List; +import java.util.Map; + import com.bonus.material.repair.domain.RepairAuditDetails; import com.bonus.material.repair.domain.RepairPart; import com.bonus.material.repair.domain.RepairRecord; @@ -11,8 +13,7 @@ import com.bonus.material.repair.domain.vo.ScrapAudit; /** * 修试审核详细Service接口 * - * @author xsheng - * @date 2024-10-16 + * @author syruan */ public interface IRepairAuditDetailsService { /** @@ -21,8 +22,12 @@ public interface IRepairAuditDetailsService { * @param id 修试审核详细主键 * @return 修试审核详细 */ - public RepairAuditDetails selectRepairAuditDetailsById(Long id); + RepairAuditDetails selectRepairAuditDetailsById(Long id); + /** + * 公共方法来处理时间格式化 YYYY-MM-DD 增加 HH:mm:ss + */ + void formatTimeParam(Map params, String key, String suffix); /** * 查询修试审核任务列表 @@ -39,6 +44,8 @@ public interface IRepairAuditDetailsService { */ List getRepairAuditList(RepairAuditDetails repairAuditDetails); + void queryTimeCope(RepairAuditDetails repairAuditDetails); + List getRepairRecord(RepairAuditDetails repairAuditDetails); List getPartRecord(RepairAuditDetails repairAuditDetails); @@ -55,7 +62,7 @@ public interface IRepairAuditDetailsService { * @param repairAuditDetails 修试审核详细 * @return 修试审核详细集合 */ - public List selectRepairAuditDetailsList(RepairAuditDetails repairAuditDetails); + List selectRepairAuditDetailsList(RepairAuditDetails repairAuditDetails); /** * 新增修试审核详细 @@ -63,7 +70,7 @@ public interface IRepairAuditDetailsService { * @param repairAuditDetails 修试审核详细 * @return 结果 */ - public int insertRepairAuditDetails(RepairAuditDetails repairAuditDetails); + int insertRepairAuditDetails(RepairAuditDetails repairAuditDetails); /** * 修改修试审核详细 @@ -71,7 +78,7 @@ public interface IRepairAuditDetailsService { * @param repairAuditDetails 修试审核详细 * @return 结果 */ - public int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails); + int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails); /** * 批量删除修试审核详细 @@ -79,7 +86,7 @@ public interface IRepairAuditDetailsService { * @param ids 需要删除的修试审核详细主键集合 * @return 结果 */ - public int deleteRepairAuditDetailsByIds(Long[] ids); + int deleteRepairAuditDetailsByIds(Long[] ids); /** * 删除修试审核详细信息 @@ -87,5 +94,5 @@ public interface IRepairAuditDetailsService { * @param id 修试审核详细主键 * @return 结果 */ - public int deleteRepairAuditDetailsById(Long id); + int deleteRepairAuditDetailsById(Long id); } 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 4492919a..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 @@ -1,10 +1,11 @@ package com.bonus.material.repair.service.impl; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +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; import com.bonus.common.core.exception.ServiceException; @@ -22,7 +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.springframework.beans.factory.annotation.Autowired; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.service.IRepairAuditDetailsService; @@ -33,7 +34,7 @@ import javax.annotation.Resource; /** * 修试审核详细Service业务层处理 * - * @author xsheng + * @author syruan * @date 2024-10-16 */ @Service @@ -51,9 +52,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService @Resource private ScrapApplyDetailsMapper scrapApplyDetailsMapper; -// @Resource -// private RepairTestInputMapper repairTestInputMapper; - @Resource private RepairInputDetailsMapper repairInputDetailsMapper; @@ -66,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); } /** @@ -76,8 +73,17 @@ 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(@NotNull RepairAuditDetails repairAuditDetails) { + Map params = repairAuditDetails.getParams(); + if (params != null && !params.isEmpty()) { + formatTimeParam(params, "beginTime", " 00:00:00"); + formatTimeParam(params, "endTime", " 23:59:59"); + repairAuditDetails.setParams(params); + } } @Override @@ -88,18 +94,41 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService /** * 查询试验审核列表 * - * @param repairAuditDetails - * @return + * @param repairAuditDetails 查询参数 */ @Override public List selectRepairQuestList(RepairAuditDetails repairAuditDetails) { - List repairQuestList = repairAuditDetailsMapper.selectRepairQuestList(repairAuditDetails); - for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { - Long taskId = scrapApplyDetailsVO.getTaskId(); - String typeName = repairAuditDetailsMapper.selectTypeNameByTaskId(taskId); - scrapApplyDetailsVO.setItemType(typeName); + try { + // 获取所有需要查询的 taskId、过滤空的 + List repairQuestList = repairAuditDetailsMapper.selectRepairQuestList(repairAuditDetails); + // 通过流过滤掉空对象 并转换为 List集合 + List taskIds = repairQuestList.stream() + .filter(Objects::nonNull) // 过滤掉空的 ScrapApplyDetailsVO 对象 + .map(ScrapApplyDetailsVO::getTaskId) + .filter(Objects::nonNull) // 过滤掉空的 taskId + .distinct() + .collect(Collectors.toList()); + + // 批量查询 typeName + Map typeNameMap = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds); + + // 设置 itemType + for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { + Long taskId = scrapApplyDetailsVO.getTaskId(); + if (taskId != null) { + String typeName = typeNameMap.get(taskId); + if (typeName != null) { + scrapApplyDetailsVO.setItemType(typeName); + } + } + } + + return repairQuestList; + } catch (Exception e) { + // 异常处理 + System.err.println("Error occurred while selecting repair quest list: " + e.getMessage()); + throw new ServiceException("Failed to get repair quest list" + e.getMessage()); } - return repairQuestList; } /** @@ -110,31 +139,31 @@ 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) { - String status = "0"; - TmTask task1 = taskMapper.selectTmTaskByTaskId(taskId); - if (task1.getTaskStatus() == 47) { + TmTask tmTask = taskMapper.selectTmTaskByTaskId(taskId); + if (Objects.equals(tmTask.getTaskStatus(), RepairTaskStatusEnum.TASK_STATUS_REVIEW.getStatus())) { throw new Exception("任务已审核已通过"); } List auditAllList = repairAuditDetailsMapper.selectRepairAuditDetailsByTaskId(taskId); - List notAuditList = repairAuditDetailsMapper.selectnotAuditByTaskId(taskId); + List notAuditList = repairAuditDetailsMapper.selectNotAuditByTaskId(taskId); // 查询协议表 TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId); - String taskCode = ""; - int taskStatus = 0; - int taskType = 0; + String taskCode; + int taskStatus; + int taskType; int companyId = 0; if ("通过".equals(checkResult)) { - status = "1"; + 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); @@ -149,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(); } @@ -187,13 +216,11 @@ 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(); } taskCode = purchaseCodeRule("BF", TmTaskTypeEnum.TM_TASK_SCRAP.getTaskTypeId()); - /*taskStatus = 58; - taskType = 57;*/ //创建报废任务 long scrapTaskId = genTask(taskCode, TmTaskTypeEnum.TM_TASK_SCRAP.getTaskTypeId(), RepairTaskStatusEnum.SCRAP_UNDER_REVIEW.getStatus(), tmTaskAgreement, companyId); for (RepairAuditDetails scrapDetails : scrapNumList) { @@ -226,29 +253,29 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService // 修饰审核通过时改修任务为已通过审核 if (auditDetailList != null) { if (auditDetailList.size() == notAuditList.size()) { - task1.setTaskStatus(47); + tmTask.setTaskStatus(47); } } else if (auditAllList != null) { if (auditAllList.size() == notAuditList.size()) { - task1.setTaskStatus(47); + tmTask.setTaskStatus(47); } } - task1.setUpdateTime(new Date()); - task1.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - taskMapper.updateTmTask(task1); + tmTask.setUpdateTime(new Date()); + tmTask.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + taskMapper.updateTmTask(tmTask); } else { - status = "2"; + 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(); } - taskCode = purchaseCodeRule("WX", 41); + taskCode = purchaseCodeRule(MaterialConstants.REPAIR_TASK_TYPE_LABEL, 41); taskStatus = 43; taskType = 41; long inputTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId); @@ -264,25 +291,24 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService repairTaskDetails.setStatus("0"); repairTaskDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); repairTaskDetails.setCompanyId((long) companyId); -// repairTaskDetails.setBackId(backId); + repairTaskDetails.setBackId(backId); repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails); - repairAuditDetailsMapper.updateRepairCost(inputDetails,status); } } // 修饰审核任务不通过时 - TmTask tmTask = new TmTask(); - tmTask.setTaskId(taskId); - tmTask.setRemark(scrapAudit.getRemark()); + TmTask tmTaskNotExam = new TmTask(); + tmTaskNotExam.setTaskId(taskId); + tmTaskNotExam.setRemark(scrapAudit.getRemark()); if (repairDetailList.size() == notAuditList.size()) { - tmTask.setTaskStatus(48); + tmTaskNotExam.setTaskStatus(RepairTaskStatusEnum.TASK_STATUS_NO_REVIEW.getStatus()); } - tmTask.setUpdateTime(new Date()); - tmTask.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - taskMapper.updateTmTask(tmTask); + 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); @@ -307,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 { @@ -326,7 +350,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService return codeNum; } - private long genTask(String taskCode, int taskType, int taskStatus, TmTaskAgreement tmTaskAgreement, int companyId) { + /** + * 生成任务并返回任务id + */ + private long genTask(String taskCode, int taskType, int taskStatus, @NotNull TmTaskAgreement tmTaskAgreement, int companyId) { TmTask task = new TmTask(); task.setCode(taskCode); task.setTaskStatus(taskStatus); @@ -361,6 +388,19 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService return repairAuditDetailsMapper.selectRepairAuditDetailsById(id); } + /** + * 公共方法来处理时间格式化 + */ + @Override + 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); + } else { + params.remove(key); + } + } + /** * 查询修试审核详细列表 * @@ -379,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); @@ -395,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); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 6633325e..bd1a108e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -25,7 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, task_id, repair_id, ma_id, type_id, repair_num, repaired_num, scrap_num, audit_by, audit_time, audit_remark, status, create_by, create_time, update_by, update_time, remark, company_id from repair_audit_details + select id, task_id, repair_id, ma_id, type_id, repair_num, repaired_num, scrap_num, audit_by, audit_time, + audit_remark, status, create_by, create_time, update_by, update_time, remark, company_id + from repair_audit_details @@ -52,34 +54,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -249,17 +262,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -313,9 +329,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} - - where task_id = #{taskId} and rd.STATUS = '0' + where task_id = #{taskId} and `status` = '0' + + select + task_id, GROUP_CONCAT(type_name) as typeName + from + (select distinct rad.task_id, mt1.type_name + from repair_audit_details rad + left join ma_type mt on rad.type_id = mt.type_id + left join ma_type mt1 on mt.parent_id = mt1.type_id + where rad.task_id in + + #{taskId} + + ) t + GROUP BY task_id + + \ No newline at end of file