Skip to content

H
haoban-manage3.0
Commit aa1ada8b by 徐高华
Options

审批查询

parent 593cf22d
Showing with 38 additions and 242 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java
...@@ -8,21 +8,14 @@ import com.gic.haoban.manage.service.entity.TabHaobanAudit; ...@@ -8,21 +8,14 @@ import com.gic.haoban.manage.service.entity.TabHaobanAudit;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
public interface TabHaobanAuditMapper { public interface TabHaobanAuditMapper {
int deleteByPrimaryKey(String auditId);
int insert(TabHaobanAudit record); int insert(TabHaobanAudit record);
int insertSelective(TabHaobanAudit record);
TabHaobanAudit selectByPrimaryKey(String auditId); TabHaobanAudit selectByPrimaryKey(String auditId);
int updateByPrimaryKeySelective(TabHaobanAudit record); int updateByPrimaryKeySelective(TabHaobanAudit record);
int updateByPrimaryKey(TabHaobanAudit record); Page<TabHaobanAudit> page(@Param("auditType")Integer auditType, @Param("storeIds")List<String> storeIds,@Param("searchParams") String search, @Param("enterpriseId")String enterpriseId,@Param("auditStatus")Integer auditStatus,@Param("auditFlag")Integer auditFlag );
Page<TabHaobanAudit> page(@Param("auditType")Integer auditType, @Param("storeIds")List<String> storeIds,@Param("staffIds")List<String>staffIds,@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseId")String enterpriseId,@Param("auditStatus")Integer auditStatus,@Param("auditFlag")Integer auditFlag );
Page<TabHaobanAudit> pageForStoreIdsAndstaffIds(@Param("auditType")Integer auditType, @Param("storeIds")List<String> storeIds,@Param("staffIds")List<String>staffIds,@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseId")String enterpriseId,@Param("auditStatus")Integer auditStatus,@Param("auditFlag")Integer auditFlag );
List<TabHaobanAudit> listByStoreId(String storeId); List<TabHaobanAudit> listByStoreId(String storeId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanAudit.java
...@@ -45,9 +45,18 @@ public class TabHaobanAudit implements Serializable { ...@@ -45,9 +45,18 @@ public class TabHaobanAudit implements Serializable {
private String relatedId; private String relatedId;
private String auditStaffId; private String auditStaffId;
private String commitStoreName ;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getCommitStoreName() {
return commitStoreName;
}
public void setCommitStoreName(String commitStoreName) {
this.commitStoreName = commitStoreName;
}
public String getAuditStaffId() { public String getAuditStaffId() {
return auditStaffId; return auditStaffId;
} }
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml
...@@ -23,11 +23,12 @@ ...@@ -23,11 +23,12 @@
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" /> <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
<result column="related_id" property="relatedId" jdbcType="VARCHAR" /> <result column="related_id" property="relatedId" jdbcType="VARCHAR" />
<result column="audit_staff_id" property="auditStaffId" jdbcType="VARCHAR" /> <result column="audit_staff_id" property="auditStaffId" jdbcType="VARCHAR" />
<result column="commit_store_name" property="commitStoreName"/>
</resultMap> </resultMap>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
audit_id, audit_type, commit_name, commit_staff_id, commit_staff_name, commit_staff_img, audit_id, audit_type, commit_name, commit_staff_id, commit_staff_name, commit_staff_img,
commit_store_id, change_field, old_value, new_value, commit_time, enterprise_id, commit_store_id, change_field, old_value, new_value, commit_time, enterprise_id,
audit_name, audit_status, audit_reason, create_time, update_time, status_flag, wx_enterprise_id,related_id,audit_staff_id audit_name, audit_status, audit_reason, create_time, update_time, status_flag, wx_enterprise_id,related_id,audit_staff_id , commit_store_name
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
select select
...@@ -35,17 +36,14 @@ ...@@ -35,17 +36,14 @@
from tab_haoban_audit from tab_haoban_audit
where audit_id = #{auditId,jdbcType=VARCHAR} where audit_id = #{auditId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
delete from tab_haoban_audit
where audit_id = #{auditId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" > <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >
insert into tab_haoban_audit (audit_id, audit_type, commit_name, insert into tab_haoban_audit (audit_id, audit_type, commit_name,
commit_staff_id, commit_staff_name, commit_staff_img, commit_staff_id, commit_staff_name, commit_staff_img,
commit_store_id, change_field, old_value, commit_store_id, change_field, old_value,
new_value, commit_time, enterprise_id, new_value, commit_time, enterprise_id,
audit_name, audit_status, audit_reason, audit_name, audit_status, audit_reason,
create_time, update_time, status_flag, create_time, update_time, status_flag, commit_store_name
wx_enterprise_id,related_id,audit_staff_id) wx_enterprise_id,related_id,audit_staff_id)
values (#{auditId,jdbcType=VARCHAR}, #{auditType,jdbcType=INTEGER}, #{commitName,jdbcType=VARCHAR}, values (#{auditId,jdbcType=VARCHAR}, #{auditType,jdbcType=INTEGER}, #{commitName,jdbcType=VARCHAR},
#{commitStaffId,jdbcType=VARCHAR}, #{commitStaffName,jdbcType=VARCHAR}, #{commitStaffImg,jdbcType=VARCHAR}, #{commitStaffId,jdbcType=VARCHAR}, #{commitStaffName,jdbcType=VARCHAR}, #{commitStaffImg,jdbcType=VARCHAR},
...@@ -53,141 +51,9 @@ ...@@ -53,141 +51,9 @@
#{newValue,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=VARCHAR}, #{newValue,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=VARCHAR},
#{auditName,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, #{auditReason,jdbcType=VARCHAR}, #{auditName,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, #{auditReason,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{statusFlag,jdbcType=INTEGER},
#{wxEnterpriseId,jdbcType=VARCHAR},#{relatedId,jdbcType=VARCHAR},#{auditStaffId,jdbcType=VARCHAR}) #{wxEnterpriseId,jdbcType=VARCHAR},#{relatedId,jdbcType=VARCHAR},#{auditStaffId,jdbcType=VARCHAR}) , #{commitStoreName}
</insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >
insert into tab_haoban_audit
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="auditId != null" >
audit_id,
</if>
<if test="auditType != null" >
audit_type,
</if>
<if test="commitName != null" >
commit_name,
</if>
<if test="commitStaffId != null" >
commit_staff_id,
</if>
<if test="commitStaffName != null" >
commit_staff_name,
</if>
<if test="commitStaffImg != null" >
commit_staff_img,
</if>
<if test="commitStoreId != null" >
commit_store_id,
</if>
<if test="changeField != null" >
change_field,
</if>
<if test="oldValue != null" >
old_value,
</if>
<if test="newValue != null" >
new_value,
</if>
<if test="commitTime != null" >
commit_time,
</if>
<if test="enterpriseId != null" >
enterprise_id,
</if>
<if test="auditName != null" >
audit_name,
</if>
<if test="auditStatus != null" >
audit_status,
</if>
<if test="auditReason != null" >
audit_reason,
</if>
<if test="createTime != null" >
create_time,
</if>
<if test="updateTime != null" >
update_time,
</if>
<if test="statusFlag != null" >
status_flag,
</if>
<if test="wxEnterpriseId != null" >
wx_enterprise_id,
</if>
<if test="relatedId != null" >
related_id,
</if>
<if test="auditStaffId != null" >
audit_staff_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="auditId != null" >
#{auditId,jdbcType=VARCHAR},
</if>
<if test="auditType != null" >
#{auditType,jdbcType=INTEGER},
</if>
<if test="commitName != null" >
#{commitName,jdbcType=VARCHAR},
</if>
<if test="commitStaffId != null" >
#{commitStaffId,jdbcType=VARCHAR},
</if>
<if test="commitStaffName != null" >
#{commitStaffName,jdbcType=VARCHAR},
</if>
<if test="commitStaffImg != null" >
#{commitStaffImg,jdbcType=VARCHAR},
</if>
<if test="commitStoreId != null" >
#{commitStoreId,jdbcType=VARCHAR},
</if>
<if test="changeField != null" >
#{changeField,jdbcType=VARCHAR},
</if>
<if test="oldValue != null" >
#{oldValue,jdbcType=VARCHAR},
</if>
<if test="newValue != null" >
#{newValue,jdbcType=VARCHAR},
</if>
<if test="commitTime != null" >
#{commitTime,jdbcType=TIMESTAMP},
</if>
<if test="enterpriseId != null" >
#{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="auditName != null" >
#{auditName,jdbcType=VARCHAR},
</if>
<if test="auditStatus != null" >
#{auditStatus,jdbcType=INTEGER},
</if>
<if test="auditReason != null" >
#{auditReason,jdbcType=VARCHAR},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null" >
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="statusFlag != null" >
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="wxEnterpriseId != null" >
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="relatedId != null" >
#{relatedId,jdbcType=VARCHAR},
</if>
<if test="auditStaffId != null" >
#{auditStaffId,jdbcType=VARCHAR},
</if>
</trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" > <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >
update tab_haoban_audit update tab_haoban_audit
<set > <set >
...@@ -254,30 +120,7 @@ ...@@ -254,30 +120,7 @@
</set> </set>
where audit_id = #{auditId,jdbcType=VARCHAR} where audit_id = #{auditId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >
update tab_haoban_audit
set audit_type = #{auditType,jdbcType=INTEGER},
commit_name = #{commitName,jdbcType=VARCHAR},
commit_staff_id = #{commitStaffId,jdbcType=VARCHAR},
commit_staff_name = #{commitStaffName,jdbcType=VARCHAR},
commit_staff_img = #{commitStaffImg,jdbcType=VARCHAR},
commit_store_id = #{commitStoreId,jdbcType=VARCHAR},
change_field = #{changeField,jdbcType=VARCHAR},
old_value = #{oldValue,jdbcType=VARCHAR},
new_value = #{newValue,jdbcType=VARCHAR},
commit_time = #{commitTime,jdbcType=TIMESTAMP},
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
audit_name = #{auditName,jdbcType=VARCHAR},
audit_status = #{auditStatus,jdbcType=INTEGER},
audit_reason = #{auditReason,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status_flag = #{statusFlag,jdbcType=INTEGER},
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
related_id = #{relatedId,jdbcType=VARCHAR},
audit_staff_id = #{auditStaffId,jdbcType=VARCHAR}
where audit_id = #{auditId,jdbcType=VARCHAR}
</update>
<sql id="storeSql"> <sql id="storeSql">
<if test="null != storeIds and storeIds.size gt 0"> <if test="null != storeIds and storeIds.size gt 0">
and commit_store_id in and commit_store_id in
...@@ -298,13 +141,7 @@ ...@@ -298,13 +141,7 @@
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from tab_haoban_audit from tab_haoban_audit
where 1=1 where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
<if test = "wxEnterpriseId != null">
and wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
</if>
<if test = "enterpriseId != null and enterpriseId !=''">
and enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
</if>
<if test = "auditType != null"> <if test = "auditType != null">
and audit_type = #{auditType,jdbcType=INTEGER} and audit_type = #{auditType,jdbcType=INTEGER}
</if> </if>
...@@ -317,8 +154,10 @@ ...@@ -317,8 +154,10 @@
<if test = "auditStatus != null"> <if test = "auditStatus != null">
and audit_status = #{auditStatus,jdbcType=INTEGER} and audit_status = #{auditStatus,jdbcType=INTEGER}
</if> </if>
<if test=" null != searchParams">
and (commit_staff_name like '%${searchParams}%' or commit_store_name like '%${searchParams}%')
</if>
<include refid="storeSql"/> <include refid="storeSql"/>
<include refid="staffSql"/>
order by commit_time desc order by commit_time desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment