From 13e68ed43e316fad5d6dfacabb1d1434bf7e2bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 27 Jul 2022 17:59:06 +0800 Subject: [PATCH] bug --- .../xm/core/ctrl/XmTaskSbillController.java | 24 +- ...troller.java => XmWorkloadController.java} | 254 +++++++++--------- .../java/com/xm/core/entity/XmWorkload.java | 2 +- .../xm/core/service/XmWorkloadService.java | 24 +- 4 files changed, 152 insertions(+), 152 deletions(-) rename xm-core/src/main/java/com/xm/core/ctrl/{XmTaskWorkloadController.java => XmWorkloadController.java} (63%) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java index ad938453..380bb882 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java @@ -245,10 +245,10 @@ public class XmTaskSbillController { if(sameSbillDetails!=null && sameSbillDetails.size()>0){ for (XmTaskSbillDetail detail : sameSbillDetails) { //进行合并操作 - for (XmWorkload xmTaskWorkload : workloadsDb3) { - if(detail.getUserid().equals(xmTaskWorkload.getUserid()) && detail.getTaskId().equals(xmTaskWorkload.getTaskId())){ - detail.setWorkload(NumberUtil.getBigDecimal(detail.getWorkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); - detail.setSworkload(NumberUtil.getBigDecimal(detail.getSworkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); + for (XmWorkload xmWorkload : workloadsDb3) { + if(detail.getUserid().equals(xmWorkload.getUserid()) && detail.getTaskId().equals(xmWorkload.getTaskId())){ + detail.setWorkload(NumberUtil.getBigDecimal(detail.getWorkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO))); + detail.setSworkload(NumberUtil.getBigDecimal(detail.getSworkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO))); } } } @@ -257,13 +257,13 @@ public class XmTaskSbillController { List workloadsDb4=workloadsDb3.stream().filter(i->!sameSbillDetails.stream().filter(k->k.getUserid().equals(i.getUserid()) && k.getTaskId().equals(i.getTaskId())).findAny().isPresent()).collect(Collectors.toList()); Map detailMap=new HashMap<>(); - for (XmWorkload xmTaskWorkload : workloadsDb4) { - XmTaskSbillDetail detail=detailMap.get(xmTaskWorkload.getUserid()+"-"+xmTaskWorkload.getTaskId()); + for (XmWorkload xmWorkload : workloadsDb4) { + XmTaskSbillDetail detail=detailMap.get(xmWorkload.getUserid()+"-"+xmWorkload.getTaskId()); if(detail==null){ detail=new XmTaskSbillDetail(); - BeanUtils.copyProperties(xmTaskWorkload,detail); - XmTask xmTask=xmTasksDb2.stream().filter(i->i.getId().equals(xmTaskWorkload.getTaskId())).findAny().get(); - detail.setSworkload(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)); + BeanUtils.copyProperties(xmWorkload,detail); + XmTask xmTask=xmTasksDb2.stream().filter(i->i.getId().equals(xmWorkload.getTaskId())).findAny().get(); + detail.setSworkload(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO)); detail.setId(this.xmTaskSbillDetailService.createKey("id")); detail.setBizDate(DateUtils.getDate("yyyy-MM-dd")); detail.setBizMonth(DateUtils.getDate("yyyy-MM")); @@ -281,10 +281,10 @@ public class XmTaskSbillController { detail.setOshare(xmTask.getOshare()); detail.setTaskName(xmTask.getName()); detail.setUniPrice("1".equals(xmTask.getTaskOut())?xmTask.getUniOutPrice():xmTask.getUniInnerPrice()); - detailMap.put(xmTaskWorkload.getUserid()+"-"+xmTaskWorkload.getTaskId(),detail); + detailMap.put(xmWorkload.getUserid()+"-"+xmWorkload.getTaskId(),detail); }else{ - detail.setWorkload(detail.getWorkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); - detail.setSworkload(detail.getSworkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); + detail.setWorkload(detail.getWorkload().add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO))); + detail.setSworkload(detail.getSworkload().add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO))); } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java similarity index 63% rename from xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java index 3847c9ac..37957759 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java @@ -34,21 +34,21 @@ import static com.mdp.core.utils.ResponseHelper.failed; /** * url编制采用rest风格,如对xm_workload 工时登记表的操作有增删改查,对应的url分别为:
- * 新增: core/xmTaskWorkload/add
- * 查询: core/xmTaskWorkload/list
- * 模糊查询: core/xmTaskWorkload/listKey
- * 修改: core/xmTaskWorkload/edit
- * 删除: core/xmTaskWorkload/del
- * 批量删除: core/xmTaskWorkload/batchDel
+ * 新增: core/xmWorkload/add
+ * 查询: core/xmWorkload/list
+ * 模糊查询: core/xmWorkload/listKey
+ * 修改: core/xmWorkload/edit
+ * 删除: core/xmWorkload/del
+ * 批量删除: core/xmWorkload/batchDel
* 组织 com 顶级模块 xm 大模块 core 小模块
- * 实体 XmTaskWorkload 表 xm_workload 当前主键(包括多主键): id; + * 实体 XmWorkload 表 xm_workload 当前主键(包括多主键): id; ***/ -@RestController("xm.core.xmTaskWorkloadController") -@RequestMapping(value="/**/core/xmTaskWorkload") +@RestController("xm.core.xmWorkloadController") +@RequestMapping(value="/**/core/xmWorkload") @Api(tags={"工时登记表操作接口"}) -public class XmTaskWorkloadController { +public class XmWorkloadController { - static Logger logger =LoggerFactory.getLogger(XmTaskWorkloadController.class); + static Logger logger =LoggerFactory.getLogger(XmWorkloadController.class); @Autowired private XmWorkloadService xmWorkloadService; @@ -75,22 +75,22 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) - public Map listXmTaskWorkload( @ApiIgnore @RequestParam Map xmTaskWorkload){ + public Map listXmWorkload( @ApiIgnore @RequestParam Map xmWorkload){ Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); - RequestUtils.transformArray(xmTaskWorkload, "ids"); - RequestUtils.transformArray( xmTaskWorkload, "wstatuses"); - RequestUtils.transformArray( xmTaskWorkload, "sstatuses"); - PageUtils.startPage(xmTaskWorkload); - String taskId= (String) xmTaskWorkload.get("taskId"); - String sbillId= (String) xmTaskWorkload.get("sbillId"); - String projectId= (String) xmTaskWorkload.get("projectId"); - String userid= (String) xmTaskWorkload.get("userid"); + RequestUtils.transformArray(xmWorkload, "ids"); + RequestUtils.transformArray( xmWorkload, "wstatuses"); + RequestUtils.transformArray( xmWorkload, "sstatuses"); + PageUtils.startPage(xmWorkload); + String taskId= (String) xmWorkload.get("taskId"); + String sbillId= (String) xmWorkload.get("sbillId"); + String projectId= (String) xmWorkload.get("projectId"); + String userid= (String) xmWorkload.get("userid"); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("linkBranchId",user.getBranchId()); - List> xmTaskWorkloadList = xmWorkloadService.selectListMapByWhere(xmTaskWorkload); //列出XmTaskWorkload列表 - PageUtils.responePage(m, xmTaskWorkloadList); - m.put("data",xmTaskWorkloadList); + xmWorkload.put("linkBranchId",user.getBranchId()); + List> xmWorkloadList = xmWorkloadService.selectListMapByWhere(xmWorkload); //列出XmWorkload列表 + PageUtils.responePage(m, xmWorkloadList); + m.put("data",xmWorkloadList); m.put("tips", tips); return m; @@ -100,15 +100,15 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/listProjectWorkloadSetDay",method=RequestMethod.GET) - public Map listProjectWorkloadSetDay( @ApiIgnore @RequestParam Map xmTaskWorkload){ + public Map listProjectWorkloadSetDay( @ApiIgnore @RequestParam Map xmWorkload){ Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); - PageUtils.startPage(xmTaskWorkload); + PageUtils.startPage(xmWorkload); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("linkBranchId",user.getBranchId()); - List> xmTaskWorkloadList = xmWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload); //列出XmTaskWorkload列表 - PageUtils.responePage(m, xmTaskWorkloadList); - m.put("data",xmTaskWorkloadList); + xmWorkload.put("linkBranchId",user.getBranchId()); + List> xmWorkloadList = xmWorkloadService.listProjectWorkloadSetDay(xmWorkload); //列出XmWorkload列表 + PageUtils.responePage(m, xmWorkloadList); + m.put("data",xmWorkloadList); m.put("tips", tips); return m; @@ -120,15 +120,15 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/listProjectWorkloadSetMonth",method=RequestMethod.GET) - public Map listProjectWorkloadSetMonth( @ApiIgnore @RequestParam Map xmTaskWorkload){ + public Map listProjectWorkloadSetMonth( @ApiIgnore @RequestParam Map xmWorkload){ Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); - PageUtils.startPage(xmTaskWorkload); + PageUtils.startPage(xmWorkload); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("linkBranchId",user.getBranchId()); - List> xmTaskWorkloadList = xmWorkloadService.listProjectWorkloadSetMonth(xmTaskWorkload); //列出XmTaskWorkload列表 - PageUtils.responePage(m, xmTaskWorkloadList); - m.put("data",xmTaskWorkloadList); + xmWorkload.put("linkBranchId",user.getBranchId()); + List> xmWorkloadList = xmWorkloadService.listProjectWorkloadSetMonth(xmWorkload); //列出XmWorkload列表 + PageUtils.responePage(m, xmWorkloadList); + m.put("data",xmWorkloadList); m.put("tips", tips); return m; @@ -140,22 +140,22 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/ListGroupByTaskIdAndUserid",method=RequestMethod.GET) - public Map ListGroupByTaskIdAndUserid( @ApiIgnore @RequestParam Map xmTaskWorkload){ + public Map ListGroupByTaskIdAndUserid( @ApiIgnore @RequestParam Map xmWorkload){ Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); - RequestUtils.transformArray(xmTaskWorkload, "ids"); - RequestUtils.transformArray( xmTaskWorkload, "wstatuses"); - RequestUtils.transformArray( xmTaskWorkload, "sstatuses"); - PageUtils.startPage(xmTaskWorkload); + RequestUtils.transformArray(xmWorkload, "ids"); + RequestUtils.transformArray( xmWorkload, "wstatuses"); + RequestUtils.transformArray( xmWorkload, "sstatuses"); + PageUtils.startPage(xmWorkload); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("linkBranchId",user.getBranchId()); - String queryScope= (String) xmTaskWorkload.get("queryScope"); + xmWorkload.put("linkBranchId",user.getBranchId()); + String queryScope= (String) xmWorkload.get("queryScope"); if("my".equals(queryScope)){ - xmTaskWorkload.put("userid",user.getUserid()); + xmWorkload.put("userid",user.getUserid()); } - List> xmTaskWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUserid(xmTaskWorkload); //列出XmTaskWorkload列表 - PageUtils.responePage(m, xmTaskWorkloadList); - m.put("data",xmTaskWorkloadList); + List> xmWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUserid(xmWorkload); //列出XmWorkload列表 + PageUtils.responePage(m, xmWorkloadList); + m.put("data",xmWorkloadList); m.put("tips", tips); return m; @@ -166,22 +166,22 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/ListGroupByTaskIdAndUseridToSet",method=RequestMethod.GET) - public Map ListGroupByTaskIdAndUseridToSet( @ApiIgnore @RequestParam Map xmTaskWorkload){ + public Map ListGroupByTaskIdAndUseridToSet( @ApiIgnore @RequestParam Map xmWorkload){ Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); - RequestUtils.transformArray(xmTaskWorkload, "ids"); - RequestUtils.transformArray( xmTaskWorkload, "wstatuses"); - RequestUtils.transformArray( xmTaskWorkload, "sstatuses"); - PageUtils.startPage(xmTaskWorkload); - String queryScope= (String) xmTaskWorkload.get("queryScope"); + RequestUtils.transformArray(xmWorkload, "ids"); + RequestUtils.transformArray( xmWorkload, "wstatuses"); + RequestUtils.transformArray( xmWorkload, "sstatuses"); + PageUtils.startPage(xmWorkload); + String queryScope= (String) xmWorkload.get("queryScope"); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("linkBranchId",user.getBranchId()); + xmWorkload.put("linkBranchId",user.getBranchId()); if("my".equals(queryScope)){ - xmTaskWorkload.put("userid",user.getUserid()); + xmWorkload.put("userid",user.getUserid()); } - List> xmTaskWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(xmTaskWorkload); //列出XmTaskWorkload列表 - PageUtils.responePage(m, xmTaskWorkloadList); - m.put("data",xmTaskWorkloadList); + List> xmWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(xmWorkload); //列出XmWorkload列表 + PageUtils.responePage(m, xmWorkloadList); + m.put("data",xmWorkloadList); m.put("tips", tips); return m; @@ -193,43 +193,43 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/add",method=RequestMethod.POST) - public Map addXmTaskWorkload(@RequestBody XmWorkload xmTaskWorkload) { + public Map addXmWorkload(@RequestBody XmWorkload xmWorkload) { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ User user= LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.setId(xmWorkloadService.createKey("id")); + xmWorkload.setId(xmWorkloadService.createKey("id")); - if(!StringUtils.hasText(xmTaskWorkload.getTaskId())) { + if(!StringUtils.hasText(xmWorkload.getTaskId())) { return failed("taskId-0","请上送任务编号"); } - if(!StringUtils.hasText(xmTaskWorkload.getUserid())){ + if(!StringUtils.hasText(xmWorkload.getUserid())){ return failed("userid-0","请上送工作人员编号"); } - if(!StringUtils.hasText(xmTaskWorkload.getUbranchId())){ + if(!StringUtils.hasText(xmWorkload.getUbranchId())){ return failed("ubranchId-0","请上送工作人员归属机构"); } - if(!StringUtils.hasText(xmTaskWorkload.getBizDate())) { + if(!StringUtils.hasText(xmWorkload.getBizDate())) { return failed("bizDate-0","请上送日期"); } - if(xmTaskWorkload.getWorkload()==null) { + if(xmWorkload.getWorkload()==null) { return failed("workload-0","工时不能为空"); } - if(xmTaskWorkload.getWorkload().compareTo(BigDecimal.ZERO)==0) { + if(xmWorkload.getWorkload().compareTo(BigDecimal.ZERO)==0) { return failed("workload-0","工时不能为0"); } - XmWorkload xmTaskWorkloadCount=new XmWorkload(); - //xmTaskWorkloadCount.setUserid(user.getUserid()); - xmTaskWorkloadCount.setBizDate(xmTaskWorkload.getBizDate()); - xmTaskWorkloadCount.setTaskId(xmTaskWorkload.getTaskId()); - long count=this.xmWorkloadService.countByWhere(xmTaskWorkloadCount); + XmWorkload xmWorkloadCount=new XmWorkload(); + //xmWorkloadCount.setUserid(user.getUserid()); + xmWorkloadCount.setBizDate(xmWorkload.getBizDate()); + xmWorkloadCount.setTaskId(xmWorkload.getTaskId()); + long count=this.xmWorkloadService.countByWhere(xmWorkloadCount); if(count>0){ return failed("data-1","当前任务今天已经报工"); } - XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmTaskWorkload.getTaskId())); + XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmWorkload.getTaskId())); if(xmTaskDb==null ){ return failed("data-0","任务已不存在"); } @@ -249,22 +249,22 @@ public class XmTaskWorkloadController { } } - xmTaskWorkload.setCtime(new Date()); - xmTaskWorkload.setCuserid(user.getUserid()); + xmWorkload.setCtime(new Date()); + xmWorkload.setCuserid(user.getUserid()); - xmTaskWorkload.setWstatus("0"); - xmTaskWorkload.setProjectId(xmTaskDb.getProjectId()); - xmTaskWorkload.setBranchId(xmTaskDb.getCbranchId()); - xmWorkloadService.insert(xmTaskWorkload); - if(xmTaskWorkload.getRworkload()!=null && BigDecimal.ZERO.compareTo(xmTaskWorkload.getRworkload())<=0){ - BigDecimal newBudgetWorkload= xmTaskWorkload.getRworkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)).add(NumberUtil.getBigDecimal(xmTaskDb.getActWorkload(),BigDecimal.ZERO)); + xmWorkload.setWstatus("0"); + xmWorkload.setProjectId(xmTaskDb.getProjectId()); + xmWorkload.setBranchId(xmTaskDb.getCbranchId()); + xmWorkloadService.insert(xmWorkload); + if(xmWorkload.getRworkload()!=null && BigDecimal.ZERO.compareTo(xmWorkload.getRworkload())<=0){ + BigDecimal newBudgetWorkload= xmWorkload.getRworkload().add(NumberUtil.getBigDecimal(xmWorkload.getWorkload(),BigDecimal.ZERO)).add(NumberUtil.getBigDecimal(xmTaskDb.getActWorkload(),BigDecimal.ZERO)); List ids=new ArrayList<>(); ids.add(xmTaskDb.getId()); this.xmTaskService.batchUpdateBudgetWorkloadAndRate(ids,newBudgetWorkload ); } this.xmTaskService.calcWorkloadByRecord(xmTaskDb.getId()); pushService.pushXmTask(xmTaskDb); - m.put("data",xmTaskWorkload); + m.put("data",xmWorkload); }catch (BizException e) { tips=e.getTips(); logger.error("",e); @@ -280,18 +280,18 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200,response= XmWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/edit",method=RequestMethod.POST) - public Map editXmTaskWorkload(@RequestBody XmWorkload xmTaskWorkload) { + public Map editXmWorkload(@RequestBody XmWorkload xmWorkload) { Map m = new HashMap<>(); Tips tips=new Tips("成功更新一条数据"); try{ - if(!StringUtils.hasText(xmTaskWorkload.getId())) { + if(!StringUtils.hasText(xmWorkload.getId())) { return failed("pk-not-exists","请上送主键参数id"); } - XmWorkload xmTaskWorkloadDb = xmWorkloadService.selectOneObject(xmTaskWorkload); - if( xmTaskWorkloadDb == null ){ + XmWorkload xmWorkloadDb = xmWorkloadService.selectOneObject(xmWorkload); + if( xmWorkloadDb == null ){ return failed("data-not-exists","数据不存在，无法修改"); } - XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmTaskWorkloadDb.getTaskId())); + XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmWorkloadDb.getTaskId())); if(xmTaskDb==null ){ return failed("data-0","任务已不存在"); } @@ -309,11 +309,11 @@ public class XmTaskWorkloadController { } } - xmWorkloadService.updateSomeFieldByPk(xmTaskWorkload); + xmWorkloadService.updateSomeFieldByPk(xmWorkload); pushService.pushXmTask(xmTaskDb); - this.xmTaskService.calcWorkloadByRecord(xmTaskWorkload.getTaskId()); + this.xmTaskService.calcWorkloadByRecord(xmWorkload.getTaskId()); - m.put("data",xmTaskWorkload); + m.put("data",xmWorkload); }catch (BizException e) { tips=e.getTips(); logger.error("",e); @@ -331,19 +331,19 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Map batchDelXmTaskWorkload(@RequestBody List xmTaskWorkloads) { + public Map batchDelXmWorkload(@RequestBody List xmWorkloads) { Map m = new HashMap<>(); - Tips tips=new Tips("成功删除"+xmTaskWorkloads.size()+"条数据"); + Tips tips=new Tips("成功删除"+xmWorkloads.size()+"条数据"); try{ - if(xmTaskWorkloads.stream().filter(i->!StringUtils.hasText(i.getId())).findAny().isPresent()){ + if(xmWorkloads.stream().filter(i->!StringUtils.hasText(i.getId())).findAny().isPresent()){ return ResponseHelper.failed("id-0","主键不能为空"); } - xmTaskWorkloads = xmWorkloadService.selectListByIds(xmTaskWorkloads.stream().map(i->i.getId()).collect(Collectors.toList())); - if(xmTaskWorkloads==null || xmTaskWorkloads.size()==0){ + xmWorkloads = xmWorkloadService.selectListByIds(xmWorkloads.stream().map(i->i.getId()).collect(Collectors.toList())); + if(xmWorkloads==null || xmWorkloads.size()==0){ return ResponseHelper.failed("data-0","工时已不存在"); } User user= LoginUtils.getCurrentUserInfo(); - List taskIds=xmTaskWorkloads.stream().map(i->i.getTaskId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()); + List taskIds=xmWorkloads.stream().map(i->i.getTaskId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()); List tasksDb=this.xmTaskService.selectListByIds(taskIds); Map taskMap=new HashMap<>(); Map canDelTaskMap=new HashMap<>(); @@ -370,22 +370,22 @@ public class XmTaskWorkloadController { List canDel=new ArrayList<>(); List state1Ndel=new ArrayList<>(); List noQxDel=new ArrayList<>(); - for (XmWorkload xmTaskWorkload : xmTaskWorkloads) { - if(canDelTaskMap.containsKey(xmTaskWorkload.getTaskId())){ - if(!"1".equals(xmTaskWorkload.getWstatus())){ - canDel.add(xmTaskWorkload); + for (XmWorkload xmWorkload : xmWorkloads) { + if(canDelTaskMap.containsKey(xmWorkload.getTaskId())){ + if(!"1".equals(xmWorkload.getWstatus())){ + canDel.add(xmWorkload); } else{ - state1Ndel.add(xmTaskWorkload); + state1Ndel.add(xmWorkload); } }else{ - if(!taskMap.containsKey(xmTaskWorkload.getTaskId())){//对应任务已被删除，不存在了 - if(!"1".equals(xmTaskWorkload.getWstatus())){ - canDel.add(xmTaskWorkload); + if(!taskMap.containsKey(xmWorkload.getTaskId())){//对应任务已被删除，不存在了 + if(!"1".equals(xmWorkload.getWstatus())){ + canDel.add(xmWorkload); }else{ - state1Ndel.add(xmTaskWorkload); + state1Ndel.add(xmWorkload); } }else{ - noQxDel.add(xmTaskWorkload); + noQxDel.add(xmWorkload); } } } @@ -423,17 +423,17 @@ public class XmTaskWorkloadController { - @ApiOperation( value = "批量更新工时表状态各个字段",notes="xmTaskWorkloadMap") + @ApiOperation( value = "批量更新工时表状态各个字段",notes="xmWorkloadMap") @ApiResponses({ @ApiResponse(code = 200,response=XmMenu.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmTaskWorkload_editSomeFields",name = "批量修改修改任务中的某些字段",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + @HasQx(value = "xm_core_xmWorkload_editSomeFields",name = "批量修改修改任务中的某些字段",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/editSomeFields",method=RequestMethod.POST) - public Map editSomeFields(@RequestBody Map xmTaskWorkloadMap) { + public Map editSomeFields(@RequestBody Map xmWorkloadMap) { Map m = new HashMap<>(); Tips tips=new Tips("成功更新一条数据"); try{ - List ids= (List) xmTaskWorkloadMap.get("ids"); + List ids= (List) xmWorkloadMap.get("ids"); if(ids==null || ids.size()==0){ return ResponseHelper.failed("ids-0","ids不能为空"); @@ -445,17 +445,17 @@ public class XmTaskWorkloadController { fields.add("projectId"); fields.add("sbillId"); - for (String fieldName : xmTaskWorkloadMap.keySet()) { + for (String fieldName : xmWorkloadMap.keySet()) { if(fields.contains(fieldName)){ return ResponseHelper.failed(fieldName+"-no-edit",fieldName+"不允许修改"); } } - List xmTaskWorkloadsDb= xmWorkloadService.selectListByIds(ids); - if(xmTaskWorkloadsDb==null ||xmTaskWorkloadsDb.size()==0){ + List xmWorkloadsDb= xmWorkloadService.selectListByIds(ids); + if(xmWorkloadsDb==null ||xmWorkloadsDb.size()==0){ return ResponseHelper.failed("tasks-0","该工时已不存在"); } - String wstatus= (String) xmTaskWorkloadMap.get("wstatus"); - String sstatus= (String) xmTaskWorkloadMap.get("sstatus"); + String wstatus= (String) xmWorkloadMap.get("wstatus"); + String sstatus= (String) xmWorkloadMap.get("sstatus"); if(StringUtils.hasText(sstatus)){ if(!"0".equals(sstatus) && !"1".equals(sstatus)){ return ResponseHelper.failed("sstatus-not-01","只能修改为无需结算或者待结算"); @@ -466,10 +466,10 @@ public class XmTaskWorkloadController { return ResponseHelper.failed("wstatus-not-01","工时状态不正确"); } } - List taskIds=xmTaskWorkloadsDb.stream().map(i->i.getTaskId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()); + List taskIds=xmWorkloadsDb.stream().map(i->i.getTaskId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()); Map taskMap=new HashMap<>(); - if(xmTaskWorkloadMap.containsKey("sstatus") && "1".equals(sstatus)){ + if(xmWorkloadMap.containsKey("sstatus") && "1".equals(sstatus)){ List tasks=this.xmTaskService.selectListByIds(taskIds); for (XmTask task : tasks) { taskMap.put(task.getId(),task); @@ -479,30 +479,30 @@ public class XmTaskWorkloadController { List canChanges=new ArrayList<>(); List sstatusNot01=new ArrayList<>(); List taskStateNot34=new ArrayList<>(); - for (XmWorkload xmTaskWorkload : xmTaskWorkloadsDb) { - if(!"1".equals(xmTaskWorkload.getSstatus()) && !"0".equals(xmTaskWorkload.getSstatus()) &&StringUtils.hasText(xmTaskWorkload.getSstatus())){ - sstatusNot01.add(xmTaskWorkload); + for (XmWorkload xmWorkload : xmWorkloadsDb) { + if(!"1".equals(xmWorkload.getSstatus()) && !"0".equals(xmWorkload.getSstatus()) &&StringUtils.hasText(xmWorkload.getSstatus())){ + sstatusNot01.add(xmWorkload); }else{ - if(xmTaskWorkloadMap.containsKey("sstatus") && "1".equals(sstatus)){ - XmTask task=taskMap.get(xmTaskWorkload.getTaskId()); + if(xmWorkloadMap.containsKey("sstatus") && "1".equals(sstatus)){ + XmTask task=taskMap.get(xmWorkload.getTaskId()); if(task==null || (!"2".equals(task.getTaskState()) && !"3".equals(task.getTaskState()))){ - taskStateNot34.add(xmTaskWorkload); + taskStateNot34.add(xmWorkload); continue; } } - canChanges.add(xmTaskWorkload); + canChanges.add(xmWorkload); } } if(canChanges.size()>0){ - xmTaskWorkloadMap.put("ids",canChanges.stream().map(i->i.getId()).collect(Collectors.toList())); - Set fieldKey=xmTaskWorkloadMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); - fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskWorkloadMap.get(i) )).collect(Collectors.toSet()); + xmWorkloadMap.put("ids",canChanges.stream().map(i->i.getId()).collect(Collectors.toList())); + Set fieldKey=xmWorkloadMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); + fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmWorkloadMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()>0){ - xmWorkloadService.editSomeFieldsWithSbillIds(xmTaskWorkloadMap,null); + xmWorkloadService.editSomeFieldsWithSbillIds(xmWorkloadMap,null); } } List msgs=new ArrayList<>(); diff --git a/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java index 4d9b36a2..fb18c51c 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
- * 实体 XmTaskWorkload所有属性名:
+ * 实体 XmWorkload所有属性名:
* "userid","员工编号","username","姓名","ctime","创建日期","taskId","任务编号，任务报工必填","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id","menuId","需求编号，缺陷报工、测试报工、任务报工都可以填","productId","产品编号，能关联到的都填","caseId","测试用例编号(如果是测试执行报工，必填)","planId","测试计划编号(如果是测试执行报工，必填)","bugId","缺陷编号(如果是缺陷报工，必填)","bizType","报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行";
* 当前主键(包括多主键):
* id;
diff --git a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java index 34192090..3a525d7b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java @@ -13,9 +13,9 @@ import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com 顶级模块 xm 大模块 core 小模块
- * 实体 XmTaskWorkload 表 xm_workload 当前主键(包括多主键): id; + * 实体 XmWorkload 表 xm_workload 当前主键(包括多主键): id; ***/ -@Service("xm.core.xmTaskWorkloadService") +@Service("xm.core.xmWorkloadService") public class XmWorkloadService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmWorkloadService.class); @@ -24,11 +24,11 @@ public class XmWorkloadService extends BaseService { - public List> listProjectWorkloadSetDay(Map xmTaskWorkload) { - return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload); + public List> listProjectWorkloadSetDay(Map xmWorkload) { + return super.selectList("listProjectWorkloadSetDay",xmWorkload); } - public List> listProjectWorkloadSetMonth(Map xmTaskWorkload) { - return super.selectList("listProjectWorkloadSetMonth",xmTaskWorkload); + public List> listProjectWorkloadSetMonth(Map xmWorkload) { + return super.selectList("listProjectWorkloadSetMonth",xmWorkload); } @@ -42,20 +42,20 @@ public class XmWorkloadService extends BaseService { @Transactional - public void editSomeFieldsWithSbillIds(Map xmTaskWorkloadMap, List sbillIds) { - super.editSomeFields(xmTaskWorkloadMap); + public void editSomeFieldsWithSbillIds(Map xmWorkloadMap, List sbillIds) { + super.editSomeFields(xmWorkloadMap); } public void updateStatusBySbillIdByFlowState(String sbillId,String sstatus) { super.update("updateStatusBySbillIdByFlowState",map("sbillId",sbillId,"sstatus",sstatus)); } - public List> ListGroupByTaskIdAndUserid(Map xmTaskWorkload) { - return super.selectList("selectListMapGroupByTaskIdAndUserid",xmTaskWorkload); + public List> ListGroupByTaskIdAndUserid(Map xmWorkload) { + return super.selectList("selectListMapGroupByTaskIdAndUserid",xmWorkload); } - public List> ListGroupByTaskIdAndUseridToSet(Map xmTaskWorkload) { - return super.selectList("ListGroupByTaskIdAndUseridToSet",xmTaskWorkload); + public List> ListGroupByTaskIdAndUseridToSet(Map xmWorkload) { + return super.selectList("ListGroupByTaskIdAndUseridToSet",xmWorkload); } public void updateStatusAfterJoinSbill(Map details) {