diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java index 9f547115..940fdb14 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java @@ -212,8 +212,13 @@ public class PushProDataUseInfoController extends BaseController { @GetMapping(value = "getCompletionNotRefundedDetails") public TableDataInfo getCompletionNotRefundedDetails(ProIdsBean bean) { try { + List results = new ArrayList<>(); startPage(); - List results = service.getCompletionNotRefundedDetails(bean); + if (bean.getDeptId() != null) { + results = service.getCompletionNotRefundedDetails(bean); + } else { + results = service.getCompletionNotRefundedDetailsSub(bean); + } return getDataTable(results); } catch (Exception e) { logger.error(e.toString(), e); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java index ed67a545..a3b1d957 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java @@ -55,4 +55,6 @@ public interface ProDataUseInfoMapper { SysUser getPersonNameAndPhone(MachineInfoBean machineDetail); List getCompletionNotRefundedSub(ProIdsBean bean); + + List getCompletionNotRefundedDetailsSub(ProIdsBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java index a9dbbdb2..09f92b1f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java @@ -46,4 +46,6 @@ public interface ProDataUseInfoService { List getAllMacheDetails(ProIdsBean bean); List getCompletionNotRefundedSub(ProIdsBean bean); + + List getCompletionNotRefundedDetailsSub(ProIdsBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java index 5fd851e4..8eadba95 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java @@ -213,4 +213,9 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService { public List getCompletionNotRefundedSub(ProIdsBean bean) { return proDataUseInfoMapper.getCompletionNotRefundedSub(bean); } + + @Override + public List getCompletionNotRefundedDetailsSub(ProIdsBean bean) { + return proDataUseInfoMapper.getCompletionNotRefundedDetailsSub(bean); + } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml index d7390a0c..845c4838 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml @@ -283,7 +283,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +