diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
index fcd938d0..a2ec1286 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
@@ -62,7 +62,7 @@ public class XmTaskSbill implements java.io.Serializable {
@ApiModelProperty(notes="业务日期yyyy-MM-dd",allowEmptyValue=true,example="",allowableValues="")
String bizDate;
- @ApiModelProperty(notes="结算流程状态",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="结算流程状态:0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
@ApiModelProperty(notes="结算流程实例",allowEmptyValue=true,example="",allowableValues="")
@@ -177,7 +177,7 @@ public class XmTaskSbill implements java.io.Serializable {
this.bizDate = bizDate;
}
/**
- * 结算流程状态
+ * 结算流程状态:0初始1审批中2审批通过3审批不通过4流程取消或者删除
**/
public void setBizFlowState(String bizFlowState) {
this.bizFlowState = bizFlowState;
@@ -304,7 +304,7 @@ public class XmTaskSbill implements java.io.Serializable {
return this.bizDate;
}
/**
- * 结算流程状态
+ * 结算流程状态:0初始1审批中2审批通过3审批不通过4流程取消或者删除
**/
public String getBizFlowState() {
return this.bizFlowState;
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 8a5fe8a3..f569f25e 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
@@ -5,19 +5,20 @@
-
- and (res.id) in
-
- ( #{id})
-
-
-
- AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
-
-
- AND res.ctime BETWEEN #{startTime} AND #{endTime}
-
-
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
+ AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
+
+
+ AND res.ctime BETWEEN #{startTime} AND #{endTime}
+
+
update xm_task_sbill res left join (select w.sbill_id,sum(ifnull(w.amt,0)) as amt,sum(ifnull(w.samt,0)) as samt,sum(ifnull(w.workload,0)) as workload from xm_task_workload w where w.sbill_id=#{id} and w.wstatus='1' group by w.sbill_id) as w on res.id=w.sbill_id
@@ -53,7 +54,13 @@
where
res.id = #{id}
-
+
+
+
+
+ update xm_task_sbill
+
+
+
+ where (id) in
+
+ ( #{item})
+
+
delete from xm_task_sbill