purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP

Browse Source
This commit is contained in:
cjl
2019-01-23 14:01:00 +08:00
parent 309d575c5d dd6f7d8a51
commit 4744dee4fb
13 changed files with 157 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -205,8 +205,8 @@
</select>
<select id="findInOutMaterialCountTotal" resultType="java.lang.Integer">
select count(1)
from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId
select count(1) from
(select di.MaterialId, m.mName,m.Model,m.categoryName from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId
INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName
from jsh_material INNER JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id) m
on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
@@ -219,6 +219,7 @@
<if test="pid == null">
and di.DepotId in (${dids})
</if>
GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName) a
</select>
<select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">

27
src/main/resources/mapper_xml/LogMapperEx.xml
View File

@@ -1,32 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.LogMapper">
<select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="BaseResultMap">
select *
FROM jsh_log
<resultMap extends="BaseResultMap" id="ResultExMap" type="com.jsh.erp.datasource.vo.LogVo4List">
<result column="userName" jdbcType="VARCHAR" property="username" />
</resultMap>
<select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap">
select l.*,u.username userName
FROM jsh_log l left join jsh_user u
on l.userID = u.id
where 1=1
<if test="operation != null">
and operation like '%${operation}%'
and l.operation like '%${operation}%'
</if>
<if test="usernameID != null">
and userID=${usernameID}
and l.userID=${usernameID}
</if>
<if test="clientIp != null">
and clientIp like '%${clientIp}%'
and l.clientIp like '%${clientIp}%'
</if>
<if test="status != null">
and status=${status}
and l.status=${status}
</if>
<if test="beginTime != null">
and createtime &gt;= '%${beginTime}%'
and l.createtime &gt;= '%${beginTime}%'
</if>
<if test="endTime != null">
and createtime &lt;= '%${endTime}%'
and l.createtime &lt;= '%${endTime}%'
</if>
<if test="contentdetails != null">
and contentdetails like '%${contentdetails}%'
and l.contentdetails like '%${contentdetails}%'
</if>
order by createtime desc
order by l.createtime desc
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>