diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html index 36f32f47..4acb1814 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html @@ -70,7 +70,7 @@ } .shortTd { - width: 112px; + width: 130px; } .inputTd{ width: 27vw; @@ -223,7 +223,7 @@ > POC测试 - diff --git a/ruoyi-admin/src/main/resources/templates/project/info/common/pocLog.html b/ruoyi-admin/src/main/resources/templates/project/info/common/pocLog.html index 65cdb953..9f1a58bc 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/common/pocLog.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/common/pocLog.html @@ -1,7 +1,10 @@ - 配置信息表格组件 + + + +
@@ -55,13 +81,34 @@ +
  • +
    + + +
    +
    + + 到 + +
    +
  •  搜索  重置
    • + +
    @@ -90,7 +137,46 @@ var editFlag = [[${@permission.hasPermi('product:order:edit')}]]; var removeFlag = [[${@permission.hasPermi('product:order:remove')}]]; var prefix = ctx + "project/order"; + function initSrot() { + let sort3 = $(`
    ▲
    ▼
    `) + $('thead .time3 .th-inner').append(sort3) + let sort4 = $(`
    ▲
    ▼
    `) + $('thead .time4 .th-inner').append(sort4) + let sort5 = $(`
    ▲
    ▼
    `) + $('thead .time5 .th-inner').append(sort5) + bindSort([ sort3, sort4, sort5]) + + } + function changeTimeType() { + let timeType = $("[name='timeType']").val() + if (timeType == 0) { + $('#laydate-startTime').attr('name', 'deliveryTimeStart') + $('#laydate-endTime').attr('name', 'deliveryTimeEnd') + }else if(timeType==1){ + $('#laydate-startTime').attr('name', 'estimatedOrderTimeStart') + $('#laydate-endTime').attr('name', 'estimatedOrderTimeEnd') + }else if(timeType==2){ + $('#laydate-startTime').attr('name', 'orderEndTimeStart') + $('#laydate-endTime').attr('name', 'orderEndTimeEnd') + } + } + function bindSort(list) { + list.forEach((ele, index) => { + $(ele).find('.sortBtn').on('click', function () { + changeSort(this, index) + }) + }) + + } + function changeSort(ele, index) { + let arr = ['deliveryTime','t2.estimatedOrderTime','orderEndTime'] + $('.sortBox').find('.timeAction').removeClass('timeAction') + $(ele).addClass('timeAction') + $('input[name="orderByColumn"]').val(arr[index]) + $('input[name="isAsc"]').val($(ele).attr('sort')) + $.table.search() + } $(function() { // $('#content').load(ctx + 'project/order/add'); var urlChina = '/cnarea/select'; @@ -139,10 +225,6 @@ return value?formatAmountNumber(value):''; } }, - { - field: 'createTime', - title: '下单时间' - }, { field: 'orderStatus', title: '订单状态', @@ -166,6 +248,21 @@ field: 'partnerName', title: '进货商' }, + { + field: 'deliveryTime', + title: '到货时间', + class: 'time3' + }, + { + field: 'estimatedOrderTime', + title: '下单时间', + class: 'time4' + }, + { + field: 'orderEndTime', + title: '执行单截止时间', + class: 'time5' + }, { title: '操作', align: 'center', @@ -178,6 +275,47 @@ }] }; $.table.init(options); + initSrot() + layui.use('laydate', function () { + var laydate = layui.laydate; + var startDate = laydate.render({ + elem: '#laydate-startTime', + max: $('#laydate-endTime').val(), + theme: 'molv', + trigger: 'click', + done: function (value, date) { + // 结束时间大于开始时间 + if (value !== '') { + endDate.config.min.year = date.year; + endDate.config.min.month = date.month - 1; + endDate.config.min.date = date.date; + } else { + endDate.config.min.year = ''; + endDate.config.min.month = ''; + endDate.config.min.date = ''; + } + } + }); + var endDate = laydate.render({ + elem: '#laydate-endTime', + min: $('#laydate-startTime').val(), + theme: 'molv', + trigger: 'click', + done: function (value, date) { + // 开始时间小于结束时间 + if (value !== '') { + startDate.config.max.year = date.year; + startDate.config.max.month = date.month - 1; + startDate.config.max.date = date.date; + } else { + startDate.config.max.year = ''; + startDate.config.max.month = ''; + startDate.config.max.date = ''; + } + } + }); + + }) }); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java index b8819b5a..2b7d66d6 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java @@ -58,8 +58,9 @@ public class ProjectOrderInfo extends BaseEntity { @Excel(name = "金额") private BigDecimal shipmentAmount; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @Excel(name="下单时间", width = 30, dateFormat = "yyyy-MM-dd") +// @Excel(name="下单时间", width = 30, dateFormat = "yyyy-MM-dd") private Date createTime; + /** * 订单状态 */ @@ -129,17 +130,26 @@ public class ProjectOrderInfo extends BaseEntity { /** * 执行单有效截止时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") -// @Excel(name = "执行单有效截止时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date orderEndTime; + /** * 要求到货时间 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") -// @Excel(name = "要求到货时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name="到货时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryTime; - + private Date deliveryTimeStart; + private Date deliveryTimeEnd; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "下单时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date estimatedOrderTime; + private Date estimatedOrderTimeStart; + private Date estimatedOrderTimeEnd; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "执行单有效截止时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date orderEndTime; + private Date orderEndTimeStart; + private Date orderEndTimeEnd; /** * 公司直发 */ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfo.java index 3d277040..02968b0b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfo.java @@ -1,9 +1,9 @@ package com.ruoyi.sip.domain; +import java.util.List; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import lombok.ToString; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -13,10 +13,9 @@ import com.ruoyi.common.core.domain.BaseEntity; * poc测试信息对象 project_poc_info * * @author ruoyi - * @date 2025-06-09 + * @date 2025-06-12 */ @Data -@ToString public class ProjectPocInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -28,23 +27,59 @@ public class ProjectPocInfo extends BaseEntity @Excel(name = "项目id") private Long projectId; - /** 测试环境 */ - @Excel(name = "测试环境") - private String testEnvironment; + /** 服务器配置 */ + @Excel(name = "服务器配置") + private String serverConfig; - /** 测试进展 */ - @Excel(name = "测试进展") - private String testProgress; + /** 终端配置 */ + @Excel(name = "终端配置") + private String terminalConfig; - /** 项目成员信息 */ - @Excel(name = "项目成员信息") - private String projectUserInfo; + /** 操作系统 */ + @Excel(name = "操作系统") + private String operateSystem; - /** 启动日期 */ + /** 云桌面版本 */ + @Excel(name = "云桌面版本") + private String vdiVersion; + + /** 研发人员 */ + @Excel(name = "研发人员") + private String processPerson; + + /** 研发联系电话 */ + @Excel(name = "研发联系电话") + private String processPhone; + + /** 现场处理人员 */ + @Excel(name = "现场处理人员") + private String handlePerson; + + /** 现场联系电话 */ + @Excel(name = "现场联系电话") + private String handlePhone; + + /** 汇智接口人 */ + @Excel(name = "汇智接口人") + private String hzInterfacePerson; + + /** 汇智联系电话 */ + @Excel(name = "汇智联系电话") + private String hzInterfacePhone; + + /** 启动时间 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @Excel(name = "启动日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "启动时间", width = 30, dateFormat = "yyyy-MM-dd") private Date startDate; + /** H3C销售/SE */ + @Excel(name = "H3C销售/SE") + private String h3cPerson; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String h3cPhone; + /** 预计完成时间 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "预计完成时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -55,4 +90,7 @@ public class ProjectPocInfo extends BaseEntity @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd") private Date realFinishTime; + /** $table.subTable.functionName信息 */ + private List projectPocInfoDetailList; + } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfoDetail.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfoDetail.java new file mode 100644 index 00000000..4b41a942 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectPocInfoDetail.java @@ -0,0 +1,37 @@ +package com.ruoyi.sip.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.util.Date; + +/** + * ${subTable.functionName}对象 project_poc_info_detail + * + * @author ruoyi + * @date 2025-06-12 + */ +@Data +public class ProjectPocInfoDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** poc_log表Id */ + @Excel(name = "poc_log表Id") + private Long pocId; + + /** 测试进展 */ + @Excel(name = "测试进展") + private String testProgress; + private String createByName; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectPocInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectPocInfoMapper.java index 090ee814..2c9b52dd 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectPocInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectPocInfoMapper.java @@ -2,12 +2,13 @@ package com.ruoyi.sip.mapper; import java.util.List; import com.ruoyi.sip.domain.ProjectPocInfo; +import com.ruoyi.sip.domain.ProjectPocInfoDetail; /** * poc测试信息Mapper接口 * * @author ruoyi - * @date 2025-06-09 + * @date 2025-06-12 */ public interface ProjectPocInfoMapper { @@ -59,8 +60,32 @@ public interface ProjectPocInfoMapper */ public int deleteProjectPocInfoByIds(String[] ids); - List listByProjectId(List projectId); + /** + * 批量删除${subTable.functionName} + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectPocInfoDetailByPocIds(String[] ids); + + /** + * 批量新增${subTable.functionName} + * + * @param projectPocInfoDetailList ${subTable.functionName}列表 + * @return 结果 + */ + public int batchProjectPocInfoDetail(List projectPocInfoDetailList); + - void insertBatch(List addList); - void updateBatch(List addList); + /** + * 通过poc测试信息主键删除${subTable.functionName}信息 + * + * @param id poc测试信息ID + * @return 结果 + */ + public int deleteProjectPocInfoDetailByPocId(Long id); + + List listByProjectId(List longs); + + void updateBatchProjectPocInfoDetail(List updateList); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectPocInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectPocInfoService.java index 5906ec5b..2e381760 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectPocInfoService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectPocInfoService.java @@ -7,7 +7,7 @@ import com.ruoyi.sip.domain.ProjectPocInfo; * poc测试信息Service接口 * * @author ruoyi - * @date 2025-06-09 + * @date 2025-06-12 */ public interface IProjectPocInfoService { @@ -41,7 +41,7 @@ public interface IProjectPocInfoService * @param projectPocInfo poc测试信息 * @return 结果 */ - public int updateProjectPocInfo(ProjectPocInfo projectPocInfo); + public int saveProjectPocInfo(ProjectPocInfo projectPocInfo); /** * 批量删除poc测试信息 @@ -59,9 +59,6 @@ public interface IProjectPocInfoService */ public int deleteProjectPocInfoById(Long id); - List listByProjectId(List projectId); + List listByProjectId(List longs); - - - void saveBatch(List projectPocInfos); } 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 b0d7ab67..7cebc8e1 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 @@ -141,6 +141,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { if (CollUtil.isNotEmpty(projectInfo.getCompetitorList())) { projectInfo.setCompetitor(projectInfo.getCompetitorList().stream().filter(StringUtils::isNotEmpty).collect(Collectors.joining(","))); } + if (projectInfo.getProjectPocInfo()!=null && CollUtil.isNotEmpty(projectInfo.getProjectPocInfo().getProjectPocInfoDetailList())){ + projectInfo.setPoc("1"); + } int i = projectInfoMapper.insertProjectInfo(projectInfo); saveOtherInfo(projectInfo); return i; @@ -185,7 +188,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { ProjectPocInfo projectPocInfo = projectInfo1.getProjectPocInfo(); if (projectPocInfo != null) { projectPocInfo.setProjectId(projectInfo1.getId()); - pocInfoService.saveBatch(Collections.singletonList(projectPocInfo)); + pocInfoService.saveProjectPocInfo(projectPocInfo); } } @@ -223,6 +226,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { if (changeWork) { projectInfo.setUpdateTime(DateUtils.getNowDate()); } + if (projectInfo.getProjectPocInfo()!=null && CollUtil.isNotEmpty(projectInfo.getProjectPocInfo().getProjectPocInfoDetailList())){ + projectInfo.setPoc("1"); + } int result = projectInfoMapper.updateProjectInfo(projectInfo); //变更其它信息 saveOtherInfo(projectInfo); @@ -340,12 +346,21 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { return ++index; } if (oldInfo != null) { - index=compareField(logContent, index, "POC记录测试环境", oldInfo.getTestEnvironment(), info.getTestEnvironment()); - index=compareField(logContent, index, "POC记录测试进展", oldInfo.getTestProgress(), info.getTestProgress()); - index=compareField(logContent, index, "POC记录项目成员信息", oldInfo.getProjectUserInfo(), info.getProjectUserInfo()); - index=compareField(logContent, index, "POC记录启动日期", formatterDate(oldInfo.getStartDate()), formatterDate(info.getStartDate())); - index=compareField(logContent, index, "POC记录预计完成日期", formatterDate(oldInfo.getPlanFinishTime()), formatterDate(info.getPlanFinishTime())); - index=compareField(logContent, index, "POC记录实际完成日期", formatterDate(oldInfo.getRealFinishTime()), formatterDate(info.getRealFinishTime())); + index=compareField(logContent, index, "POC服务器配置", oldInfo.getServerConfig(), info.getServerConfig()); + index=compareField(logContent, index, "POC云桌面版本", oldInfo.getVdiVersion(), info.getVdiVersion()); + index=compareField(logContent, index, "POC配置终端", oldInfo.getTerminalConfig(), info.getTerminalConfig()); + index=compareField(logContent, index, "POC操作系统", oldInfo.getOperateSystem(), info.getOperateSystem()); + index=compareField(logContent, index, "POC H3C接口人", oldInfo.getH3cPerson(), info.getH3cPerson()); + index=compareField(logContent, index, "POC H3C TEL", oldInfo.getH3cPhone(), info.getH3cPhone()); + index=compareField(logContent, index, "POC汇智接口人", oldInfo.getHzInterfacePerson(), info.getHzInterfacePerson()); + index=compareField(logContent, index, "POC汇智 TEL", oldInfo.getHzInterfacePhone(), info.getHzInterfacePhone()); + index=compareField(logContent, index, "POC研发接口人", oldInfo.getProcessPerson(), info.getProcessPerson()); + index=compareField(logContent, index, "POC研发 TEL", oldInfo.getProcessPhone(), info.getProcessPhone()); + index=compareField(logContent, index, "POC现场接口人", oldInfo.getHandlePerson(), info.getHandlePerson()); + index=compareField(logContent, index, "POC现场 TEL", oldInfo.getHandlePhone(), info.getHandlePhone()); + index=compareField(logContent, index, "POC启动时间", formatterDate(oldInfo.getStartDate()), formatterDate(info.getStartDate())); + index=compareField(logContent, index, "POC预计完成时间", formatterDate(oldInfo.getPlanFinishTime()), formatterDate(info.getPlanFinishTime())); + index=compareField(logContent, index, "POC实际完成时间", formatterDate(oldInfo.getRealFinishTime()), formatterDate(info.getRealFinishTime())); } return index; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectPocInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectPocInfoServiceImpl.java index 869fc585..afff0546 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectPocInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectPocInfoServiceImpl.java @@ -2,12 +2,19 @@ package com.ruoyi.sip.service.impl; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; + +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.ruoyi.sip.domain.ProjectPocInfoDetail; import com.ruoyi.sip.mapper.ProjectPocInfoMapper; import com.ruoyi.sip.domain.ProjectPocInfo; import com.ruoyi.sip.service.IProjectPocInfoService; @@ -17,7 +24,7 @@ import com.ruoyi.common.core.text.Convert; * poc测试信息Service业务层处理 * * @author ruoyi - * @date 2025-06-09 + * @date 2025-06-12 */ @Service public class ProjectPocInfoServiceImpl implements IProjectPocInfoService @@ -55,11 +62,14 @@ public class ProjectPocInfoServiceImpl implements IProjectPocInfoService * @param projectPocInfo poc测试信息 * @return 结果 */ + @Transactional @Override public int insertProjectPocInfo(ProjectPocInfo projectPocInfo) { projectPocInfo.setCreateTime(DateUtils.getNowDate()); - return projectPocInfoMapper.insertProjectPocInfo(projectPocInfo); + int rows = projectPocInfoMapper.insertProjectPocInfo(projectPocInfo); + insertProjectPocInfoDetail(projectPocInfo); + return rows; } /** @@ -68,9 +78,17 @@ public class ProjectPocInfoServiceImpl implements IProjectPocInfoService * @param projectPocInfo poc测试信息 * @return 结果 */ + @Transactional @Override - public int updateProjectPocInfo(ProjectPocInfo projectPocInfo) + public int saveProjectPocInfo(ProjectPocInfo projectPocInfo) { +// projectPocInfoMapper.deleteProjectPocInfoDetailByPocId(projectPocInfo.getId()); + insertProjectPocInfoDetail(projectPocInfo); + if (projectPocInfo.getId() == null) { + int i = projectPocInfoMapper.insertProjectPocInfo(projectPocInfo); + insertProjectPocInfoDetail(projectPocInfo); + return i; + } return projectPocInfoMapper.updateProjectPocInfo(projectPocInfo); } @@ -80,9 +98,11 @@ public class ProjectPocInfoServiceImpl implements IProjectPocInfoService * @param ids 需要删除的poc测试信息主键 * @return 结果 */ + @Transactional @Override public int deleteProjectPocInfoByIds(String ids) { + projectPocInfoMapper.deleteProjectPocInfoDetailByPocIds(Convert.toStrArray(ids)); return projectPocInfoMapper.deleteProjectPocInfoByIds(Convert.toStrArray(ids)); } @@ -92,29 +112,49 @@ public class ProjectPocInfoServiceImpl implements IProjectPocInfoService * @param id poc测试信息主键 * @return 结果 */ + @Transactional @Override public int deleteProjectPocInfoById(Long id) { + projectPocInfoMapper.deleteProjectPocInfoDetailByPocId(id); return projectPocInfoMapper.deleteProjectPocInfoById(id); } @Override - public List listByProjectId(List projectId) { - return projectPocInfoMapper.listByProjectId(projectId); + public List listByProjectId(List longs) { + return projectPocInfoMapper.listByProjectId(longs); } - @Override - public void saveBatch(List projectPocInfos) { - if (CollUtil.isEmpty(projectPocInfos)){ - return; - } - List addList = projectPocInfos.stream().filter(projectPocInfo -> projectPocInfo.getId() == null).collect(Collectors.toList()); - List updateList = projectPocInfos.stream().filter(projectPocInfo -> projectPocInfo.getId() != null).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(addList)){ - projectPocInfoMapper.insertBatch(addList); - } - if (CollUtil.isNotEmpty(updateList)){ - projectPocInfoMapper.updateBatch(updateList); + /** + * 新增${subTable.functionName}信息 + * + * @param projectPocInfo poc测试信息对象 + */ + public void insertProjectPocInfoDetail(ProjectPocInfo projectPocInfo) { + List projectPocInfoDetailList = projectPocInfo.getProjectPocInfoDetailList(); + Long id = projectPocInfo.getId(); + if (CollUtil.isNotEmpty(projectPocInfoDetailList)) { + List addList = new ArrayList<>(); + List updateList = new ArrayList<>(); + projectPocInfoDetailList.forEach(projectPocInfoDetail -> { + projectPocInfoDetail.setPocId(id); + if (projectPocInfoDetail.getId() != null) { + updateList.add(projectPocInfoDetail); + } else { + projectPocInfoDetail.setCreateBy(ShiroUtils.getUserId().toString()); + projectPocInfoDetail.setCreateTime(DateUtils.getNowDate()); + addList.add(projectPocInfoDetail); + } + }); + if (CollUtil.isNotEmpty(updateList)) { +// projectPocInfoMapper.updateBatchProjectPocInfoDetail(updateList); + } + if (CollUtil.isNotEmpty(addList)) { + projectPocInfoMapper.batchProjectPocInfoDetail(addList); + } + } } + + } diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index 395ca3a3..d5639bf7 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.shipment_amount, t1.actual_purchase_amount, t1.order_end_time, t1.delivery_time, t1.company_delivery, t1.notifier, t1.notifier_email, t1.notifier_phone, t1.duty, t1.duty_email, t1.duty_phone, t1.order_channel, t1.partner_code, t1.supplier, t1.remark, t1.order_status, t1.create_by, t1.create_time, t1.update_by, t1.update_time,t1.partner_user_name,t1.partner_email,t1.partner_phone - ,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code + ,t2.project_code,t2.project_name,t2.province,t2.customer_name,t2.customer_code,t2.industry_type,t2.bg_property,t2.agent_code,t2.estimated_order_time ,t3.partner_name,t3.level ,t4.agent_name ,t5.user_name as duty_name @@ -90,6 +90,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.supplier = #{supplier} and t1.supplier = #{supplier} and t1.order_status = #{orderStatus} + + + + and t1.delivery_time between date_format(#{deliveryTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{deliveryTimeEnd}, '%Y-%m-%d 23:59:59') + + + and t1.delivery_time = ]]> date_format(#{deliveryTimeStart}, '%Y-%m-%d 00:00:00') + + + and t1.delivery_time date_format(#{deliveryTimeEnd}, '%Y-%m-%d 23:59:59') + + + + + + + + and t2.estimated_order_time between date_format(#{estimatedOrderTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{estimatedOrderTimeEnd}, '%Y-%m-%d 23:59:59') + + + and t2.estimated_order_time = ]]> date_format(#{estimatedOrderTimeStart}, '%Y-%m-%d 00:00:00') + + + and t2.estimated_order_time date_format(#{estimatedOrderTimeEnd}, '%Y-%m-%d 23:59:59') + + + + + + + + and t1.order_end_time between date_format(#{orderEndTimeStart}, '%Y-%m-%d 00:00:00') and date_format(#{orderEndTimeEnd}, '%Y-%m-%d 23:59:59') + + + and t1.order_end_time = ]]> date_format(#{orderEndTimeStart}, '%Y-%m-%d 00:00:00') + + + and t1.order_end_time date_format(#{orderEndTimeEnd}, '%Y-%m-%d 23:59:59') + + + + diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectPocInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectPocInfoMapper.xml index dcc9c09b..bc5afc9a 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectPocInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectPocInfoMapper.xml @@ -7,54 +7,100 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + + + + + + + + + + + + + + + + + + + + + + - select id, project_id, test_environment, test_progress, project_user_info, start_date, plan_finish_time, real_finish_time, create_by, create_time from project_poc_info + select id, project_id, server_config, terminal_config, operate_system, vdi_version, process_person, process_phone, handle_person, handle_phone, hz_interface_person, hz_interface_phone, start_date, h3c_person, h3c_phone, plan_finish_time, real_finish_time, create_by, create_time from project_poc_info - + select id, project_id, server_config, terminal_config, operate_system, vdi_version, process_person, process_phone, handle_person, handle_phone, hz_interface_person, hz_interface_phone, start_date, h3c_person, h3c_phone, plan_finish_time, real_finish_time, create_by, create_time + from project_poc_info where id = #{id} - + select t1.id, t1.poc_id, t1.test_progress, t1.create_by, t1.create_time,t2.user_name as create_by_name + from project_poc_info_detail t1 + left join sys_user t2 on t1.create_by = t2.user_id + where t1.poc_id = #{poc_id} + + insert into project_poc_info project_id, - test_environment, - test_progress, - project_user_info, + server_config, + terminal_config, + operate_system, + vdi_version, + process_person, + process_phone, + handle_person, + handle_phone, + hz_interface_person, + hz_interface_phone, start_date, + h3c_person, + h3c_phone, plan_finish_time, real_finish_time, create_by, @@ -62,31 +108,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{projectId}, - #{testEnvironment}, - #{testProgress}, - #{projectUserInfo}, + #{serverConfig}, + #{terminalConfig}, + #{operateSystem}, + #{vdiVersion}, + #{processPerson}, + #{processPhone}, + #{handlePerson}, + #{handlePhone}, + #{hzInterfacePerson}, + #{hzInterfacePhone}, #{startDate}, + #{h3cPerson}, + #{h3cPhone}, #{planFinishTime}, #{realFinishTime}, #{createBy}, #{createTime}, - - insert into project_poc_info (project_id, test_environment, test_progress, project_user_info, start_date, plan_finish_time, real_finish_time, create_by, create_time) values - - (#{item.projectId}, #{item.testEnvironment}, #{item.testProgress}, #{item.projectUserInfo}, #{item.startDate}, #{item.planFinishTime}, #{item.realFinishTime}, #{item.createBy},now()) - - update project_poc_info project_id = #{projectId}, - test_environment = #{testEnvironment}, - test_progress = #{testProgress}, - project_user_info = #{projectUserInfo}, + server_config = #{serverConfig}, + terminal_config = #{terminalConfig}, + operate_system = #{operateSystem}, + vdi_version = #{vdiVersion}, + process_person = #{processPerson}, + process_phone = #{processPhone}, + handle_person = #{handlePerson}, + handle_phone = #{handlePhone}, + hz_interface_person = #{hzInterfacePerson}, + hz_interface_phone = #{hzInterfacePhone}, start_date = #{startDate}, + h3c_person = #{h3cPerson}, + h3c_phone = #{h3cPhone}, plan_finish_time = #{planFinishTime}, real_finish_time = #{realFinishTime}, create_by = #{createBy}, @@ -94,17 +152,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - - update project_poc_info - - test_environment = #{item.testEnvironment}, - test_progress = #{item.testProgress}, - project_user_info = #{item.projectUserInfo}, - start_date = #{item.startDate}, - plan_finish_time = #{item.planFinishTime}, - real_finish_time = #{item.realFinishTime}, - + + + update project_poc_info_detail + set test_progress = #{item.testProgress} where id = #{item.id} @@ -119,5 +170,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + delete from project_poc_info_detail where poc_id in + + #{pocId} + + + + + delete from project_poc_info_detail where poc_id = #{pocId} + + + + insert into project_poc_info_detail( id, poc_id, test_progress, create_by, create_time) values + + ( #{item.id}, #{item.pocId}, #{item.testProgress}, #{item.createBy}, #{item.createTime}) + + \ No newline at end of file