From d7b78162ecb8c9eb7e9ffcba7cb7e4a196873308 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 10 Jan 2024 09:03:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=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 --- .../bonus/sgzb/base/api/domain/TmTask.java | 5 +- .../bonus/sgzb/common/core/text/Convert.java | 28 ++++---- .../handler/GatewayExceptionHandler.java | 20 ++---- sgzb-modules/sgzb-base/pom.xml | 1 + .../sgzb/app/controller/TmTaskController.java | 59 ++++++++++++----- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 6 ++ .../bonus/sgzb/app/service/TmTaskService.java | 2 + .../app/service/impl/TmTaskServiceImpl.java | 35 ++++++++++ .../resources/mapper/app/TmTaskMapper.xml | 64 +++++++++++++++++-- 9 files changed, 169 insertions(+), 51 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java index f99861d4..3588bc9c 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.base.api.domain; import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -84,7 +85,7 @@ public class TmTask implements Serializable { */ @ApiModelProperty(value="创建时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; /** @@ -98,7 +99,7 @@ public class TmTask implements Serializable { */ @ApiModelProperty(value="更新时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; /** diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/text/Convert.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/text/Convert.java index 838e6dd2..4dd05a14 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/text/Convert.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/text/Convert.java @@ -238,11 +238,24 @@ public class Convert return toNumber(value, null); } + /** + * 转换为int
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Integer toInt(Object value) + { + return toInt(value, null); + } + /** * 转换为int
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错 - * + * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 * @return 结果 @@ -276,19 +289,6 @@ public class Convert } } - /** - * 转换为int
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Integer toInt(Object value) - { - return toInt(value, null); - } - /** * 转换为Integer数组
* diff --git a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/handler/GatewayExceptionHandler.java b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/handler/GatewayExceptionHandler.java index 67631b91..dba004c4 100644 --- a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/handler/GatewayExceptionHandler.java +++ b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/handler/GatewayExceptionHandler.java @@ -19,33 +19,25 @@ import reactor.core.publisher.Mono; */ @Order(-1) @Configuration -public class GatewayExceptionHandler implements ErrorWebExceptionHandler -{ +public class GatewayExceptionHandler implements ErrorWebExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class); @Override - public Mono handle(ServerWebExchange exchange, Throwable ex) - { + public Mono handle(ServerWebExchange exchange, Throwable ex) { ServerHttpResponse response = exchange.getResponse(); - if (exchange.getResponse().isCommitted()) - { + if (exchange.getResponse().isCommitted()) { return Mono.error(ex); } String msg; - if (ex instanceof NotFoundException) - { + if (ex instanceof NotFoundException) { msg = "服务未找到"; - } - else if (ex instanceof ResponseStatusException) - { + } else if (ex instanceof ResponseStatusException) { ResponseStatusException responseStatusException = (ResponseStatusException) ex; msg = responseStatusException.getMessage(); - } - else - { + } else { msg = "内部服务器错误"; } diff --git a/sgzb-modules/sgzb-base/pom.xml b/sgzb-modules/sgzb-base/pom.xml index 8148d9e8..67ee6982 100644 --- a/sgzb-modules/sgzb-base/pom.xml +++ b/sgzb-modules/sgzb-base/pom.xml @@ -97,6 +97,7 @@ 5.8.18 compile + 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 0cec497a..b665a2b1 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 @@ -15,6 +15,9 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; +import com.bonus.sgzb.common.security.annotation.RequiresRoles; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -51,6 +54,7 @@ public class TmTaskController extends BaseController { /** * 领料审核，分公司，分管，机具分公司统一接口 + * * @param task 审核信息 * @return 结果 */ @@ -60,6 +64,19 @@ public class TmTaskController extends BaseController { return toAjax(tmTaskService.updateLeaseTaskAuditInfo(task)); } + /** + * 领料驳回，分公司，分管，机具分公司统一接口 + * + * @param task + * @return + */ + @Log(title = "领料驳回", businessType = BusinessType.UPDATE) + @PostMapping("rejectLeaseByCompany") + public AjaxResult rejectLeaseByCompany(@RequestBody TmTask task) { + return toAjax(tmTaskService.updateLeaseTaskRejectInfo(task)); + } + + /** * 根据任务id删除任务表及任务信息 */ @@ -162,7 +179,9 @@ public class TmTaskController extends BaseController { } } } - if (StringUtils.isEmpty(taskId)) { return AjaxResult.error("任务编号为空,创建失败"); } + if (StringUtils.isEmpty(taskId)) { + return AjaxResult.error("任务编号为空,创建失败"); + } } else { return AjaxResult.error("创建任务失败"); } @@ -175,6 +194,7 @@ public class TmTaskController extends BaseController { /** * 机具分公司直接创建领料申请 + * * @param task 任务信息 * @return 结果 */ @@ -234,7 +254,9 @@ public class TmTaskController extends BaseController { } } } - if (StringUtils.isEmpty(taskId)) { return AjaxResult.error("任务编号为空,创建失败"); } + if (StringUtils.isEmpty(taskId)) { + return AjaxResult.error("任务编号为空,创建失败"); + } } else { return AjaxResult.error("创建任务失败"); } @@ -247,11 +269,13 @@ public class TmTaskController extends BaseController { /** * 查询机具领料审核列表 - 后台 + * * @param task 筛选条件 * @return 列表 */ @Log(title = "查询机具领料审核列表- 后台", businessType = BusinessType.QUERY) @GetMapping(value = "getLeaseAuditListAll") + @RequiresRoles(value = {"admin", "kg", "fgs", "nbry"}, logical = Logical.OR) public AjaxResult getLeaseAuditListAll(TmTask task) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); @@ -263,6 +287,7 @@ public class TmTaskController extends BaseController { /** * 查询机具领料审核列表 - app + * * @param task 筛选条件 * @return 列表 */ @@ -288,7 +313,7 @@ public class TmTaskController extends BaseController { try { int taskResult = tmTaskService.updateByPrimaryKeySelective(task); if (taskResult > 0) { - if (CollUtil.isEmpty(task.getLeaseApplyInfoList())){ + if (CollUtil.isEmpty(task.getLeaseApplyInfoList())) { return AjaxResult.error("任务表修改完成,但领料任务明细为空，执行失败！"); } // 修改任务关联的协议 @@ -296,9 +321,9 @@ public class TmTaskController extends BaseController { //修改领料任务表信息 //先判断 目前数据库有几个公司 - List list = tmTaskService.getListSome(task.getTaskId()); + List list = tmTaskService.getListSome(task.getTaskId()); LeaseApplyInfo infoAdd = new LeaseApplyInfo(); - if(list.size()<2){ + if (list.size() < 2) { List> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId"); infoAdd.setTaskId(task.getTaskId().intValue()); infoAdd.setCode(task.getLeaseApplyInfoList().get(0).getCode()); @@ -307,11 +332,11 @@ public class TmTaskController extends BaseController { infoAdd.setRemark(task.getLeaseApplyInfoList().get(0).getRemark()); infoAdd.setType(task.getLeaseApplyInfoList().get(0).getType()); for (List leaseApplyDetailsList : deviceByCompanyList) { - if(leaseApplyDetailsList.get(0).getParenntId() == null ){ - if(leaseApplyDetailsList.get(0).getCompanyId()==101){ + if (leaseApplyDetailsList.get(0).getParenntId() == null) { + if (leaseApplyDetailsList.get(0).getCompanyId() == 101) { infoAdd.setCompanyId(101); leaseApplyInfoService.genderLeaseCode(infoAdd); - }else if(leaseApplyDetailsList.get(0).getCompanyId()==102){ + } else if (leaseApplyDetailsList.get(0).getCompanyId() == 102) { infoAdd.setCompanyId(102); leaseApplyInfoService.genderLeaseCode(infoAdd); } @@ -337,9 +362,9 @@ public class TmTaskController extends BaseController { // 删除后,插入新地领料任务明细 if (StringUtils.isNotNull(leaseApplyInfo.getId())) { for (LeaseApplyDetails leaseApplyDetails : leaseApplyInfo.getLeaseApplyDetails()) { - if(leaseApplyDetails.getParenntId() == null){ + if (leaseApplyDetails.getParenntId() == null) { leaseApplyDetails.setParenntId(infoAdd.getId()); - }else{ + } else { leaseApplyDetails.setParenntId(leaseApplyInfo.getId()); // 设置领料任务ID } @@ -361,20 +386,20 @@ public class TmTaskController extends BaseController { } /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ @GetMapping("selectOne") public TmTask selectOne(Integer id) { - return tmTaskService.selectByPrimaryKey(Long.valueOf(id)); + return tmTaskService.selectByPrimaryKey(Long.valueOf(id)); } @Log(title = "获取领料申请-详情列表", businessType = BusinessType.QUERY) @GetMapping("/getLeaseListAll") - public TableDataInfo getLeaseListAll(@RequestParam(value ="taskId", required = false, defaultValue = "") String taskId){ + public TableDataInfo getLeaseListAll(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { TmTask task = new TmTask(); task.setTaskId(Long.parseLong(taskId)); List leaseAuditList = tmTaskService.getLeaseListAll(task); 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 282c1016..b47989ce 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 @@ -36,9 +36,15 @@ public interface TmTaskMapper { /** 更新LeaseApplyInfo审批信息 */ int updateLeaseApplyInfoAuditInfo(@Param("record") LeaseApplyInfo record); + /** 更新LeaseApplyInfo驳回信息 */ + int updateLeaseApplyInfoRejectInfo(@Param("record") LeaseApplyInfo record); + /** 更新leaseApplyDetails审批信息 */ int updateLeaseApplyDetailsAuditInfo(@Param("record") LeaseApplyDetails record); + /** 更新leaseApplyDetails驳回信息 */ + int updateLeaseApplyDetailsRejectInfo(@Param("record") LeaseApplyDetails record); + int deleteTaskByPrimaryKey(String taskId); int deleteTaskInfoByTaskId(String taskId); 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 eea2133f..f72595d3 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 @@ -22,6 +22,8 @@ public interface TmTaskService{ /** 领料任务审核状态修改 */ int updateLeaseTaskAuditInfo(TmTask record); + int updateLeaseTaskRejectInfo(TmTask record); + String genderLeaseCode(); AjaxResult deleteByPrimaryKey(String taskId); 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 79734bcd..17790e8b 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 @@ -105,6 +105,41 @@ public class TmTaskServiceImpl implements TmTaskService{ return result; } + /** + * 领料任务驳回 + * + * @param record 审核数据及信息 + */ + @Override + @Transactional + public int updateLeaseTaskRejectInfo(TmTask record) { + int result = 0; + if (StringUtils.isNotNull(record)) { + // 先审核任务表 + result += tmTaskMapper.updateTmTaskAuditStatus(record); + // 再审核领料任务信息表 + if (CollUtil.isNotEmpty(record.getLeaseApplyInfoList())) { + for (LeaseApplyInfo leaseApplyInfo : record.getLeaseApplyInfoList()) { + if (leaseApplyInfo != null) { + //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); + result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); + // 再审核领料任务详情表 + if (CollUtil.isNotEmpty(leaseApplyInfo.getLeaseApplyDetails())) { + for (LeaseApplyDetails leaseApplyDetails : leaseApplyInfo.getLeaseApplyDetails()) { + if (StringUtils.isNotNull(leaseApplyDetails)) { + result += tmTaskMapper.updateLeaseApplyDetailsRejectInfo(leaseApplyDetails); + } + } + } + } + } + } + } else { + return 0; + } + return result; + } + @Override public String genderLeaseCode() { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); 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 add2807c..12f1c604 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 @@ -456,13 +456,17 @@