From 270d3ae2f8b563b01e72d57ff78ca970347f56db Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Sat, 16 Mar 2024 15:33:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E5=BA=86=E9=A2=86=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 68 +++++++++- .../bonus/sgzb/app/domain/LeaseApplyInfo.java | 2 + .../com/bonus/sgzb/app/domain/TmTask.java | 4 + .../bonus/sgzb/app/mapper/TmTaskMapper.java | 2 + .../bonus/sgzb/app/service/TmTaskService.java | 6 + .../app/service/impl/TmTaskServiceImpl.java | 127 +++++++++++++++++- .../mapper/app/LeaseApplyInfoMapper.xml | 6 + .../resources/mapper/app/TmTaskMapper.xml | 20 ++- .../WorkSiteDirectManageController.java | 2 +- sgzb-ui/src/api/claimAndRefund/receive.js | 18 ++- .../receiveByCq/receiveExamineByCq.vue | 4 +- .../receiveByCq/receiveManage.vue | 4 +- 12 files changed, 248 insertions(+), 15 deletions(-) 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..3ce6d700 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 @@ -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)) { @@ -336,6 +360,31 @@ public class TmTaskController extends BaseController { Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); 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)); + } + /** * 领料申请导出 @@ -472,7 +521,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 +530,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..e975e587 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 @@ -229,4 +229,8 @@ public class TmTask implements Serializable { @ApiModelProperty(value="分管审批备注") private String deptAuditRemark; + @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/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 561c402c..ea52635b 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,6 @@ public interface TmTaskMapper { LeaseApplyInfo getListSomeol(LeaseApplyInfo info); Integer getKgByMaType(Integer typeId); + + List getLeaseApplyDetailsCq(@Param("record") LeaseApplyInfo leaseApplyInfo); } \ 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..9a6106dd 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,8 @@ public interface TmTaskService{ LeaseApplyInfo getListSomeol(LeaseApplyInfo info); List getLeaseAuditListByPeople(TmTask task); + + List getLeaseAuditManageListCq(TmTask task); + + List getLeaseListAllCq(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..a4a7a867 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,6 +170,37 @@ 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; + } + /** * 获取领料申请列表 */ @@ -292,6 +323,65 @@ 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; + } + /** * 获取领料申请列表 @@ -595,7 +685,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 +1022,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..35a21db1 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,21 @@ 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(); diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js index 8ed6dfbd..e031c340 100644 --- a/sgzb-ui/src/api/claimAndRefund/receive.js +++ b/sgzb-ui/src/api/claimAndRefund/receive.js @@ -70,6 +70,14 @@ export function getLeaseManageListAll(query) { params: query }) } +// 机具领料-申请列表 +export function getLeaseManageListAllCq(query) { + return request({ + url: '/base/tm_task/getLeaseManageListAllCq', + method: 'get', + params: query + }) +} // 机具领料-管理列表 export function getLeaseAuditListAll(query) { return request({ @@ -142,13 +150,21 @@ export function deleteTask( taskId ){ } // 根据 领料任务id 获取详情数据 -export function getTaskDetail( params = {} ){ +export function getLeaseListAll( params = {} ){ return request({ url: '/base/tm_task/getLeaseListAll', method:'get', params:params }) } +// 根据 领料任务id 获取详情数据 +export function getLeaseListAllCq( params = {} ){ + return request({ + url: '/base/tm_task/getLeaseListAllCq', + method:'get', + params:params + }) +} // 领料审核 同意 export function auditLeaseByCompany(params = {} ){ diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue index cb039732..49ae9be1 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue @@ -146,7 +146,7 @@