From 30bf793f3475d5a00d5fbe158e9132c308c46267 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 17 Jan 2025 13:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8A=A5=E5=BA=9F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArchivesServiceImpl.java | 22 +++++++++++++++++++ .../controller/BackApplyInfoController.java | 12 ++++------ .../back/mapper/BackApplyInfoMapper.java | 4 ++-- .../back/service/IBackApplyInfoService.java | 2 +- .../impl/BackApplyInfoServiceImpl.java | 11 +++++----- .../repair/controller/RepairController.java | 4 ---- .../repair/domain/RepairAuditDetails.java | 2 +- .../scrap/domain/ScrapApplyDetails.java | 3 +++ .../scrap/mapper/ScrapApplyDetailsMapper.java | 5 +++++ .../material/back/BackApplyInfoMapper.xml | 7 ++++++ .../repair/RepairAuditDetailsMapper.xml | 8 +++++-- .../scrap/ScrapApplyDetailsMapper.xml | 11 ++++++++-- 12 files changed, 66 insertions(+), 25 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java index 06959589..72120a51 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java @@ -152,6 +152,28 @@ public class ArchivesServiceImpl implements ArchivesService { @Override public List getDetailsList(ArchivesDetails archivesDetails) { List list = archivesMapper.selectDetailsList(archivesDetails); + if (CollectionUtils.isNotEmpty(list)) { + for (ArchivesDetails details : list) { + if ((StringUtils.isNotBlank(details.getDocUrl()) && details.getDocUrl().startsWith("http")) && StringUtils.isNotBlank(details.getDocName())) { + String originalPath = details.getDocName(); + // 找到最后一个 '/' 字符的位置 + int lastSlashIndex = originalPath.lastIndexOf('/'); + // 从最后一个 '/' 字符之后提取文件名 + String fileName = originalPath.substring(lastSlashIndex + 1); + // 找到 '.png' 的位置 + int dotIndex = fileName.lastIndexOf('.'); + // 找到倒数第二个 '_' 的位置 + int underscoreIndex = fileName.lastIndexOf('_', dotIndex - 1); + // 截取文件名部分（不包含后缀和多余部分） + String namePart = fileName.substring(0, underscoreIndex); + // 截取后缀部分 + String suffix = fileName.substring(dotIndex); + // 拼接最终的文件名 + String extractedFileName = namePart + suffix; + details.setDocName(extractedFileName); + } + } + } return list; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java index 6f0af5af..533e9ca6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java @@ -14,12 +14,7 @@ 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.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.back.domain.BackApplyInfo; @@ -99,8 +94,9 @@ public class BackApplyInfoController extends BaseController { @ApiOperation(value = "获取退料任务详细信息") // @RequiresPermissions("back:info:query") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(backApplyInfoService.selectBackApplyInfoById(id)); + public AjaxResult getInfo(@PathVariable("id") Long id, + @RequestParam(value = "keyWord", required = false) String keyWord) { + return success(backApplyInfoService.selectBackApplyInfoById(id, keyWord)); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java index 111014c1..08026e25 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java @@ -81,10 +81,10 @@ public interface BackApplyInfoMapper { /** * 根据任务id查询详情 - * @param id + * @param backApplyInfo * @return */ - List selectBackApplyDetailsListByTaskId(Long id); + List selectBackApplyDetailsListByTaskId(BackApplyInfo backApplyInfo); /** * 根据设备编码查询设备信息 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java index 91684e9b..2793b90a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java @@ -22,7 +22,7 @@ public interface IBackApplyInfoService { * @param id 退料任务主键 * @return 退料任务 */ - public BackApplyRequestVo selectBackApplyInfoById(Long id); + public BackApplyRequestVo selectBackApplyInfoById(Long id, String keyWord); /** * 查询退料任务列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 48f73ab3..cf96fed0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -79,13 +79,14 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { * @return 退料任务 */ @Override - public BackApplyRequestVo selectBackApplyInfoById(Long id) { + public BackApplyRequestVo selectBackApplyInfoById(Long id, String keyWord) { BackApplyRequestVo backApplyRequestVo = new BackApplyRequestVo(); //先根据外层id查询上层信息 BackApplyInfo backApplyInfo = backApplyInfoMapper.selectBackApplyInfoById(id); backApplyRequestVo.setBackApplyInfo(backApplyInfo); //查询退料详情信息 - List backApplyDetailsList = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(id); + backApplyInfo.setKeyWord(keyWord); + List backApplyDetailsList = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(backApplyInfo); if (CollectionUtils.isNotEmpty(backApplyDetailsList)) { // 批量查询附件信息，减少数据库访问次数 List bmFileInfos = fetchBmFileInfos(id, backApplyDetailsList); @@ -431,7 +432,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { // 查询信息 Long id = dto.getBackApplyInfo().getId(); BackApplyInfo backApplyInfo = backApplyInfoMapper.selectBackApplyInfoById(id); - List backApplyDetailsList = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(id); + List backApplyDetailsList = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(dto.getBackApplyInfo()); List maCodeList = backApplyInfoMapper.selectByCode(id); int result = 0; if (CollectionUtils.isNotEmpty(maCodeList)) { @@ -475,7 +476,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { try { // 查询信息 BackApplyInfo backApplyInfo = backApplyInfoMapper.selectBackApplyInfoById(id); - List backApplyDetailsList = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(id); + List backApplyDetailsList = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(backApplyInfo); List maCodeList = backApplyInfoMapper.selectByCode(id); // 删除相关任务信息 int result = deleteTaskInfo(backApplyInfo); @@ -591,7 +592,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { public AjaxResult submitBackApply(BackApplyInfo backApplyInfo) { int result = 0; //先查询退料详情信息 - List applyDetails = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(backApplyInfo.getId()); + List applyDetails = backApplyInfoMapper.selectBackApplyDetailsListByTaskId(backApplyInfo); if (CollectionUtils.isNotEmpty(applyDetails)) { for (BackApplyDetails applyDetail : applyDetails) { if (applyDetail.getPreNum().compareTo(applyDetail.getNum())>0) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 9b7d7703..d0344739 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -1,12 +1,10 @@ package com.bonus.material.repair.controller; -import com.bonus.common.biz.utils.HttpHelper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.repair.domain.*; import com.bonus.material.repair.domain.vo.OCRBean; import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo; @@ -21,11 +19,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Arrays; 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 a6c0cca0..7f50cc2a 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 @@ -88,7 +88,7 @@ public class RepairAuditDetails extends BaseEntity { /** 审核时间 */ @ApiModelProperty(value = "审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") private Date auditTime; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java index 63e224ac..2ef5b6c0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java @@ -127,6 +127,9 @@ public class ScrapApplyDetails extends BaseEntity { @Excel(name = "报废类型", readConverterExp = "0=自然，1人为") private String scrapType; + @ApiModelProperty(value = "报废原因") + private String scrapReason; + @ApiModelProperty(value = "报废人") private String scraper; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java index da082b38..494b5b83 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java @@ -22,6 +22,11 @@ public interface ScrapApplyDetailsMapper { */ public ScrapApplyDetails selectScrapApplyDetailsById(Long id); + /** + * 根据任务id查询报废详情 + * @param scrapApplyDetails + * @return + */ List selectRepairQuestListByTaskId(ScrapApplyDetails scrapApplyDetails); /** diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 8b9e1b6d..657c991a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -185,6 +185,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0 LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0 WHERE ba.parent_id = #{id} + + and ( + mt1.type_name like concat('%', #{keyWord}, '%') or + mt.type_name like concat('%', #{keyWord}, '%') or + mt2.type_name like concat('%', #{keyWord}, '%') + ) +