haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

实验数据添加总金额字段

This commit is contained in:
haozq 2024-07-31 13:37:27 +08:00
parent 9721f824d7
commit e5f271ee77
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java
View File

@ -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<BaseCustom> 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<BaseCustom> 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<BaseCustom> 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="查询")

12
src/main/resources/mappers/basis/HomeMapper.xml
View File

@ -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
</select>