diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index cd99c4d2..f6a4d829 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -60,7 +60,7 @@ public class TmTaskController extends BaseController { @Autowired private LeaseUserBookService leaseUserBookService; - + private final static String STRING_ADMIN = "admin"; @@ -70,24 +70,47 @@ public class TmTaskController extends BaseController { * @param task 审核信息 * @return 结果 */ - @Log(title = "领料审核通过", businessType = BusinessType.UPDATE) + @Log(title = "宁夏领料审核通过", businessType = BusinessType.UPDATE) @PostMapping("auditLeaseByCompany") public AjaxResult auditLeaseByCompany(@RequestBody TmTask task) { return toAjax(tmTaskService.updateLeaseTaskAuditInfo(task)); } + /** + * 领料审核通过，分公司，分管，机具分公司统一接口 + * + * @param task 审核信息 + * @return 结果 + */ + @Log(title = "重庆领料审核通过", businessType = BusinessType.UPDATE) + @PostMapping("auditLeaseByCompanyCq") + public AjaxResult auditLeaseByCompanyCq(@RequestBody TmTask task) { + return toAjax(tmTaskService.updateLeaseTaskAuditInfoCq(task)); + } + /** * 领料审核驳回，分公司，分管，机具分公司统一接口 * * @param task * @return */ - @Log(title = "领料审核驳回", businessType = BusinessType.UPDATE) + @Log(title = "宁夏领料审核驳回", businessType = BusinessType.UPDATE) @PostMapping("rejectLeaseByCompany") public AjaxResult rejectLeaseByCompany(@RequestBody TmTask task) { return toAjax(tmTaskService.updateLeaseTaskRejectInfo(task)); } + /** + * 领料审核驳回，分公司，分管，机具分公司统一接口 + * + * @param task + * @return + */ + @Log(title = "重庆领料审核驳回", businessType = BusinessType.UPDATE) + @PostMapping("rejectLeaseByCompanyCq") + public AjaxResult rejectLeaseByCompanyCq(@RequestBody TmTask task) { + return toAjax(tmTaskService.updateLeaseTaskRejectInfoCq(task)); + } /** * 根据任务id删除任务表及任务信息 @@ -162,6 +185,7 @@ public class TmTaskController extends BaseController { leaseApplyInfo.setTaskId(Integer.valueOf(taskId)); // 设置任务ID leaseApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 设置设备所属分公司,用于交给哪家审核 leaseApplyInfo.setType("2"); // 设置审批层级，先固定2层，后期根据接口传入Type区分来源设定 + leaseApplyInfo.setLeaseType(task.getLeaseType()); // 创建领料任务，返回领料任务编号 boolean addLeaseTaskResult = leaseApplyInfoService.genderLeaseCode(leaseApplyInfo) > 0; @@ -319,7 +343,7 @@ public class TmTaskController extends BaseController { * @param souceBy app为1 web为0 * @return 列表 */ - @Log(title = "查询机具领料管理列表", businessType = BusinessType.QUERY) + @Log(title = "宁夏查询机具领料管理列表", businessType = BusinessType.QUERY) @GetMapping(value = "getLeaseManageListAll") public AjaxResult getLeaseManageListAll(TmTask task, Integer souceBy) { if (StringUtils.isNull(task)) { @@ -337,6 +361,32 @@ public class TmTaskController extends BaseController { return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, leaseAuditList)); } + /** + * 查询机具领料管理列表 + * + * @param task 筛选条件 + * @param souceBy app为1 web为0 + * @return 列表 + */ + @Log(title = "重庆查询机具领料管理列表", businessType = BusinessType.QUERY) + @GetMapping(value = "getLeaseManageListAllCq") + public AjaxResult getLeaseManageListAllCq(TmTask task, Integer souceBy) { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误"); + } + List leaseAuditList; + if (souceBy != null && souceBy == 1) { + leaseAuditList = tmTaskService.getLeaseAuditManageListCq(task); + return AjaxResult.success(leaseAuditList); + } +// startPage(); + leaseAuditList = tmTaskService.getLeaseAuditManageListCq(task); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, leaseAuditList)); + } + + /** * 领料申请导出 * 注意：备注字段到时要换 @@ -378,53 +428,13 @@ public class TmTaskController extends BaseController { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); } - if (StringUtils.isNotBlank(role)) { - if (role.contains(STRING_ADMIN)) { - //如果是管理员可以看到所有的审核列表 - List leaseAuditList = tmTaskService.getLeaseAuditListByAdmin(task); - return AjaxResult.success(getDataTable(leaseAuditList)); - } - String[] split = role.split(","); - for (String s : split) { - if ("kg".equals(s)) { - //如果是库管员只能看到自己的审核列表 - List leaseAuditList = tmTaskService.getLeaseAuditListForApp(task); - List list = new ArrayList<>(); - for (int i = 0; i < leaseAuditList.size(); i++) { - List leaseApplyInfoList = leaseAuditList.get(i).getLeaseApplyInfoList(); - if (leaseApplyInfoList != null) { - for (int j = 0; j < leaseApplyInfoList.size(); j++) { - List leaseApplyDetails = leaseApplyInfoList.get(j).getLeaseApplyDetails(); - if (leaseApplyDetails != null) { - for (int k = 0; k < leaseApplyDetails.size(); k++) { - if (leaseApplyDetails.get(k).getUserId() == null || leaseApplyDetails.get(k).getUserId() == 0) { - leaseApplyDetails.get(k).setCount(0); - } else { - leaseApplyDetails.get(k).setCount(1); - } - } - } - } - List leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(0).getLeaseApplyDetails(); - if (leaseApplyDetails != null) { - List list1 = new ArrayList<>(); - for (int l = 0; l < leaseApplyDetails.size(); l++) { - if (leaseApplyDetails.get(l).getCount() == 1) { - list1.add(leaseApplyDetails.get(l)); - TmTask tmTask = leaseAuditList.get(i); - tmTask.getLeaseApplyInfoList().get(0).setLeaseApplyDetails(list1); - list.add(tmTask); - } - } - } - } - } - return AjaxResult.success(getDataTable(list)); - } - } + if (SecurityUtils.getLoginUser() != null) { + Long userid = SecurityUtils.getLoginUser().getUserid(); + task.setUserId(String.valueOf(userid)); } - List leaseAuditList = new ArrayList<>(); + + List leaseAuditList = tmTaskService.getLeaseOutListByUser(task); return AjaxResult.success(getDataTable(leaseAuditList)); } @@ -442,6 +452,10 @@ public class TmTaskController extends BaseController { return AjaxResult.error("参数错误"); } startPage(); + if (SecurityUtils.getLoginUser() != null) { + Long userid = SecurityUtils.getLoginUser().getUserid(); + task.setUserId(String.valueOf(userid)); + } List leaseAuditList = tmTaskService.getLeaseAuditListByOne(task); return AjaxResult.success(getDataTable(leaseAuditList)); } @@ -472,7 +486,7 @@ public class TmTaskController extends BaseController { } - @Log(title = "获取领料管理-详情列表", businessType = BusinessType.QUERY) + @Log(title = "宁夏获取领料管理-详情列表", businessType = BusinessType.QUERY) @GetMapping("/getLeaseListAll") public TableDataInfo getLeaseListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { TmTask task = new TmTask(); @@ -481,7 +495,16 @@ public class TmTaskController extends BaseController { return getDataTable(leaseAuditList); } - @Log(title = "获取领料申请-查看列表", businessType = BusinessType.QUERY) + @Log(title = "重庆获取领料管理-详情列表", businessType = BusinessType.QUERY) + @GetMapping("/getLeaseListAllCq") + public TableDataInfo getLeaseListAllCq(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { + TmTask task = new TmTask(); + task.setTaskId(Long.parseLong(taskId)); + List leaseAuditList = tmTaskService.getLeaseListAllCq(task); + return getDataTable(leaseAuditList); + } + + @Log(title = "获取领料申请-查看/编辑列表", businessType = BusinessType.QUERY) @GetMapping("/getLeaseApplyListAll") public TableDataInfo getLeaseApplyListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { TmTask task = new TmTask(); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index a3a7ac5d..ee94757e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -159,5 +159,7 @@ public class LeaseApplyInfo implements Serializable { @ApiModelProperty(value="审核状态") private String status; + @ApiModelProperty(value="领用类型：0 短期租赁 1长期领用") + private String leaseType; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index eaf3d5c8..c63c9db1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -31,6 +31,8 @@ public class TmTask implements Serializable { */ @ApiModelProperty(value="任务ID") private Long taskId; + private Long parentId; + private Integer outNum; /** * 任务类型(定义数据字典) @@ -51,6 +53,11 @@ public class TmTask implements Serializable { */ @ApiModelProperty(value="预领料合计数") private int preCountNum; + /** + * 预领料合计数 + */ + @ApiModelProperty(value="已出库数量") + private int alNum; /** * 编号 @@ -229,4 +236,16 @@ public class TmTask implements Serializable { @ApiModelProperty(value="分管审批备注") private String deptAuditRemark; + @ApiModelProperty(value="领用类型：0 短期租赁 1长期领用") + private String leaseType; + private String userId; + private String typeName; + private String typeModelName; + + private String manageType; + private String typeId; + + + + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 561c402c..e1adac82 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -108,4 +108,10 @@ public interface TmTaskMapper { LeaseApplyInfo getListSomeol(LeaseApplyInfo info); Integer getKgByMaType(Integer typeId); + + List getLeaseApplyDetailsCq(@Param("record") LeaseApplyInfo leaseApplyInfo); + + List getLeaseOutListByUser(TmTask task); + + List getLeaseDetailByParentId(TmTask record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index c3338645..d4cbf2cd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -28,8 +28,10 @@ public interface TmTaskService{ /** 领料任务审核通过状态修改 */ int updateLeaseTaskAuditInfo(TmTask record); + int updateLeaseTaskAuditInfoCq(TmTask record); /** 领料任务审核驳回状态修改 */ int updateLeaseTaskRejectInfo(TmTask record); + int updateLeaseTaskRejectInfoCq(TmTask record); String genderLeaseCode(); @@ -81,4 +83,10 @@ public interface TmTaskService{ LeaseApplyInfo getListSomeol(LeaseApplyInfo info); List getLeaseAuditListByPeople(TmTask task); + + List getLeaseAuditManageListCq(TmTask task); + + List getLeaseListAllCq(TmTask task); + + List getLeaseOutListByUser(TmTask task); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 665212f0..67b2e8bf 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -170,43 +170,43 @@ public class TmTaskServiceImpl implements TmTaskService { } + @Override + public int updateLeaseTaskAuditInfoCq(TmTask record) { + int result = 0; + if (StringUtils.isNotNull(record)) { + // 内部审核 + // 管理员登录时审核 + result += tmTaskMapper.updateTmTaskAuditStatus(record); + // 分公司审核 + // 再审核领料任务信息表 + List leaseApplyInfoList = record.getLeaseApplyInfoList(); + if (CollUtil.isNotEmpty(leaseApplyInfoList)) { + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + if (leaseApplyInfo != null) { + //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); + result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + } + } + } + // 再审核领料任务详情表 + List leaseApplyDetails = record.getLeaseApplyDetails(); + if (CollUtil.isNotEmpty(leaseApplyDetails)) { + for (LeaseApplyDetails details : leaseApplyDetails) { + if (StringUtils.isNotNull(details)) { + result += tmTaskMapper.updateLeaseApplyDetailsAuditInfo(details); + } + } + } + } + return result; + } + /** * 获取领料申请列表 */ @Override public List getLeaseAuditListByOne(TmTask record) { - List tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); - for (TmTask tmTask : tmTaskList) { - int count = 0; - if (tmTask != null) { - // 去查询任务分单表 - List auditListByLeaseInfo = tmTaskMapper.getAuditListByLeaseInfo(tmTask); - if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { - // 对领料任务集合查询具体详情 - for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { - if (leaseApplyInfo != null) { - // 去查询领料任务详情表 - List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); - if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { - for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { - if (leaseApplyDetail != null) { - // 统计预领数量 - count += leaseApplyDetail.getPreNum(); - } - } - // 塞入领料任务详情的集合中 - leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); - } - } - } - // 存入领料任务实体集合 - tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); - } - // 塞入预领的合计数量 - tmTask.setPreCountNum(count); - } - } - + List tmTaskList = tmTaskMapper.getLeaseDetailByParentId(record); return tmTaskList; } @@ -292,6 +292,70 @@ public class TmTaskServiceImpl implements TmTaskService { return tmTaskList; } + @Override + public List getLeaseAuditManageListCq(TmTask record) { + List tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + for (TmTask tmTask : tmTaskList) { + int count = 0; + if (tmTask != null) { + // 去查询任务分单表 + List collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); + // 对领料任务集合查询具体详情 + for (LeaseApplyInfo leaseApplyInfo : collect) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo); + if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail != null && leaseApplyDetail.getPreNum() != null) { + // 统计预领数量 + count += leaseApplyDetail.getPreNum(); + } + } + // 塞入领料任务详情的集合中 + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); + } + } + } + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(collect); + tmTask.setPreCountNum(count); + } + } + List tmTasks = tmTaskList.stream().filter(t -> t.getLeaseApplyInfoList() != null).collect(Collectors.toList()); + return tmTasks; + } + + @Override + public List getLeaseListAllCq(TmTask task) { + List tmTaskList = new ArrayList<>(); + TmTask tmTask = tmTaskMapper.getLeaseListTmTask(task); + if (tmTask != null) { + List leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task); + tmTask.setLeaseApplyInfoList(leaseApplyInfoList); + + List listLeaseDetails = new ArrayList<>(); + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetailsCq(leaseApplyInfo); + if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + listLeaseDetails.addAll(leaseApplyDetails); + } + } + } + // 塞入领料任务详情的集合中 + tmTask.setLeaseApplyDetails(listLeaseDetails); + } + tmTaskList.add(tmTask); + return tmTaskList; + } + + @Override + public List getLeaseOutListByUser(TmTask task) { + return tmTaskMapper.getLeaseOutListByUser(task); + } + /** * 获取领料申请列表 @@ -595,7 +659,40 @@ public class TmTaskServiceImpl implements TmTaskService { } } } else { - return 0; + return result; + } + return result; + } + + @Override + public int updateLeaseTaskRejectInfoCq(TmTask record) { + int result = 0; + if (StringUtils.isNotNull(record)) { + // 先审核任务表 + result += tmTaskMapper.updateTmTaskAuditStatus(record); + // 分公司驳回 + // 再审核领料任务信息表 + List leaseApplyInfoList = record.getLeaseApplyInfoList(); + if (CollUtil.isNotEmpty(leaseApplyInfoList)) { + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + if (leaseApplyInfo != null) { + //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); + result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); + } + } + } + // 再审核领料任务详情表 + List leaseApplyDetails = record.getLeaseApplyDetails(); + if (CollUtil.isNotEmpty(leaseApplyDetails)) { + for (LeaseApplyDetails details : leaseApplyDetails) { + if (StringUtils.isNotNull(details)) { + result += tmTaskMapper.updateLeaseApplyDetailsRejectInfo(details); + } + } + } + + } else { + return result; } return result; } @@ -899,7 +996,7 @@ public class TmTaskServiceImpl implements TmTaskService { List leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task); if (task.getFlag() == 0) { for (LeaseApplyInfo applyInfo : leaseApplyInfoList) { - if ("2".equals(applyInfo.getStatus()) || "4".equals(applyInfo.getStatus()) || "6".equals(applyInfo.getStatus()) || "8".equals(applyInfo.getStatus())) { + if ("2".equals(applyInfo.getStatus()) || "4".equals(applyInfo.getStatus()) || "6".equals(applyInfo.getStatus()) || "8".equals(applyInfo.getStatus()) || "10".equals(applyInfo.getStatus())) { leaseApplyInfos.add(applyInfo); } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index f00bdb93..29eddab4 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -122,6 +122,9 @@ company_id, + + lease_type, + @@ -175,6 +178,9 @@ #{companyId,jdbcType=INTEGER}, + + #{leaseType,jdbcType=VARCHAR}, + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index fe1d688b..ce8237b7 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -458,7 +458,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpl.lot_id as proId,bpl.lot_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, - lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName, + lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType, case when d.id = '30' then lai.company_audit_remark when d.id = '31' then lai.dept_audit_remark when d.id = '32' then lai.direct_audit_remark @@ -625,6 +625,7 @@ su4.user_name as directAuditBy, lai.direct_audit_time as directAuditTime, lai.direct_audit_remark as directAuditRemark, + lai.lease_type as leaseType, d.id as examineStatusId, bai.agreement_code as agreementCode, @@ -807,7 +808,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpl.lot_id as proId,bpl.lot_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, - lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName, + lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType, case when d.id = '30' then lai.company_audit_remark when d.id = '31' then lai.dept_audit_remark when d.id = '32' then lai.direct_audit_remark @@ -866,6 +867,80 @@ GROUP BY lad.id + + + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index eb3c2ad5..74503108 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -149,7 +149,7 @@ public class WorkSiteDirectManageController extends BaseController { if (CollUtil.isEmpty(leaseApplyDetails)) { return AjaxResult.error("领料出库信息为空"); } - List leaseApplyInfoList = applyInfoService.selectIdByTaskId(task.getTaskId().intValue()); + List leaseApplyInfoList = applyInfoService.selectIdByTaskId(Integer.parseInt(task.getId())); List list = new ArrayList(); for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { LeaseOutDetails leaseOutDetails = new LeaseOutDetails();