diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java index 999fb461..009b8c35 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; import java.util.Date; @@ -62,7 +63,7 @@ public class LeaseOutDetails extends BaseEntity { private Integer outType; /** 预领料数 */ - @Excel(name = "预领料数") + @Excel(name = "预领料数", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "预领料数") private BigDecimal outNum; diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java index bd354267..26c48bfc 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java @@ -191,4 +191,6 @@ public class RepairInputDetails extends BaseEntity { @ApiModelProperty(value = "一级类型id") private String firstId; + private String backCode; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java index 92ccc181..d45a1a2f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.lease.mapper; +import java.math.BigDecimal; import java.util.List; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; @@ -175,14 +176,14 @@ public interface LeaseApplyDetailsMapper { * @param record * @return */ - int updateLeaseApplyPublishDetailsOutNum(@Param("record") LeaseOutDetails record); + int updateLeaseApplyPublishDetailsOutNum(LeaseApplyDetails record); /** * 获取领用任务详细 * @param record * @return */ - LeaseApplyDetails getLeasePublishApplyDetails(@Param("record") LeaseOutDetails record); + List getLeasePublishApplyDetails(@Param("record") LeaseOutDetails record); /** * 查询数量设备待出库详情 @@ -197,4 +198,25 @@ public interface LeaseApplyDetailsMapper { * @return */ LeaseApplyDetails getPendingCodeLeaseApplyDetails(LeaseOutDetails leaseOutDetails); + + /** + * 查询待出库详情 + * @param detail + * @return + */ + BigDecimal getOutNum(LeaseApplyDetails detail); + + /** + * 获取领用任务 + * @param record + * @return + */ + LeaseApplyDetails getLeasePublishApply(LeaseOutDetails record); + + /** + * 修改领用任务详细 + * @param bean + * @return + */ + int updateLeaseApplyPublishDetails(LeaseApplyDetails bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 57abb0fe..f2c0df85 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -192,10 +192,10 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { // 步骤8: 获取领料单详情 long step8Start = System.currentTimeMillis(); List details; - if (leaseApplyInfo.getUserId() != null) { - details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId, null)); - } else { + if (!CollectionUtils.isEmpty(typeIdList)) { details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, null, typeIdList)); + } else { + details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId, null)); } stepTimes.put("获取领料单详情", System.currentTimeMillis() - step8Start); @@ -207,6 +207,10 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { details = leaseApplyDetailsMapper.getDetailsPublish(leaseApplyInfo); if (!CollectionUtils.isEmpty(details)) { for (LeaseApplyDetails detail : details) { + // 根据parent_id和type_id查询出库数量 + BigDecimal outNum = leaseApplyDetailsMapper.getOutNum(detail); + detail.setAlNum(outNum); + detail.setOutNum(detail.getPreNum().subtract(outNum)); if (detail.getPreNum().compareTo(detail.getAlNum()) == 0) { detail.setStatus("2"); } else { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index 3a5970c9..8c4b0085 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -16,6 +16,7 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.back.mapper.BackApplyInfoMapper; import com.bonus.material.basic.domain.BmAgreementInfo; import com.bonus.material.basic.domain.BmQrBoxInfo; import com.bonus.material.basic.domain.BmUnit; @@ -101,6 +102,9 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { @Resource private MaterialLeaseInfoMapper materialLeaseInfoMapper; + + @Resource + private BackApplyInfoMapper backApplyInfoMapper; /** * 查询领料出库详细 * @@ -190,9 +194,9 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { int res; try { // 1、判断库存是否足够 - boolean isEnough = checkStorageIsEnough(record); + //boolean isEnough = checkStorageIsEnough(record); record.setPreStoreNum(getStorageNum(record)); - if (isEnough) { + /*if (isEnough) {*/ if ((record.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) && record.getInputNum() != null) { record.setOutNum(record.getInputNum()); record.setOutType(InputOutEnum.NUMBER_DEVICE.getTypeId()); @@ -395,9 +399,9 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { } else { return AjaxResult.error("领料出库失败,机具库存不足"); } - } else { + /*} else { return AjaxResult.error("已领数量大于预领数量或该机具未在库"); - } + }*/ } catch (Exception e) { log.error(e.getMessage()); return AjaxResult.error("出库失败" + e.getMessage()); @@ -765,8 +769,28 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { // 首先更新领料任务详情表的领料数及状态（lease_apply_details） if (StringUtils.isNotBlank(record.getPublishTask())) { // 领用 - res = leaseApplyDetailsMapper.updateLeaseApplyPublishDetailsOutNum(record); - leaseApplyDetails = leaseApplyDetailsMapper.getLeasePublishApplyDetails(record); + List allList = leaseApplyDetailsMapper.getLeasePublishApplyDetails(record); + // 出库数量 + BigDecimal outNum = record.getOutNum(); + if (!CollectionUtils.isEmpty(allList)) { + for (LeaseApplyDetails bean : allList) { + bean.setAlNum(outNum); + // 剩余出库数量 + BigDecimal num = bean.getOutNum(); + if (outNum.compareTo(num) == 0) { + res = leaseApplyDetailsMapper.updateLeaseApplyPublishDetailsOutNum(bean); + break; + } else if (outNum.compareTo(num) > 0) { + outNum = outNum.subtract(num); + bean.setAlNum(bean.getOutNum()); + leaseApplyDetailsMapper.updateLeaseApplyPublishDetailsOutNum(bean); + } else { + res = leaseApplyDetailsMapper.updateLeaseApplyPublishDetails(bean); + break; + } + } + } + leaseApplyDetails = leaseApplyDetailsMapper.getLeasePublishApply(record); } else { // 领料办理 res = leaseApplyDetailsMapper.updateLeaseApplyDetailsOutNum(record); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java index e12d83dd..655f28a1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java @@ -246,4 +246,7 @@ public class Type extends BaseEntity { @ApiModelProperty(value = "是否检验（0不检验，1检验）") private String isCheck; + @ApiModelProperty("机具类型（1机具，2安全工器具）") + private int jiJuType; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/TypeNumHis.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/TypeNumHis.java index 4f7b5eda..ca3eee7e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/TypeNumHis.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/TypeNumHis.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.apache.poi.ss.usermodel.HorizontalAlignment; /** * 机具类型历史库存对象 ma_type_num_his @@ -26,7 +27,7 @@ public class TypeNumHis extends BaseEntity private Long typeId; /** 历史库存 */ - @Excel(name = "历史库存") + @Excel(name = "历史库存", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "历史库存") private Long storageNum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java index 09472424..12f9f25b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -69,7 +70,7 @@ public class StandardConfigDetailsVo { private String unitName; @ApiModelProperty(value = "数量") - @Excel(name = "数量") + @Excel(name = "数量", align = HorizontalAlignment.RIGHT) private BigDecimal num; @ApiModelProperty(value = "预领数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java index 5b6e5dec..0e734cdc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.apache.poi.ss.usermodel.HorizontalAlignment; /** * 推送接收明细对象 push_data_receive_detail @@ -47,7 +48,7 @@ public class PushDataReceiveDetail extends BaseEntity { private Date rentTime; /** 租赁价格 */ - @Excel(name = "租赁价格") + @Excel(name = "租赁价格", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "租赁价格") private BigDecimal rentPrice; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveInfo.java index f45bce7e..1ec7a494 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveInfo.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.apache.poi.ss.usermodel.HorizontalAlignment; /** * 推送接收对象 push_data_receive_info @@ -30,7 +31,7 @@ public class PushDataReceiveInfo extends BaseEntity { private Long receiveStatus; /** 推送数量 */ - @Excel(name = "推送数量") + @Excel(name = "推送数量", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "推送数量") private Long pushNum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java index 0bf378a1..010bb535 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java @@ -71,10 +71,10 @@ public interface RepairInputDetailsMapper { /** * 根据任务id查询状态 - * @param taskId + * @param repairInputDetails * @return */ - List selectStatusByTaskId(Long taskId); + List selectStatusByTaskId(RepairInputDetails repairInputDetails); /** * 修改库存数量 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java index fea2cc13..a5a1feb3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java @@ -153,6 +153,24 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService }) .collect(Collectors.toList()); } + for (RepairInputDetails inputDetails : list) { + // 根据taskId和userId查询详情，赋值最外层任务状态 + inputDetails.setUserId(SecurityUtils.getLoginUser().getUserid()); + List taskStatusList = repairInputDetailsMapper.selectStatusByTaskId(inputDetails); + List statusList = taskStatusList.stream().map(Integer::parseInt).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(statusList)) { + if (!statusList.contains(RepairInputStatusEnum.INPUT_TASK_NO_FINISHED.getStatus()) && + statusList.contains(RepairInputStatusEnum.INPUT_TASK_TO_REJECT.getStatus())) { + inputDetails.setTaskStatus(RepairInputStatusEnum.INPUT_TASK_TO_REJECT.getStatus()); + inputDetails.setStatusName(RepairInputStatusEnum.INPUT_TASK_TO_REJECT.getStatusName()); + } else if (!statusList.contains(RepairInputStatusEnum.INPUT_TASK_NO_FINISHED.getStatus()) && + !statusList.contains(RepairInputStatusEnum.INPUT_TASK_TO_REJECT.getStatus()) && + statusList.stream().allMatch(status -> status.equals(RepairInputStatusEnum.INPUT_TASK_IN_FINISHED.getStatus()))) { + inputDetails.setTaskStatus(RepairInputStatusEnum.INPUT_TASK_IN_FINISHED.getStatus()); + inputDetails.setStatusName(RepairInputStatusEnum.INPUT_TASK_IN_FINISHED.getStatusName()); + } + } + } } // if (CollectionUtils.isNotEmpty(list)) { // for (RepairInputDetails inputDetails : list) { @@ -181,11 +199,26 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService // } String keyWord = repairInputDetails.getKeyWord(); // 如果关键字不为空，进行过滤 - if (!StringUtils.isBlank(keyWord)) { - list = list.stream() - .filter(item -> containsKeyword(item, keyWord)) - .collect(Collectors.toList()); - } + if (!StringUtils.isBlank(keyWord)) { + list = list.stream() + .filter(item -> containsKeyword(item, keyWord)) + .collect(Collectors.toList()); + } + if (repairInputDetails.getTaskStatus() != null) { + list = list.stream() + .filter(item -> item.getTaskStatus().equals(repairInputDetails.getTaskStatus())) + .collect(Collectors.toList()); + } + if (repairInputDetails.getAppTaskStatus() != null && repairInputDetails.getAppTaskStatus() == 0) { + list = list.stream() + .filter(item -> item.getTaskStatus().equals(repairInputDetails.getAppTaskStatus())) + .collect(Collectors.toList()); + } + if (repairInputDetails.getAppTaskStatus() != null && repairInputDetails.getAppTaskStatus() == 1) { + list = list.stream() + .filter(item -> item.getTaskStatus() == 1 || item.getTaskStatus() == 2) + .collect(Collectors.toList()); + } return list; } @@ -691,7 +724,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService * @param repairInputDetails */ private void updateTaskStatus(RepairInputDetails repairInputDetails) { - List list = repairInputDetailsMapper.selectStatusByTaskId(repairInputDetails.getTaskId()); + List list = repairInputDetailsMapper.selectStatusByTaskId(repairInputDetails); List statusList = list.stream().map(Integer::parseInt).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(statusList)) { if (!statusList.contains(RepairInputStatusEnum.INPUT_TASK_NO_FINISHED.getStatus()) && diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java index a9413365..360ef5e5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java @@ -4,9 +4,9 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; -import java.util.List; /** * 报废台账返回实体类 @@ -32,12 +32,12 @@ public class ScrapDetailsListVo { private String unitName; /** 报废数量 */ - @Excel(name = "报废数量") + @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "报废数量") private BigDecimal scrapNum; @ApiModelProperty(value = "费用合计") - @Excel(name = "报废费用(万元)") + @Excel(name = "报废费用(万元)", align = HorizontalAlignment.RIGHT) private BigDecimal totalCost; @ApiModelProperty(value = "购置价") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java index 37bf1fe3..1e7c02cd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.apache.poi.ss.usermodel.HorizontalAlignment; /** * 结算协议申请对象 slt_agreement_apply @@ -68,7 +69,7 @@ public class SltAgreementApply extends BaseEntity { private Long companyId; /** 结算总费用 */ - @Excel(name = "结算总费用") + @Excel(name = "结算总费用", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "结算总费用") private BigDecimal cost; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementDetails.java index ed09beb3..67be61da 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementDetails.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.apache.poi.ss.usermodel.HorizontalAlignment; /** * 结算协议详情对象 slt_agreement_details @@ -46,7 +47,7 @@ public class SltAgreementDetails extends BaseEntity { private String sltType; /** 数量 */ - @Excel(name = "数量") + @Excel(name = "数量", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "数量") private Long num; @@ -63,12 +64,12 @@ public class SltAgreementDetails extends BaseEntity { private Date endTime; /** 单价 */ - @Excel(name = "单价") + @Excel(name = "单价", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "单价") private BigDecimal price; /** 金额 */ - @Excel(name = "金额") + @Excel(name = "金额", align = HorizontalAlignment.RIGHT) @ApiModelProperty(value = "金额") private BigDecimal money; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java index 05729936..cf5d27dd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java @@ -41,6 +41,36 @@ public class UseMaintenanceWarningController extends BaseController return getDataTable(list); } + /** + * 查询检修过期列表 + * @param bean + * @return + */ + @ApiOperation(value = "查询检修过期列表") + @GetMapping("/getOverTimeList") + public TableDataInfo getOverTimeList(UseMaintenanceWarningBean bean) + { + startPage(); + List list = service.getOverTimeListList(bean); + return getDataTable(list); + } + + /** + * 导出检修过期列表 + * @param response + * @param bean + */ + @ApiOperation(value = "导出检修过期列表") + @PreventRepeatSubmit + @SysLog(title = "检修预警", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出检修过期列表") + @PostMapping("/exportOverTimeList") + public void exportOverTimeList(HttpServletResponse response, UseMaintenanceWarningBean bean) + { + List list = service.getOverTimeListList(bean); + ExcelUtil util = new ExcelUtil(UseMaintenanceWarningBean.class); + util.exportExcel(response, list, "检修过期数据"); + } + /** * 导出 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java index e5fc926a..ca8d6869 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java @@ -31,4 +31,11 @@ public interface UseMaintenanceWarningMapper List getWarningLastDayList(UseMaintenanceWarningBean useMaintenanceWarningBean); List getUserManger(UseMaintenanceWarningBean bean); + + /** + * 查询检修过期列表 + * @param bean + * @return + */ + List getOverTimeListList(UseMaintenanceWarningBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java index ef5a549f..b5eaf274 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java @@ -19,4 +19,10 @@ public interface UseMaintenanceWarningService */ public List getList(UseMaintenanceWarningBean bean); + /** + * 查询检修过期列表 + * @param bean + * @return + */ + List getOverTimeListList(UseMaintenanceWarningBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java index c5f31e46..2426339d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java @@ -37,4 +37,19 @@ public class UseMaintenanceWarningServiceImpl implements UseMaintenanceWarningSe } } + /** + * 查询检修过期列表 + * @param bean + * @return + */ + @Override + public List getOverTimeListList(UseMaintenanceWarningBean bean) { + try { + return mapper.getOverTimeListList(bean); + } catch (Exception e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } + } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index e4f966b2..9836bf3c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -289,14 +289,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE lease_apply_details SET - al_num = IF(al_num IS NULL, #{record.outNum}, al_num + #{record.outNum}), - - update_by = #{record.updateBy}, - + al_num = IF(al_num IS NULL, #{alNum}, al_num + #{alNum}), update_time = now(), - status = '1' + status = '2' WHERE - parent_id = #{record.parentId} and new_type = #{record.typeId} + id = #{id} + + + + UPDATE + lease_apply_details + SET + al_num = IF(al_num IS NULL, #{alNum}, al_num + #{alNum}), + update_time = now(), + status = '1' + WHERE + id = #{id} SELECT - a.id AS id, lpd.parent_id AS parentId, mt1.type_name AS maTypeName, mt.type_name AS typeName, mt.unit_name AS unitName, lpd.new_type AS newTypeId, COALESCE(lpd.new_type, lpd.type_id) AS typeId, - IFNULL( lpd.num, 0 ) AS preNum, - IFNULL( lpd.num, 0 ) - IFNULL( SUM( lod.out_num ), 0 ) AS outNum, - IFNULL( SUM( lod.out_num ), 0 ) AS alNum, + IFNULL( sum(lpd.num), 0 ) AS preNum, lpd.publish_task AS publishTask, mt.manage_type AS manageType, CASE mt.manage_type @@ -563,10 +568,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE mm.ma_code is not null and mm.ma_status in (1) GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id - LEFT JOIN lease_out_details lod ON lpd.new_type = lod.type_id - AND lpd.publish_task = lod.publish_task - LEFT JOIN (SELECT id, parent_id, type_id from lease_apply_details GROUP BY parent_id, type_id) a - on lpd.parent_id = a.parent_id and a.type_id = lpd.type_id JOIN ma_type_keeper mtk ON mtk.type_id = lpd.new_type AND mtk.user_id = #{userId} @@ -664,9 +665,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 6baba685..45001179 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -319,7 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT lai.id AS id, lpd.code AS code, - lai.code AS businessCode, + tt.code AS businessCode, lai.create_by AS createBy, lai.create_time AS createTime, sd.dept_name AS impUnitName, @@ -654,7 +654,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT GROUP_CONCAT( DISTINCT lod.id ) AS ids, lai.id AS id, - lai.CODE AS CODE, + tt.CODE AS CODE, lai.create_by AS createBy, lai.create_time AS createTime, lai.lease_person AS leasePerson, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index cab4424f..6ab58175 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -818,8 +818,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +