diff --git a/oms_web/oms_vue/src/api/project/order.js b/oms_web/oms_vue/src/api/project/order.js index 4e1707cc..ac617551 100644 --- a/oms_web/oms_vue/src/api/project/order.js +++ b/oms_web/oms_vue/src/api/project/order.js @@ -59,7 +59,7 @@ export function delContractFile(ids) { return request({ url: '/project/order/file/remove', method: 'post', - data: { ids: ids } + params: { ids: ids } }) } diff --git a/oms_web/oms_vue/src/views/approve/approved_order/index.vue b/oms_web/oms_vue/src/views/approve/approved_order/index.vue index e09971e6..4cb5bb91 100644 --- a/oms_web/oms_vue/src/views/approve/approved_order/index.vue +++ b/oms_web/oms_vue/src/views/approve/approved_order/index.vue @@ -148,7 +148,7 @@ export default { customerName: null, dutyName: null, approveNode: null, - orderByColumn:'approveTime', + orderByColumn:'t7.todo_approve_time', isAsc: 'desc' }, }; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java index 902ef689..28cd9d69 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java @@ -81,4 +81,7 @@ public interface ProjectOrderInfoMapper List listByCodeList(List businessKeyList); void updatePartnerCodeByCode(@Param("oldValue") String partnerCode, @Param("newValue")String newPartnerCode); + + List listLog(ProjectOrderInfo projectOrderInfo); + } 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 7567640f..607218c3 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 @@ -260,9 +260,12 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To put("authSql", authSql.toString()); }}); } - - - List projectOrderInfos = projectOrderInfoMapper.selectProjectOrderInfoList(projectOrderInfo); + List projectOrderInfos=new ArrayList<>(); + if (StringUtils.isNotEmpty(projectOrderInfo.getApproveLog())){ + projectOrderInfos = projectOrderInfoMapper.listLog(projectOrderInfo); + }else{ + projectOrderInfos = projectOrderInfoMapper.selectProjectOrderInfoList(projectOrderInfo); + } for (ProjectOrderInfo orderInfo : projectOrderInfos) { //省代看总代合同 orderInfo.setShowLog(showLog && ProjectOrderInfo.OrderChannelEnum.TOTAL_GENERATION.getCode().equals(orderInfo.getOrderChannel())); diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index 60379006..562ccabc 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -294,6 +294,179 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) +