From 3480d5530966680994f06f23887cd6bf8f9b2b65 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Tue, 3 Jun 2025 15:35:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=92=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增选择客户、合作伙伴和人员的页面路由 - 优化项目信息查询条件，支持日期范围查询 - 修复项目订单信息插入逻辑，添加创建人和订单编号 - 优化项目信息列表查询，增加空列表判断 --- .../sip/controller/ProjectInfoController.java | 15 +++++++++ .../service/impl/ProjectInfoServiceImpl.java | 3 ++ .../impl/ProjectOrderInfoServiceImpl.java | 3 ++ .../mapper/sip/ProjectInfoMapper.xml | 33 ++++++++++--------- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java index 89c861d3..c4861fde 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java @@ -40,6 +40,21 @@ public class ProjectInfoController extends BaseController { return prefix + "/project"; } + @GetMapping("/selectCustomer") + public String selectCustomer() + { + return prefix + "/selectCustomer"; + } + @GetMapping("/selectPartner") + public String selectPartner() + { + return prefix + "/selectPartner"; + } + @GetMapping("selectPeople") + public String selectPeople() + { + return prefix + "/selectPeople"; + } /** * 查询项目管理列表 diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java index 7a2a8900..637eaa7a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java @@ -92,6 +92,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { public List selectProjectInfoList(ProjectInfo projectInfo) { List projectInfos = projectInfoMapper.selectProjectInfoList(projectInfo); + if (CollUtil.isEmpty(projectInfos)){ + return projectInfos; + } List idList = projectInfos.stream().map(ProjectInfo::getId).collect(Collectors.toList()); List projectOrderInfos = orderInfoService.selectProjectOrderInfoByProjectId(idList); Map orderInfoMap = projectOrderInfos.stream().collect(Collectors.toMap(ProjectOrderInfo::getProjectId, Function.identity(), (v1, v2) -> v1)); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 3ba8fb84..be0849aa 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.sip.domain.ProjectOrderFileLog; import com.ruoyi.sip.service.IProjectOrderFileLogService; import org.springframework.beans.factory.annotation.Autowired; @@ -66,6 +67,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { @Override public int insertProjectOrderInfo(ProjectOrderInfo projectOrderInfo) { projectOrderInfo.setCreateTime(DateUtils.getNowDate()); + projectOrderInfo.setCreateBy(ShiroUtils.getUserId().toString()); + //todo 生成订单编号 return projectOrderInfoMapper.insertProjectOrderInfo(projectOrderInfo); } diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml index fbf77d9b..23cd3b38 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml @@ -60,43 +60,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and estimated_order_time = #{estimatedOrderTime} + + and estimated_order_time between date_format(#{estimatedOrderTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{estimatedOrderTimeEnd}, '%Y-%m-%d 23:59:59') + - and estimated_order_time = ]]> #{estimatedOrderTimeStart} + and estimated_order_time = ]]> date_format(#{estimatedOrderTimeStart}, '%Y-%m-%d 00:00:00') - and estimated_order_time #{estimatedOrderTimeEnd} + and estimated_order_time date_format(#{estimatedOrderTimeEnd}, '%Y-%m-%d 23:59:59') - - and estimated_order_time between #{estimatedOrderTimeStart} and #{estimatedOrderTimeEnd} - + and estimated_deliver_time = #{estimatedDeliverTime} + + and estimated_deliver_time between date_format(#{estimatedDeliverTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{estimatedDeliverTimeEnd}, '%Y-%m-%d 23:59:59') + - and estimated_deliver_time = ]]> #{estimatedDeliverTimeStart} + and estimated_deliver_time = ]]> date_format(#{estimatedDeliverTimeStart}, '%Y-%m-%d 00:00:00') - and estimated_deliver_time #{estimatedDeliverTimeEnd} + and estimated_deliver_time date_format(#{estimatedDeliverTimeEnd}, '%Y-%m-%d 23:59:59') - - and estimated_deliver_time between #{estimatedDeliverTimeStart} and #{estimatedDeliverTimeEnd} - + + + and update_time between date_format(#{updateTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{updateTimeEnd}, '%Y-%m-%d 23:59:59') + - and update_time = ]]> #{updateTimeStart} + and update_time = ]]> date_format(#{updateTimeStart}, '%Y-%m-%d 00:00:00') - and update_time #{updateTimeEnd} + and update_time date_format(#{updateTimeEnd}, '%Y-%m-%d 23:59:59') - - and update_time between #{updateTimeStart} and #{updateTimeEnd} - +