rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

查询设备条件调整

This commit is contained in:
jing's 2023-12-07 11:29:25 +08:00
parent cccd16603f
commit 4b31aa654b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
View File

@ -10,14 +10,15 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
@Data @Data
@ApiModel("选配方案清单") @ApiModel("com.nflg.product.bomnew.pojo.query.OptionalEbomConfigListQuery选配方案清单")
@Accessors(chain = true) @Accessors(chain = true)
public class OptionalEbomConfigListQuery extends BasePageQuery implements Serializable { public class OptionalEbomConfigListQuery extends BasePageQuery implements Serializable {
@ApiModelProperty(value = "机型编号") @ApiModelProperty(value = "机型编号")
private String deviceNo; private String deviceNo;
@ApiModelProperty(value = "机型编号 /机型名")
private String deviceName;

1
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
View File

@ -265,6 +265,7 @@ public class OptionalExcelService {
optionalEbomMainEntity.setCreatedBy(SessionUtil.getUserCode()); optionalEbomMainEntity.setCreatedBy(SessionUtil.getUserCode());
optionalEbomMainEntity.setRealName(SessionUtil.getRealName());
optionalEbomMainEntity.setDeptName(SessionUtil.getDepartName()); optionalEbomMainEntity.setDeptName(SessionUtil.getDepartName());
optionalEbomMainEntity.setCreatedTime(new Date()); optionalEbomMainEntity.setCreatedTime(new Date());
optionalEbomMainEntity.setUpdatedTime(new Date()); optionalEbomMainEntity.setUpdatedTime(new Date());

9
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
View File

@ -31,17 +31,16 @@
from t_optional_ebom_config from t_optional_ebom_config
<where> <where>
edit_status = #{query.editStatus}
<if test="query.deviceNo != null and query.deviceNo != ''"> <if test="query.deviceName != null and query.deviceName != ''">
device_no = #{query.deviceNo} and( device_name like concat('%', '${query.deviceName}', '%') or device_no like concat('%', '${query.deviceName}', '%') )
</if> </if>
<if test="query.createdBy != null and query.createdBy != ''"> <if test="query.createdBy != null and query.createdBy != ''">
and created_by = #{query.createdBy} and created_by = #{query.createdBy}
</if> </if>
<if test="query.editStatus != null">
and edit_status = #{query.editStatus}
</if>
<if test="query.startTime!= null and query.endTime != null"> <if test="query.startTime!= null and query.endTime != null">
<![CDATA[and created_time >= #{query.startTime} and created_time < #{query.endTime} ]]> <![CDATA[and created_time >= #{query.startTime} and created_time < #{query.endTime} ]]>

2
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
View File

@ -30,7 +30,7 @@
<if test="query.deviceName != null and query.deviceName != ''"> <if test="query.deviceName != null and query.deviceName != ''">
and( device_name like concat('%', '${query.deviceName}', '%') or device_no = #{query.deviceName}) and( device_name like concat('%', '${query.deviceName}', '%') or device_no like concat('%', '${query.deviceName}', '%') )
</if> </if>