Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/glxp/api/service/inout/IoAddInoutService.javamaster
wj
3 years ago
commit
ca3f878c34
@ -0,0 +1,73 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class IoCodeLostRequest extends ListPageRequest {
|
||||
|
||||
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* UDI码
|
||||
*/
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
private String produceDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
private String expireDate;
|
||||
|
||||
/**
|
||||
* 序列号
|
||||
*/
|
||||
private String serialNo;
|
||||
|
||||
/**
|
||||
* 供应商
|
||||
*/
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
private String nameCode;
|
||||
|
||||
private String cpmctymc;
|
||||
|
||||
private String ggxh;
|
||||
|
||||
private String startTime;
|
||||
|
||||
private String endTime;
|
||||
|
||||
}
|
||||
@ -1,29 +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.IoCodeLostMapper">
|
||||
|
||||
<select id="selectLost" parameterType="com.glxp.api.entity.inout.IoCodeLostEntity"
|
||||
<select id="selectLost" parameterType="com.glxp.api.req.inout.IoCodeLostRequest"
|
||||
resultType="com.glxp.api.res.inout.IoCodeLostResponse">
|
||||
select io_code_lost.*,basic_products.cpmctymc ,basic_products.ggxh from io_code_lost
|
||||
LEFT JOIN basic_products on io_code_lost.nameCode=basic_products.nameCode
|
||||
select io_code_lost.*, basic_products.cpmctymc, basic_products.ggxh
|
||||
from io_code_lost
|
||||
LEFT JOIN basic_products on io_code_lost.nameCode = basic_products.nameCode
|
||||
<where>
|
||||
<if test="code != '' and code != null">
|
||||
and code like concat('%',#{code},'%')
|
||||
and `code` like concat('%', #{code}, '%')
|
||||
</if>
|
||||
<if test="cpmctymc != '' and cpmctymc != null">
|
||||
and basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
|
||||
and basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
|
||||
</if>
|
||||
<if test="ggxh != '' and ggxh != null">
|
||||
and basic_products.ggxh like concat('%',#{ggxh},'%')
|
||||
and basic_products.ggxh like concat('%', #{ggxh}, '%')
|
||||
</if>
|
||||
|
||||
<if test="batchNo != '' and batchNo != null">
|
||||
and batchNo like concat('%',#{batchNo},'%')
|
||||
and batchNo like concat('%', #{batchNo}, '%')
|
||||
</if>
|
||||
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
||||
AND date_format(io_code_lost.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
|
||||
</if>
|
||||
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Loading…
Reference in New Issue