From 1c4acf89a54b7df3a4db89d23eb16710ce7e0557 Mon Sep 17 00:00:00 2001 From: chentaiyu Date: Tue, 29 Mar 2022 10:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=93=E7=AE=97-=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/ctrl/XmTaskSbillController.java | 15 ++++++++++-- .../core/ctrl/XmTaskWorkloadController.java | 23 +++++++++++++++++-- .../com/xm/core/entity/XmTaskWorkload.java | 8 +++---- .../mapper/xm/core/dao/XmTaskSbillMapper.xml | 4 +++- .../xm/core/dao/XmTaskWorkloadMapper.xml | 16 +++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) 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 663b8f18..7d883e58 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 @@ -139,7 +139,12 @@ public class XmTaskSbillController { Map m = new HashMap<>(); Tips tips=new Tips("成功删除一条数据"); if(!"0".equals(xmTaskSbill.getStatus())){ - tips.setFailureMsg("当前状态不允许删除"); + tips.setFailureMsg("只有待提交的结算单才能删除"); + m.put("tips", tips); + return m; + } + if(!("0".equals(xmTaskSbill.getBizFlowState()) || "4".equals(xmTaskSbill.getBizFlowState()))){ + tips.setFailureMsg("已发审数据不允许删除"); m.put("tips", tips); return m; } @@ -167,11 +172,17 @@ public class XmTaskSbillController { Map m = new HashMap<>(); Tips tips=new Tips("成功更新一条数据"); if(!"0".equals(xmTaskSbill.getStatus())){ - tips.setFailureMsg("当前状态不允许修改"); + tips.setFailureMsg("只能修改待提交的结算单"); + m.put("tips", tips); + return m; + } + if(!("0".equals(xmTaskSbill.getBizFlowState()) || "4".equals(xmTaskSbill.getBizFlowState()))){ + tips.setFailureMsg("已发审数据不允许修改"); m.put("tips", tips); return m; } try{ + xmTaskSbill.setLtime(new Date()); xmTaskSbillService.updateByPk(xmTaskSbill); m.put("data",xmTaskSbill); }catch (BizException e) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index 90a92e35..0ab2ae2d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -141,7 +141,7 @@ public class XmTaskWorkloadController { } */ - /** + @ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ") @ApiResponses({ @ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") @@ -170,7 +170,6 @@ public class XmTaskWorkloadController { m.put("tips", tips); return m; } - */ @@ -196,4 +195,24 @@ public class XmTaskWorkloadController { return m; } */ + + /** + * 用于结算单 + * */ + @ApiOperation( value = "查询工时登记表信息列表",notes=" ") + @ApiResponses({ + @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/listByProject",method=RequestMethod.GET) + public Map listXmTaskWorkloadByProject( @RequestParam Map xmTaskWorkload){ + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); + PageUtils.startPage(xmTaskWorkload); + List> xmTaskWorkloadList = xmTaskWorkloadService.selectList("selectListMapByProject",xmTaskWorkload); //列出XmTaskWorkload列表 + PageUtils.responePage(m, xmTaskWorkloadList); + m.put("data",xmTaskWorkloadList); + + m.put("tips", tips); + return m; + } } diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java index 665377cc..1b03ca0b 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java @@ -20,7 +20,7 @@ public class XmTaskWorkload implements java.io.Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="") - Integer id; + String id; @ApiModelProperty(notes="员工编号",allowEmptyValue=true,example="",allowableValues="") @@ -69,7 +69,7 @@ public class XmTaskWorkload implements java.io.Serializable { BigDecimal workload; /**主键**/ - public XmTaskWorkload(Integer id) { + public XmTaskWorkload(String id) { this.id = id; } @@ -134,7 +134,7 @@ public class XmTaskWorkload implements java.io.Serializable { /** * 主键 **/ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** @@ -231,7 +231,7 @@ public class XmTaskWorkload implements java.io.Serializable { /** * 主键 **/ - public Integer getId() { + public String getId() { return this.id; } /** diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml index d9735607..01236ba8 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml @@ -11,7 +11,9 @@ ( #{id}) - + + AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} ) + diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml index c77a3f37..2d038647 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml @@ -14,6 +14,22 @@ + + + +