完善关键零部件型号库
This commit is contained in:
@@ -212,7 +212,7 @@ public class LawsPartType implements Serializable {
|
||||
*/
|
||||
@ApiModelProperty(value = "完成时间")
|
||||
@Excel(name = "完成时间",format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date successTime;
|
||||
/**
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ public class LawsPartPmmPartitionInfoServiceImpl extends ServiceImpl<LawsPartPmm
|
||||
queryWrapper.eq("IF(l2.id is null,'2','1')",lawsPartPmmPartitionInfo.getStatus());
|
||||
}
|
||||
if(!StringUtils.isBlank(lawsPartPmmPartitionInfo.getFndGpc())){
|
||||
queryWrapper.gt("FIND_IN_SET('" + lawsPartPmmPartitionInfo.getFndGpc() + "',fnd_gpc)", 0);
|
||||
queryWrapper.gt("l2.fnd_gpc", lawsPartPmmPartitionInfo.getFndGpc());
|
||||
}
|
||||
if(!StringUtils.isBlank(lawsPartPmmPartitionInfo.getRegPartNameCn())){
|
||||
queryWrapper.like("l1.reg_part_name_cn",lawsPartPmmPartitionInfo.getRegPartNameCn());
|
||||
|
||||
Reference in New Issue
Block a user