From 75db3516e34322d67ba284213cf0a3d9339d5636 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 18 Jan 2024 17:00:26 +0800 Subject: [PATCH] =?UTF-8?q?app=E5=86=85=E9=83=A8=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackApplyController.java | 70 ++++++++++--------- .../sgzb/app/controller/TmTaskController.java | 8 +-- .../sgzb/app/mapper/BackApplyMapper.java | 2 + .../sgzb/app/service/BackApplyService.java | 2 + .../service/impl/BackApplyServiceImpl.java | 5 ++ .../resources/mapper/app/BackApplyMapper.xml | 40 +++++++++-- 6 files changed, 86 insertions(+), 41 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index afbd514c..f0b6a016 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -54,7 +54,7 @@ public class BackApplyController extends BaseController { @PostMapping("getbackList") public AjaxResult getbackList(@RequestBody BackApplyInfo record) { try { - List list =backApplyService.getbackList(record); + List list = backApplyService.getbackList(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -71,7 +71,7 @@ public class BackApplyController extends BaseController { @PostMapping("materialList") public AjaxResult materialList(@RequestBody BackApplyInfo record) { try { - List list =backApplyService.materialList(record); + List list = backApplyService.materialList(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -88,7 +88,7 @@ public class BackApplyController extends BaseController { @PostMapping("view") public AjaxResult view(@RequestBody BackApplyInfo record) { try { - List list =backApplyService.view(record); + List list = backApplyService.view(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -105,7 +105,7 @@ public class BackApplyController extends BaseController { @PostMapping("examineView") public AjaxResult examineView(@RequestBody BackApplyInfo record) { try { - List list =backApplyService.examineView(record); + List list = backApplyService.examineView(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -122,10 +122,10 @@ public class BackApplyController extends BaseController { @PostMapping("del") public AjaxResult del(@RequestBody BackApplyInfo record) { try { - int re =backApplyService.del(record); - if (re>0){ + int re = backApplyService.del(record); + if (re > 0) { return AjaxResult.success("删除成功"); - }else { + } else { return AjaxResult.error("删除失败"); } } catch (Exception e) { @@ -143,7 +143,7 @@ public class BackApplyController extends BaseController { @PostMapping("getbackUnit") public AjaxResult getbackUnit(@RequestBody BmAgreementInfo record) { try { - List list =backApplyService.getbackUnit(record); + List list = backApplyService.getbackUnit(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -160,7 +160,7 @@ public class BackApplyController extends BaseController { @PostMapping("getbackPro") public AjaxResult getbackPro(@RequestBody BmAgreementInfo record) { try { - List list =backApplyService.getbackPro(record); + List list = backApplyService.getbackPro(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -183,21 +183,21 @@ public class BackApplyController extends BaseController { // 创建任务(tm_task) task.setCode(code); boolean addTaskResult = backApplyService.insertTask(task) > 0; - if (addTaskResult){ + if (addTaskResult) { //任务协议表(tm_task_agreement) - Boolean addTaskAgreementRes = backApplyService.insertTaskAgreement(task)>0; - if (addTaskAgreementRes){ + Boolean addTaskAgreementRes = backApplyService.insertTaskAgreement(task) > 0; + if (addTaskAgreementRes) { //退料任务表(back_apply_info) - Boolean addBackApply=backApplyService.insertBackApply(task)>0; - if (addBackApply){ + Boolean addBackApply = backApplyService.insertBackApply(task) > 0; + if (addBackApply) { return AjaxResult.success("任务创建成功,已完成"); - }else { + } else { return AjaxResult.error("退料任务创建失败"); } - }else { + } else { return AjaxResult.error("创建任务协议失败"); } - }else { + } else { return AjaxResult.error("创建任务失败"); } } catch (Exception e) { @@ -215,18 +215,18 @@ public class BackApplyController extends BaseController { @PostMapping("upload") public AjaxResult upload(@RequestBody BackApplyInfo record) { try { - if (CollUtil.isEmpty(record.getBackApplyDetails())){ + if (CollUtil.isEmpty(record.getBackApplyDetails())) { return AjaxResult.error("退料设备明细为空，请重新选择后上传!"); } - for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()){ + for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) { backApplyInfo.setParentId(record.getParentId()); - boolean re =backApplyService.upload(backApplyInfo)>0; - if (!re){ + boolean re = backApplyService.upload(backApplyInfo) > 0; + if (!re) { return AjaxResult.error("退料任务明细插入失败"); } } return AjaxResult.success("退料任务明细插入成功,已完成"); - }catch (Exception e){ + } catch (Exception e) { return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage()); } } @@ -236,20 +236,19 @@ public class BackApplyController extends BaseController { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = tmTaskService.selectTaskNumByMonth(nowDate,36) + 1; - String code=""; - if (taskNum>9 && taskNum<100){ + int taskNum = tmTaskService.selectTaskNumByMonth(nowDate, 36) + 1; + String code = ""; + if (taskNum > 9 && taskNum < 100) { code = "T" + format + "-00" + taskNum; - }else if (taskNum>99 && taskNum<1000){ + } else if (taskNum > 99 && taskNum < 1000) { code = "T" + format + "-0" + taskNum; - }else { + } else { code = "T" + format + "-000" + taskNum; } return code; } - /** * 退料审核列表 * @@ -260,7 +259,7 @@ public class BackApplyController extends BaseController { @PostMapping("examineList") public AjaxResult examineList(@RequestBody BackApplyInfo record) { try { - List list =backApplyService.examineList(record); + List list = backApplyService.examineList(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -268,12 +267,17 @@ public class BackApplyController extends BaseController { } - @ApiOperation("退料审核列表-审核") - @Log(title = "退料审核列表-审核", businessType = BusinessType.UPDATE) + @ApiOperation("退料审核通过") + @Log(title = "退料审核通过", businessType = BusinessType.UPDATE) @PostMapping("/audit") - public AjaxResult audit(@RequestBody BackApplyInfo record) - { + public AjaxResult audit(@RequestBody BackApplyInfo record) { return toAjax(backApplyService.audit(record)); } + @ApiOperation("退料审核驳回") + @Log(title = "退料审核驳回", businessType = BusinessType.UPDATE) + @PostMapping("/refuse") + public AjaxResult refuse(@RequestBody BackApplyInfo record) { + return toAjax(backApplyService.refuse(record)); + } } 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 6e0cc8a7..f03d0745 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 @@ -56,24 +56,24 @@ 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) + @Log(title = "领料审核驳回", businessType = BusinessType.UPDATE) @PostMapping("rejectLeaseByCompany") public AjaxResult rejectLeaseByCompany(@RequestBody TmTask task) { return toAjax(tmTaskService.updateLeaseTaskRejectInfo(task)); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java index e4555e19..dd4c00e7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java @@ -41,4 +41,6 @@ public interface BackApplyMapper { List examineView(BackApplyInfo record); int audit(BackApplyInfo record); + + int refuse(BackApplyInfo record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java index 893c57f7..71980f6a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java @@ -45,4 +45,6 @@ public interface BackApplyService { List examineView(BackApplyInfo record); int audit(BackApplyInfo record); + + int refuse(BackApplyInfo record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 52ea9d94..ba9fa1ff 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -83,4 +83,9 @@ public class BackApplyServiceImpl implements BackApplyService { return backApplyMapper.audit(record); } + @Override + public int refuse(BackApplyInfo record) { + return backApplyMapper.refuse(record); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml index badc6910..7c54bf42 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml @@ -276,12 +276,44 @@ UPDATE tm_task tt - LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id - LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW() + LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id + LEFT JOIN back_apply_details bad on bad.parent_id=bai.id + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='5',bai.direct_audit_time=NOW() + + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='7',bai.direct_audit_time=NOW() + + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW() + + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='3',bai.direct_audit_time=NOW() + WHERE - bai.id = #{id} + bai.id = #{id} + + + UPDATE tm_task tt + LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id + LEFT JOIN back_apply_details bad on bad.parent_id=bai.id + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='6',bai.direct_audit_time=NOW() + + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='8',bai.direct_audit_time=NOW() + + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='2',bai.direct_audit_time=NOW() + + + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='4',bai.direct_audit_time=NOW() + + WHERE + bai.id = #{id} + + DELETE FROM tm_task_agreement