wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

批次生产加工日期变量类型修改

Browse Source
This commit is contained in:
hy2250089 2019-12-23 18:57:10 +08:00
parent b8c8a97523
commit 4047e7396e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
View File

@ -109,7 +109,7 @@
OR client.client_name LIKE CONCAT('%', #{keywords}, '%') OR client.client_name LIKE CONCAT('%', #{keywords}, '%')
OR prodproc.contract_name LIKE CONCAT('%', #{keywords}, '%') OR prodproc.contract_name LIKE CONCAT('%', #{keywords}, '%')
</if> </if>
<if test="createDate != null"> <if test="createDate != null and createDate != ''">
AND DATE_FORMAT(prodproc.create_time,'%Y-%m-%d') = DATE_FORMAT(#{createDate}, '%Y-%m-%d') AND DATE_FORMAT(prodproc.create_time,'%Y-%m-%d') = DATE_FORMAT(#{createDate}, '%Y-%m-%d')
</if> </if>
<if test="companyId != null"> <if test="companyId != null">

7
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java
View File

@ -11,8 +11,7 @@ import java.util.Date;
public class ProductProcessParams extends QueryParams { public class ProductProcessParams extends QueryParams {
private Integer productProcessId; private Integer productProcessId;
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") private String createDate;
private Date createDate;
public Integer getProductProcessId() { public Integer getProductProcessId() {
return productProcessId; return productProcessId;
@ -22,11 +21,11 @@ public class ProductProcessParams extends QueryParams {
this.productProcessId = productProcessId; this.productProcessId = productProcessId;
} }
public Date getCreateDate() { public String getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Date createDate) { public void setCreateDate(String createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
} }

2
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
View File

@ -91,7 +91,7 @@ public class ProductProcessController {
*/ */
@ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询") @ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "Date", required = false), @ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "String", required = false),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false), @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)