拆零相关修改
parent
dfd2e2bfce
commit
147c9f3fa9
@ -1,10 +1,29 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.entity.inout.IoSplitCodeEntity;
|
||||
import com.glxp.api.req.inout.IoSplitCodeRequest;
|
||||
import com.glxp.api.req.inout.IoSplitDetailCodeRequest;
|
||||
import com.glxp.api.res.inout.IoSplitCodeDetailResponse;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.glxp.api.dao.inout.IoSplitCodeDetailMapper;
|
||||
import com.glxp.api.entity.inout.IoSplitCodeDetailEntity;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoSplitCodeDetailService extends ServiceImpl<IoSplitCodeDetailMapper, IoSplitCodeDetailEntity> {
|
||||
public List<IoSplitCodeDetailResponse> filterList(IoSplitDetailCodeRequest splitDetailCodeRequest) {
|
||||
if (splitDetailCodeRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (splitDetailCodeRequest.getPage() != null) {
|
||||
int offset = (splitDetailCodeRequest.getPage() - 1) * splitDetailCodeRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, splitDetailCodeRequest.getLimit());
|
||||
}
|
||||
return super.baseMapper.filterList(splitDetailCodeRequest);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,10 +1,26 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.glxp.api.entity.inout.IoSplitCodeEntity;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.inout.IoSplitCodeMapper;
|
||||
import com.glxp.api.entity.inout.IoSplitCodeEntity;
|
||||
import com.glxp.api.req.inout.IoSplitCodeRequest;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCodeEntity> {
|
||||
public List<IoSplitCodeEntity> filterList(IoSplitCodeRequest splitCodeRequest) {
|
||||
if (splitCodeRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (splitCodeRequest.getPage() != null) {
|
||||
int offset = (splitCodeRequest.getPage() - 1) * splitCodeRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, splitCodeRequest.getLimit());
|
||||
}
|
||||
return super.baseMapper.filterList(splitCodeRequest);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,25 +1,28 @@
|
||||
<?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.glxp.api.dao.inout.IoSplitCodeDetailMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoSplitCodeDetailEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table io_split_code_detail-->
|
||||
<id column="id" jdbcType="INTEGER" property="id" />
|
||||
<result column="codeIdFk" jdbcType="INTEGER" property="codeIdFk" />
|
||||
<result column="udiCodoe" jdbcType="VARCHAR" property="udiCodoe" />
|
||||
<result column="sickerCode" jdbcType="VARCHAR" property="sickerCode" />
|
||||
<result column="adNum" jdbcType="VARCHAR" property="adNum" />
|
||||
<result column="count" jdbcType="INTEGER" property="count" />
|
||||
<result column="prescribeNum" jdbcType="VARCHAR" property="prescribeNum" />
|
||||
<result column="createType" jdbcType="TINYINT" property="createType" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, codeIdFk, udiCodoe, sickerCode, adNum, `count`, prescribeNum, createType, createTime,
|
||||
`createUser`, updateTime, remark
|
||||
</sql>
|
||||
<select id="filterList" parameterType="com.glxp.api.req.inout.IoSplitDetailCodeRequest"
|
||||
resultType="com.glxp.api.res.inout.IoSplitCodeDetailResponse">
|
||||
SELECT iscd.*,code,batchNo,produceDate,expireDate,serialNo,orderId
|
||||
FROM io_split_code_detail iscd
|
||||
left join io_split_code isc
|
||||
on iscd.codeIdFk = isc.id
|
||||
<where>
|
||||
<if test="sickerCode != '' and sickerCode != null">
|
||||
AND iscd.sickerCode LIKE #{sickerCode}
|
||||
</if>
|
||||
<if test="adNum != '' and adNum != null">
|
||||
AND iscd.adNum = #{adNum}
|
||||
</if>
|
||||
<if test="prescribeNum != '' and prescribeNum != null">
|
||||
AND iscd.prescribeNum = #{prescribeNum}
|
||||
</if>
|
||||
<if test="codeIdFk != null">
|
||||
AND iscd.codeIdFk = #{codeIdFk}
|
||||
</if>
|
||||
<if test="itemCode != '' and itemCode != null">
|
||||
AND iscd.itemCode = #{itemCode}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
@ -1,39 +1,38 @@
|
||||
<?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.glxp.api.dao.inout.IoSplitCodeMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoSplitCodeEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table io_split_code-->
|
||||
<id column="id" jdbcType="INTEGER" property="id" />
|
||||
<result column="code" jdbcType="VARCHAR" property="code" />
|
||||
<result column="errUdiCode" jdbcType="VARCHAR" property="errUdiCode" />
|
||||
<result column="orderId" jdbcType="VARCHAR" property="orderId" />
|
||||
<result column="action" jdbcType="VARCHAR" property="action" />
|
||||
<result column="relId" jdbcType="BIGINT" property="relId" />
|
||||
<result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
|
||||
<result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
|
||||
<result column="produceDate" jdbcType="VARCHAR" property="produceDate" />
|
||||
<result column="expireDate" jdbcType="VARCHAR" property="expireDate" />
|
||||
<result column="serialNo" jdbcType="VARCHAR" property="serialNo" />
|
||||
<result column="supId" jdbcType="BIGINT" property="supId" />
|
||||
<result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
|
||||
<result column="invCode" jdbcType="VARCHAR" property="invCode" />
|
||||
<result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
|
||||
<result column="productType" jdbcType="TINYINT" property="productType" />
|
||||
<result column="splitType" jdbcType="TINYINT" property="splitType" />
|
||||
<result column="scanCount" jdbcType="INTEGER" property="scanCount" />
|
||||
<result column="totalCount" jdbcType="INTEGER" property="totalCount" />
|
||||
<result column="remainCount" jdbcType="INTEGER" property="remainCount" />
|
||||
<result column="inBactchNo" jdbcType="VARCHAR" property="inBactchNo" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, code, errUdiCode, orderId, `action`, relId, nameCode, batchNo, produceDate, expireDate,
|
||||
serialNo, supId, deptCode, invCode, warehouseCode, productType, splitType, scanCount,
|
||||
totalCount, remainCount, inBactchNo, createTime, `createUser`, updateTime, remark
|
||||
</sql>
|
||||
<select id="filterList" parameterType="com.glxp.api.req.inout.IoSplitCodeRequest"
|
||||
resultType="com.glxp.api.entity.inout.IoSplitCodeEntity">
|
||||
SELECT io_split_code.*
|
||||
FROM io_split_code
|
||||
<where>
|
||||
<if test="code != '' and code != null">
|
||||
AND code LIKE #{code}
|
||||
</if>
|
||||
<if test="relId != null">
|
||||
AND relId = #{relId}
|
||||
</if>
|
||||
<if test="nameCode != '' and nameCode != null">
|
||||
AND nameCode = #{nameCode}
|
||||
</if>
|
||||
<if test="batchNo != '' and batchNo != null">
|
||||
AND batchNo = #{batchNo}
|
||||
</if>
|
||||
<if test="supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
<if test="invCode != null">
|
||||
AND invCode = #{invCode}
|
||||
</if>
|
||||
<if test="supId != null">
|
||||
AND supId = #{supId}
|
||||
</if>
|
||||
<if test="productType != null">
|
||||
AND productType = #{productType}
|
||||
</if>
|
||||
<if test="workPlaceCode != '' and workPlaceCode != null">
|
||||
AND workPlaceCode = #{workPlaceCode}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
Loading…
Reference in New Issue