From 1fe09a7839a5544f38ed5beaab4fa87ce6c5774d Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 5 Dec 2024 15:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/domain/LeaseRecordDto.java | 4 + .../lease/mapper/LeaseRepairRecordMapper.java | 4 +- .../impl/LeaseRepairRecordServiceImpl.java | 81 ++++------ .../service/impl/MaLeaseInfoServiceImpl.java | 141 +++++++++--------- .../material/order/domain/OrderInfoDto.java | 3 + .../order/service/impl/OrderServiceImpl.java | 11 ++ .../mapper/material/device/DevInfoMapper.xml | 21 ++- .../lease/LeaseRepairRecordMapper.xml | 18 +-- .../material/lease/MaLeaseInfoMapper.xml | 4 +- 9 files changed, 146 insertions(+), 141 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java index ee7a9c7..01217a5 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java @@ -1,5 +1,6 @@ package com.bonus.material.lease.domain; +import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.material.order.domain.OrderDetailDto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -55,4 +56,7 @@ public class LeaseRecordDto { @ApiModelProperty(value = "丢失列表") private List lossRecordList; + + @ApiModelProperty(value = "附件信息") + private List fileInfoList; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java index 1ba80da..40c810a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java @@ -22,10 +22,10 @@ public interface LeaseRepairRecordMapper { /** * 查询列表 - * @param orderCode + * @param orderId * @return */ - int selectLeaseContent(String orderCode); + int selectLeaseContent(String orderId); /** * 新增 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java index af4b019..6588b64 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java @@ -38,15 +38,6 @@ import java.util.stream.Collectors; @Slf4j public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { - // 维修类型图片 - private final Integer MAIN_IMAGES_DICT_VALUE = 0; - - // 报废类型图片 - private final Integer DETAILS_IMAGES_DICT_VALUE = 1; - - // 丢失类型图片 - private final Integer EXAMINATION_PDF = 2; - @Resource private LeaseRepairRecordMapper mapper; @@ -66,8 +57,8 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { List list = mapper.list(dto); if (CollectionUtils.isNotEmpty(list)) { for (LeaseRepair leaseRepairVo : list) { - //根据订单编号去lease_repair_record表中查询是否已填写退租检修信息 - int count = mapper.selectLeaseContent(leaseRepairVo.getCode()); + //根据订单id去lease_repair_record表中查询是否已填写退租检修信息 + int count = mapper.selectLeaseContent(leaseRepairVo.getOrderId()); if (count > 0) { leaseRepairVo.setIsLeaseContent(1); } else { @@ -116,22 +107,22 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { if (CollectionUtils.isNotEmpty(list)) { for (LeaseRepairRecord leaseRepairRecord : list) { if (leaseRepairRecord.getRepairChangePrice() != null || leaseRepairRecord.getScrapChangePrice() != null - || leaseRepairRecord.getLossChangePrice() != null) { + || leaseRepairRecord.getLossChangePrice() != null) { leaseRecordDto.setIsChangePrice(1); } if (leaseRepairRecord.getRepairChangePrice() != null) { totalCost = totalCost.add(leaseRepairRecord.getRepairChangePrice()); - } else if (leaseRepairRecord.getRepairPrice() != null){ + } else if (leaseRepairRecord.getRepairPrice() != null) { totalCost = totalCost.add(leaseRepairRecord.getRepairPrice()); } if (leaseRepairRecord.getScrapChangePrice() != null) { totalCost = totalCost.add(leaseRepairRecord.getScrapChangePrice()); - } else if (leaseRepairRecord.getScrapPrice() != null){ + } else if (leaseRepairRecord.getScrapPrice() != null) { totalCost = totalCost.add(leaseRepairRecord.getScrapPrice()); } if (leaseRepairRecord.getLossChangePrice() != null) { totalCost = totalCost.add(leaseRepairRecord.getLossChangePrice()); - } else if (leaseRepairRecord.getLossPrice() != null){ + } else if (leaseRepairRecord.getLossPrice() != null) { totalCost = totalCost.add(leaseRepairRecord.getLossPrice()); } BmFileInfo bmFileInfo = new BmFileInfo(); @@ -139,42 +130,25 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { bmFileInfo.setTaskType(MaterialConstants.LEASE_REPAIR_RECORD_TABLE_NAME); List fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); if (CollectionUtils.isNotEmpty(fileList)) { - fileList.forEach(item -> { - if (item.getFileType().equals(Long.valueOf(MAIN_IMAGES_DICT_VALUE))) { - // 确保 leaseRepairRecord.getFileInfoList() 不为 null - if (leaseRepairRecord.getFileInfoList() == null) { - leaseRepairRecord.setFileInfoList(new ArrayList<>()); - } - leaseRepairRecord.getFileInfoList().add(item); - // 确保 leaseRecordDto.getRepairRecordList() 不为 null - if (leaseRecordDto.getRepairRecordList() == null) { - leaseRecordDto.setRepairRecordList(new ArrayList<>()); - } - leaseRecordDto.getRepairRecordList().add(leaseRepairRecord); - } else if (item.getFileType().equals(Long.valueOf(DETAILS_IMAGES_DICT_VALUE))) { - // 确保 leaseRepairRecord.getFileInfoList() 不为 null - if (leaseRepairRecord.getFileInfoList() == null) { - leaseRepairRecord.setFileInfoList(new ArrayList<>()); - } - leaseRepairRecord.getFileInfoList().add(item); - // 确保 leaseRecordDto.getScrapRecordList() 不为 null - if (leaseRecordDto.getScrapRecordList() == null) { - leaseRecordDto.setScrapRecordList(new ArrayList<>()); - } - leaseRecordDto.getScrapRecordList().add(leaseRepairRecord); - } else if (item.getFileType().equals(Long.valueOf(EXAMINATION_PDF))) { - // 确保 leaseRepairRecord.getFileInfoList() 不为 null - if (leaseRepairRecord.getFileInfoList() == null) { - leaseRepairRecord.setFileInfoList(new ArrayList<>()); - } - leaseRepairRecord.getFileInfoList().add(item); - // 确保 leaseRecordDto.getLossRecordList() 不为 null - if (leaseRecordDto.getLossRecordList() == null) { - leaseRecordDto.setLossRecordList(new ArrayList<>()); - } - leaseRecordDto.getLossRecordList().add(leaseRepairRecord); - } - }); + leaseRecordDto.setFileInfoList(fileList); + } + if (leaseRecordDto.getRepairRecordList() == null) { + leaseRecordDto.setRepairRecordList(new ArrayList<>()); + } + if (leaseRepairRecord.getRepairPrice() != null) { + leaseRecordDto.getRepairRecordList().add(leaseRepairRecord); + } + if (leaseRecordDto.getScrapRecordList() == null) { + leaseRecordDto.setScrapRecordList(new ArrayList<>()); + } + if (leaseRepairRecord.getScrapPrice() != null) { + leaseRecordDto.getScrapRecordList().add(leaseRepairRecord); + } + if (leaseRecordDto.getLossRecordList() == null) { + leaseRecordDto.setLossRecordList(new ArrayList<>()); + } + if (leaseRepairRecord.getLossPrice() != null) { + leaseRecordDto.getLossRecordList().add(leaseRepairRecord); } } } @@ -243,7 +217,8 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { return handleAllRecords(leaseRecordDto, maIdList); } } catch (Exception e) { - e.printStackTrace(); + log.error("新增退租检修异常: ", e.getMessage()); + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), e.getMessage()); } return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()); } @@ -319,7 +294,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { @Override @Transactional(rollbackFor = Exception.class) public AjaxResult confirmPrice(LeaseRepairRecord leaseRepairRecord) { - if (leaseRepairRecord.getOrderId() != null) { + if (leaseRepairRecord.getOrderId() == null) { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg()); } leaseRepairRecord.setPriceConfirmUser(SecurityUtils.getUserId()); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index 6c53608..6fe7dae 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -80,7 +80,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { maLeaseDetails.setLeaseId(id); result += leaseInfoMapper.insertDetails(maLeaseDetails); if (result > 0 && maLeaseDetails.getId() != null) { - insertFile(maLeaseDetails, maLeaseDetails.getId()); + insertFile(maLeaseDetails, id); } } } @@ -137,27 +137,15 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { } int result = leaseInfoMapper.updateDevInfo(maLeaseInfo); //根据id查询删除详情信息 - List leaseDetailsList = leaseInfoMapper.selectDetailsById(maLeaseInfo); result += leaseInfoMapper.deleteDetailsById(maLeaseInfo); //首先根据id查询文件信息是否存在 BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(maLeaseInfo.getId())); bmFileInfo.setTaskType(MaterialConstants.LEASE_FILE_TYPE_CODE); - bmFileInfo.setFileType(0L); List bmFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); if (CollectionUtils.isNotEmpty(bmFileInfoList)) { bmFileInfoMapper.deleteBmFileInfoByIds(bmFileInfoList.stream().map(BmFileInfo::getId).toArray(Long[]::new)); } - if (CollectionUtils.isNotEmpty(leaseDetailsList)) { - for (MaLeaseDetails maLeaseDetails : leaseDetailsList) { - bmFileInfo.setModelId(Long.valueOf(maLeaseDetails.getId())); - bmFileInfo.setFileType(1L); - List infoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); - if (CollectionUtils.isNotEmpty(infoList)) { - bmFileInfoMapper.deleteBmFileInfoByIds(infoList.stream().map(BmFileInfo::getId).toArray(Long[]::new)); - } - } - } //插入文件信息 insertFileInfo(maLeaseInfo, maLeaseInfo.getId()); if (CollectionUtils.isNotEmpty(maLeaseInfo.getDetailsList())) { @@ -172,7 +160,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { maLeaseDetails.setLeaseId(maLeaseInfo.getId()); result += leaseInfoMapper.insertDetails(maLeaseDetails); if (result > 0 && maLeaseDetails.getId() != null) { - insertFile(maLeaseDetails, maLeaseDetails.getId()); + insertFile(maLeaseDetails, maLeaseInfo.getId()); } } } @@ -186,56 +174,85 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { */ @Override public AjaxResult getById(MaLeaseInfo maLeaseInfo) { + // 1. 参数检查 if (maLeaseInfo.getId() == null) { return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg()); } + + // 2. 查询租赁信息 MaLeaseVo maLeaseVo = leaseInfoMapper.selectByName(maLeaseInfo); - //根据id查询详情信息 List leaseDetailsList = leaseInfoMapper.selectDetailsById(maLeaseInfo); - ArrayList list = new ArrayList<>(); - if (maLeaseVo != null) { - //查询文件信息 - BmFileInfo bmFileInfo = new BmFileInfo(); - bmFileInfo.setModelId(Long.valueOf(maLeaseVo.getId())); - bmFileInfo.setTaskType(MaterialConstants.LEASE_FILE_TYPE_CODE); - bmFileInfo.setFileType(0L); - List fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); + + // 3. 文件信息初始化 + // 查询文件信息：FileType = 0 + List fileList = getBmFileInfoList(maLeaseVo.getId(), 0L); + if (CollectionUtil.isNotEmpty(fileList)) { + maLeaseVo.setFileInfoList(fileList); + } + + // 4. 处理租赁详情信息 + if (CollectionUtil.isNotEmpty(leaseDetailsList)) { + // 处理每个租赁详情 + processLeaseDetails(leaseDetailsList, maLeaseVo.getId()); + } + + // 5. 更新浏览量（仅在待接单状态时） + updateHotSearchIfNeeded(maLeaseVo, maLeaseInfo.getId()); + + // 6. 返回结果 + maLeaseVo.setDetailsList(leaseDetailsList); + return AjaxResult.success(maLeaseVo); + } + + /** + * 查询文件信息 + * @param modelId + * @param fileType + * @return + */ + private List getBmFileInfoList(Integer modelId, Long fileType) { + BmFileInfo bmFileInfo = new BmFileInfo(); + bmFileInfo.setModelId(Long.valueOf(modelId)); + bmFileInfo.setTaskType(MaterialConstants.LEASE_FILE_TYPE_CODE); + bmFileInfo.setFileType(fileType); + return bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); + } + + /** + * 处理租赁详情 + * @param leaseDetailsList + * @param modelId + */ + private void processLeaseDetails(List leaseDetailsList, Integer modelId) { + List list = new ArrayList<>(); + for (MaLeaseDetails details : leaseDetailsList) { + if (StringUtils.isNotBlank(details.getIds())) { + String[] idsArray = StringUtils.split(details.getIds(), ","); + // 将所有 IDs 添加到 list 中 + list.addAll(Arrays.asList(idsArray)); + details.setTypeIds(list); + } + // 查询文件信息：FileType = 1 + List fileList = getBmFileInfoList(modelId, 1L); if (CollectionUtil.isNotEmpty(fileList)) { - maLeaseVo.setFileInfoList(fileList); - } - if (CollectionUtil.isNotEmpty(leaseDetailsList)) { - for (MaLeaseDetails details : leaseDetailsList) { - if (StringUtils.isNotBlank(details.getIds())) { - // 使用 StringUtils.split() 按逗号分割 ids 字符串 - String[] idsArray = StringUtils.split(details.getIds(), ","); - // 将分割后的元素添加到 list 中 - // 将分割出来的 id 添加到 list 中 - list.addAll(Arrays.asList(idsArray)); - details.setTypeIds(list); - } - //查询文件信息 - BmFileInfo bmFileInfo1 = new BmFileInfo(); - bmFileInfo1.setModelId(Long.valueOf(details.getId())); - bmFileInfo1.setTaskType(MaterialConstants.LEASE_FILE_TYPE_CODE); - bmFileInfo1.setFileType(1L); - List fileList1 = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo1); - if (CollectionUtil.isNotEmpty(fileList1)) { - details.setFileInfoList(fileList1); - } - } - } - maLeaseVo.setDetailsList(leaseDetailsList); - //更新搜索量 - try { - //只针对于待接单状态租赁需求更新浏览量 - if (maLeaseVo.getLeaseStatus() != null && maLeaseVo.getLeaseStatus().equals(LeaseInfoEnum.LEASE_PENDING_ORDER.getStatus())) { - updateHotSearch(maLeaseInfo.getId()); - } - } catch (Exception e) { - log.error("更新租赁需求浏览量失败,不影响主业务流程"); + details.setFileInfoList(fileList); } } - return AjaxResult.success(maLeaseVo); + } + + /** + * 更新浏览量（仅在待接单状态时） + * @param maLeaseVo + * @param leaseId + */ + private void updateHotSearchIfNeeded(MaLeaseVo maLeaseVo, Integer leaseId) { + try { + if (maLeaseVo.getLeaseStatus() != null && maLeaseVo.getLeaseStatus().equals(LeaseInfoEnum.LEASE_PENDING_ORDER.getStatus())) { + updateHotSearch(leaseId); + } + } catch (Exception e) { + log.error("更新租赁需求浏览量失败, 不影响主业务流程", e); + } } /** @@ -301,24 +318,12 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(maLeaseInfo.getId())); bmFileInfo.setTaskType(MaterialConstants.LEASE_FILE_TYPE_CODE); - bmFileInfo.setFileType(0L); List bmFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); if (result > 0 && CollectionUtils.isNotEmpty(bmFileInfoList)) { bmFileInfoMapper.deleteBmFileInfoByIds(bmFileInfoList.stream().map(BmFileInfo::getId).toArray(Long[]::new)); } //根据id查询删除详情信息 - List leaseDetailsList = leaseInfoMapper.selectDetailsById(maLeaseInfo); result += leaseInfoMapper.deleteDetailsById(maLeaseInfo); - if (CollectionUtils.isNotEmpty(leaseDetailsList)) { - for (MaLeaseDetails maLeaseDetails : leaseDetailsList) { - bmFileInfo.setModelId(Long.valueOf(maLeaseDetails.getId())); - bmFileInfo.setFileType(1L); - List infoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); - if (result > 0 && CollectionUtils.isNotEmpty(infoList)) { - bmFileInfoMapper.deleteBmFileInfoByIds(infoList.stream().map(BmFileInfo::getId).toArray(Long[]::new)); - } - } - } return result > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index 1ea4b27..30140a6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -110,4 +110,7 @@ public class OrderInfoDto { @ApiModelProperty(value = "true:出租方 false:承租方") private boolean flag; + @ApiModelProperty(value = "是否已填写退租检修内容（0 否，1 是）") + private Integer isLeaseContent; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 8a3d874..a6ccac6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.material.order.service.impl; import com.bonus.common.biz.enums.MaStatusEnum; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.device.domain.DevInfo; +import com.bonus.material.lease.mapper.LeaseRepairRecordMapper; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; import com.bonus.material.order.mapper.OrderMapper; @@ -25,6 +26,9 @@ public class OrderServiceImpl implements OrderService { @Resource private OrderMapper orderMapper; + @Resource + private LeaseRepairRecordMapper mapper; + @Override @Transactional public Integer submitOrderInfo(List orderInfoDtos) { @@ -101,6 +105,13 @@ public class OrderServiceImpl implements OrderService { } dto.setStartTime(list.get(0).getRentBeginTime()); dto.setEndTime(list.get(0).getRentEndTime()); + //根据订单id去lease_repair_record表中查询是否已填写退租检修信息 + int count = mapper.selectLeaseContent(String.valueOf(dto.getOrderId())); + if (count > 0) { + dto.setIsLeaseContent(1); + } else { + dto.setIsLeaseContent(0); + } } return orderInfoDtos; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 082dc59..01a4410 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -70,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.person_phone as personPhone, d.create_time as createTime, d.update_time as updateTime, - c.company_name as companyName, + d.own_co as companyId, + sd.dept_name as companyName, c.operate_address as operateAddress, mt3.type_id as thirdId, mt3.type_name as thirdName, @@ -80,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_name as firstName FROM ma_dev_info d - LEFT JOIN bm_company_info c ON d.own_co = c.company_id + LEFT JOIN sys_dept sd ON d.own_co = sd.dept_id + LEFT JOIN bm_company_info c ON sd.dept_id = c.company_id LEFT JOIN ma_type mt4 ON mt4.type_id = d.type_id and mt4.del_flag = '0' LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0' LEFT JOIN ma_type mt2 ON mt2.type_id = mt3.parent_id and mt2.del_flag = '0' @@ -182,8 +184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, - c.company_name as companyName, - c.company_id as companyId, + d.own_co as companyId, + sd.dept_name as companyName, c.operate_address as operateAddress, d.create_time as createTime, mt3.type_id as thirdId, @@ -194,7 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_name as firstName FROM ma_dev_info d - LEFT JOIN bm_company_info c ON d.own_co = c.company_id + LEFT JOIN sys_dept sd ON d.own_co = sd.dept_id + LEFT JOIN bm_company_info c ON sd.dept_id = c.company_id LEFT JOIN ma_type mt4 ON mt4.type_id = d.type_id and mt4.del_flag = '0' LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0' LEFT JOIN ma_type mt2 ON mt2.type_id = mt3.parent_id and mt2.del_flag = '0' @@ -228,8 +231,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, - c.company_id as companyId, - c.company_name as companyName, + d.own_co as companyId, + sd.dept_name as companyName, + c.operate_address as operateAddress, mt3.type_id as thirdId, mt3.type_name as thirdName, mt2.type_id as secondId, @@ -242,7 +246,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.update_time as updateTime FROM ma_dev_info d - LEFT JOIN bm_company_info c ON d.own_co = c.company_id + LEFT JOIN sys_dept sd ON d.own_co = sd.dept_id + LEFT JOIN bm_company_info c ON sd.dept_id = c.company_id LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id LEFT JOIN ma_type mt4 ON mt4.type_id = d.type_id and mt4.del_flag = '0' LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0' diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml index 8a1cc28..bf76f55 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml @@ -11,11 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ma_id, type_id, repair_num, - repair_price, - repair_change_price, + repair_price, + repair_change_price, scrap_num, - scrap_price, - scrap_change_price, + scrap_price, + scrap_change_price, scrap_reason, loss_num, loss_price, @@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{maId}, #{typeId}, #{repairNum}, - #{repairPrice}, - #{repairChangePrice}, + #{repairPrice}, + #{repairChangePrice}, #{scrapNum}, - #{scrapPrice}, - #{scrapChangePrice}, + #{scrapPrice}, + #{scrapChangePrice}, #{scrapReason}, #{lossNum}, #{lossPrice}, @@ -446,7 +446,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM lease_repair_record WHERE - code = #{orderCode} + order_id = #{orderId}