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

fix: 完善、流程一票否决

Browse Source
This commit is contained in:
yjz
2023-12-12 16:44:22 +08:00
parent 0f8e090a6c
commit b035aad44d
6 changed files with 86 additions and 7 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
@@ -138,4 +138,11 @@ public class EnterpriseStandardInspectVo {
@ApiModelProperty(value = "ids 查询用")
@TableField(exist = false)
private String ids;
/**
* 创建日期 查询用
*/
@ApiModelProperty(value = "创建日期 查询用")
@TableField(exist = false)
private String createDate;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+7
View File
@@ -228,6 +228,13 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
List<String> list = Arrays.asList(inspectStatus.split(","));
queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.eq("inspect_status", v))));
}
if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getCreateDate())){
String[] date = enterpriseStandardInspectVo.getCreateDate().split(",");
queryWrapper.between("create_time", date[0], date[1]);
}
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());
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "inspect_user", enterpriseStandardInspectVo.getInspectUser());
queryWrapper.orderByDesc("create_time");
return queryWrapper;