From 65ac9be3a76a6d911c15776655ab7522756eff57 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Tue, 6 May 2025 10:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../domain/bo/ContractualTasksBo.java | 4 ++ .../mapper/ContractualTasksMapper.java | 12 ++++ .../impl/ContractualTasksServiceImpl.java | 68 ++++++------------- .../ContractualProductInfoMapper.xml | 11 ++- .../ContractualTasksMapper.xml | 49 +++++++++++++ 6 files changed, 97 insertions(+), 49 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ba78772..cb06736 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: basename: i18n/messages profiles: #@profiles.active@ - active: dev + active: prod # 文件上传 servlet: multipart: diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualTasksBo.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualTasksBo.java index f4ba415..6d45be3 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualTasksBo.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/bo/ContractualTasksBo.java @@ -13,6 +13,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.productManagement.domain.DocumentTasks; +import io.swagger.v3.oas.annotations.media.Schema; /** * 合同任务业务对象 contractual_tasks @@ -36,7 +37,10 @@ public class ContractualTasksBo extends BaseTaskBo { private Long groupId; private String resultType; private String batchName; + @Schema(description = "问题点") private String problemPoint; + @Schema(description = "单位名称") + private String unitName; // /** // * 模型所属行业 diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java index 1d6ec8f..effaa8b 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/mapper/ContractualTasksMapper.java @@ -1,9 +1,13 @@ package org.dromara.productManagement.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.productManagement.domain.ContractualTasks; +import org.dromara.productManagement.domain.bo.ContractualTasksBo; import org.dromara.productManagement.domain.vo.ContractualTasksVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 合同任务Mapper接口 * @@ -12,4 +16,12 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface ContractualTasksMapper extends BaseMapperPlus { + /** + * 分页查询带单位名称的任务列表 + * + * @param page 分页对象 + * @param bo 查询条件 + * @return 带单位名称的任务列表 + */ + Page selectTasksWithUnitName(Page page, ContractualTasksBo bo); } diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java index e836def..6f108e4 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java @@ -59,6 +59,10 @@ public class ContractualTasksServiceImpl extends BaseTaskService queryPageList(ContractualTasksBo bo, PageQuery pageQuery) { - DocumentTasksBo documentTasksBo = new DocumentTasksBo(); - BeanUtils.copyProperties(bo, documentTasksBo); - LambdaQueryWrapper lqw = buildQueryWrapper(documentTasksBo); - lqw.eq(DocumentTasks::getTaskType, TaskEnum.TaskType.CONTRACT_REVIEW.getValue()); - // 获取 DocumentTasksVo 的分页结果 - Page documentTasksPage = documentTasksMapper.selectVoPage(pageQuery.build(), lqw); - // 创建新的 ContractualTasksVo 的 Page 对象 - Page result = new Page<>(); - // 复制分页信息 - result.setTotal(documentTasksPage.getTotal()); - result.setSize(documentTasksPage.getSize()); - result.setCurrent(documentTasksPage.getCurrent()); - - // 转换记录列表 - List contractualTasksVoList = documentTasksPage.getRecords().stream() - .map(documentTasksVo -> { - - ContractualTasksVo contractualTasksVo = new ContractualTasksVo(); - BeanUtils.copyProperties(documentTasksVo, contractualTasksVo); - - // 设置创建用户信息,目前不需要 -// Long createBy = contractualTasksVo.getCreateBy(); -// contractualTasksVo.setCreateUser(userService.selectUserById(createBy).getNickName()); - //获取单位名称 - String unitName = ""; - - ContractualInfoVo contractualInfo = contractualInfoMapper.selectContractualInfoByTaskId(documentTasksVo.getId()); - if (contractualInfo!= null) { - unitName = contractualInfo.getPurchaserName(); - } - contractualTasksVo.setUnitName(unitName); - // 计算任务持续时间 - String formattedDuration = ""; - if (!contractualTasksVo.getProgressStatus().equals("PENDING") - && !contractualTasksVo.getProgressStatus().equals("STARTED")) { - formattedDuration = MyTimeUtils.formatTimeDifference( - contractualTasksVo.getCreateTime(), - contractualTasksVo.getUpdateTime() - ); - } - contractualTasksVo.setTaskDuration(formattedDuration); - - return contractualTasksVo; - }) - .collect(java.util.stream.Collectors.toList()); - - result.setRecords(contractualTasksVoList); + // 使用自定义Mapper方法查询带单位名称的任务列表 + Page page = pageQuery.build(); + Page result = contractualTasksMapper.selectTasksWithUnitName(page, bo); + + // 处理查询结果，设置任务持续时间 + result.getRecords().forEach(contractualTasksVo -> { + // 计算任务持续时间 + String formattedDuration = ""; + if (!contractualTasksVo.getProgressStatus().equals("PENDING") + && !contractualTasksVo.getProgressStatus().equals("STARTED")) { + formattedDuration = MyTimeUtils.formatTimeDifference( + contractualTasksVo.getCreateTime(), + contractualTasksVo.getUpdateTime() + ); + } + contractualTasksVo.setTaskDuration(formattedDuration); + }); return TableDataInfo.build(result); } diff --git a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml index 1480332..e479ba2 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml +++ b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND p.unit_price = #{queryParam.unitPrice} - AND i.purchaser_name = #{queryParam.purchaserName} + AND i.purchaser_name = LIKE CONCAT('%', #{queryParam.purchaser_name}, '%') AND p.del_flag = '0' AND dt.result_type = 'reviewSuccess' @@ -87,6 +87,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ci.file_name = #{bo.fileName} + + AND p.brand LIKE CONCAT('%', #{bo.brand}, '%') + + + AND p.version_str LIKE CONCAT('%', #{bo.versionStr}, '%') + + + AND p.cpu_model LIKE CONCAT('%', #{bo.cpuModel}, '%') + AND dt.result_type = 'reviewSuccess' AND dt.del_flag = '0' AND CASE diff --git a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualTasksMapper.xml b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualTasksMapper.xml index 31099cf..b4746ad 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualTasksMapper.xml +++ b/zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualTasksMapper.xml @@ -4,4 +4,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + +