ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(稽查延期申请流程): 79405

Browse Source
This commit is contained in:
yjz
2023-12-18 17:08:31 +08:00
parent 98ef727043
commit 240ad5bb57
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java
+7
View File
@@ -145,4 +145,11 @@ public class EnterpriseStandardInspectVo {
@ApiModelProperty(value = "创建日期 查询用")
@TableField(exist = false)
private String createDate;
/**
* 企标编号/企标名称 查询用
*/
@ApiModelProperty(value = "企标编号/企标名称 查询用")
@TableField(exist = false)
private String inspectNoOrName;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+5
View File
@@ -232,6 +232,11 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
String[] date = enterpriseStandardInspectVo.getCreateDate().split(",");
queryWrapper.between("create_time", date[0], date[1]);
}
if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNoOrName())){
queryWrapper.and(qw ->
qw.eq("inspect_no", enterpriseStandardInspectVo.getInspectNoOrName())
.or().eq("inspect_name", enterpriseStandardInspectVo.getInspectNoOrName()));
}
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept());
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo());
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName());