From e5f271ee77ccc5834c7b188c90dbd3217e591cbd Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 31 Jul 2024 13:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=95=B0=E6=8D=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=80=BB=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/controller/CustomController.java | 25 ++----------------- .../resources/mappers/basis/HomeMapper.xml | 12 +-------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java b/src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java index e1e5525..b5ea5f8 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java @@ -41,12 +41,10 @@ public class CustomController { @Autowired private CustomService customService; - @Resource - private CustomDao customDao; @PostMapping(value = "getList") @DecryptAndVerify(decryptedClass = BaseCustom.class)//加解密统一管理 - @LogAnnotation(operModul = "基础管理-单位管理", operation = "查询单位列表", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "基础管理-单位管理", operation = "查询单位列表", operDesc = "业务级事件",operType="查询") @PreAuthorize("@pms.hasPermission('base:custom:query')" ) public ServerResponse listCustoms(EncryptedReq data) { PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); @@ -72,21 +70,14 @@ public class CustomController { @PostMapping(value = "updateCustom") @DecryptAndVerify(decryptedClass = BaseCustom.class)//加解密统一管理 - @LogAnnotation(operModul = "基础管理-客户管理", operation = "修改单位客户", operDesc = "系统级事件",operType="修改") + @LogAnnotation(operModul = "基础管理-客户管理", operation = "修改单位客户", operDesc = "业务级事件",operType="修改") @PreAuthorize("@pms.hasPermission('base:custom:add')") public ServerResponse updateCustom(EncryptedReq data) { try { - // int status = data.getData().getCustomStatus(); BaseCustom u = customService.getCustom(data.getData().getCustomName(),data.getData().getCustomId()); if (u != null) { return ServerResponse.createErroe("单位客户名称 “"+data.getData().getCustomName() + "” 已存在"); } -// if(StringHelper.isNotEmpty(data.getData().getCustomPhone())){ -// BaseCustom u2 = customService.getCustomPhone(data.getData().getCustomPhone(),data.getData().getCustomId()); -// if (u2 != null ) { -// return ServerResponse.createErroe("手机号"+data.getData().getCustomPhone() + "已存在"); -// } -// } customService.updateCustom(data.getData()); return ServerResponse.createBySuccessMsg("操作成功"); }catch (Exception e){ @@ -130,18 +121,6 @@ public class CustomController { return ServerResponse.createErroe("操作失败"); } -// @PostMapping(value = "updateCustomStatus") -// @DecryptAndVerify(decryptedClass = BaseCustom.class) -// @LogAnnotation(operModul = "基础管理-客户管理", operation = "修改状态", operDesc = "业务级事件",operType="查询") -// @PreAuthorize("@pms.hasPermission('base:custom:update')" ) -// public ServerResponse updaetCustomStatus(EncryptedReq data){ -// try{ -// return customService.updateCustomStatus(data.getData()); -// }catch (Exception e){ -// log.error(e.toString(),e); -// } -// return ServerResponse.createErroe("参数异常,请稍后重试"); -// } @PostMapping(value = "all") @LogAnnotation(operModul = "班组成员配置", operation = "查询所有班组", operDesc = "系统级事件",operType="查询") diff --git a/src/main/resources/mappers/basis/HomeMapper.xml b/src/main/resources/mappers/basis/HomeMapper.xml index ee25401..5189c59 100644 --- a/src/main/resources/mappers/basis/HomeMapper.xml +++ b/src/main/resources/mappers/basis/HomeMapper.xml @@ -28,20 +28,10 @@ select teamName,sum(amount) as testCost from ( - select tt.team_name as teamName,ts.id,teis.amount + select tt.team_name as teamName,ts.id,te.amount from tb_exper te left join tb_sample ts on te.sample_id=ts.id left join tb_team tt on ts.team_id=tt.id - left join tb_exper_items teis on te.id=teis.exper_id - where ts.del_flag='0' - union ALL - - -- 额外费用 - select tt.team_name as teamName,ts.id,ted.amount - from tb_exper te - left join tb_exper_dev ted on te.id=ted.exper_id - left join tb_sample ts on te.sample_id=ts.id - left join tb_team tt on ts.team_id=tt.id where ts.del_flag='0' ) aa group by teamName