end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
3b4f92d2c7
commit
074c727235
2 changed files with 39 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
  2. 53
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml

6
xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
View File

@ -62,7 +62,7 @@ public class XmTaskSbill implements java.io.Serializable {
@ApiModelProperty(notes="业务日期yyyy-MM-dd",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="业务日期yyyy-MM-dd",allowEmptyValue=true,example="",allowableValues="")
String bizDate; String bizDate;
@ApiModelProperty(notes="结算流程状态",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="结算流程状态：0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState; String bizFlowState;
@ApiModelProperty(notes="结算流程实例",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="结算流程实例",allowEmptyValue=true,example="",allowableValues="")
@ -177,7 +177,7 @@ public class XmTaskSbill implements java.io.Serializable {
this.bizDate = bizDate; this.bizDate = bizDate;
} }
/** /**
* 结算流程状态
* 结算流程状态：0初始1审批中2审批通过3审批不通过4流程取消或者删除
**/ **/
public void setBizFlowState(String bizFlowState) { public void setBizFlowState(String bizFlowState) {
this.bizFlowState = bizFlowState; this.bizFlowState = bizFlowState;
@ -304,7 +304,7 @@ public class XmTaskSbill implements java.io.Serializable {
return this.bizDate; return this.bizDate;
} }
/** /**
* 结算流程状态
* 结算流程状态：0初始1审批中2审批通过3审批不通过4流程取消或者删除
**/ **/
public String getBizFlowState() { public String getBizFlowState() {
return this.bizFlowState; return this.bizFlowState;

53
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml
View File

@ -5,19 +5,20 @@
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 --> <!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
<sql id="whereForMap">
<if test="ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{id})
</foreach>
</if>
<if test="key != null and key !='' ">
AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
</if>
<if test="startTime !=null and startTime != ''">
AND res.ctime BETWEEN #{startTime} AND #{endTime}
</if>
</sql>
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' ">
AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
</if>
<if test="startTime !=null and startTime != ''">
AND res.ctime BETWEEN #{startTime} AND #{endTime}
</if>
</sql>
<update id="updateByWorkloadList" parameterType="String"> <update id="updateByWorkloadList" parameterType="String">
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 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 where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskSbill">
select * from xm_task_sbill res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_task_sbill res select * from xm_task_sbill res
@ -62,7 +69,7 @@
</select> </select>
<!-- 获取数据条目 返回long --> <!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmTaskSbill" resultType="long"> <select id="countByWhere" parameterType="com.xm.core.entity.XmTaskSbill" resultType="long">
select count(1) from xm_task_sbill res
select count(*) from xm_task_sbill res
<where> <where>
<include refid="where"/> <include refid="where"/>
</where> </where>
@ -78,9 +85,9 @@
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskSbill"> <delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskSbill">
delete from xm_task_sbill
delete from xm_task_sbill res
<where> <where>
1=2
<include refid="where"/>
</where> </where>
</delete> </delete>
@ -122,6 +129,18 @@
where id = #{item.id} where id = #{item.id}
</foreach> </foreach>
</update> </update>
<!-- 批量修改某几个字段 -->
<delete id="editSomeFields" parameterType="HashMap">
update xm_task_sbill
<set>
<include refid="someFieldSet"/>
</set>
where (id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</delete>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_task_sbill delete from xm_task_sbill

Write Preview
Loading…
Cancel
Save