diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml index 3ad3e856..aa3cfe86 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml @@ -179,26 +179,27 @@ - select lesi.id, - lesi.create_by, - lesi.create_time, - lesi.update_by, - lesi.update_time, - inspect_no, - (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, - standardization_work_group, - belong_dept, - plan_inspect_date, - inspect_user, - standardization_docking_user, - complete_date, - actual_inspect_user, - inspect_status, - group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object - from laws_enterprise_standard_inspect lesi - left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0' - left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id + select t.* + from (select lesi.id, + lesi.create_by, + lesi.create_time, + lesi.update_by, + lesi.update_time, + inspect_no, + (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, + standardization_work_group, + belong_dept, + plan_inspect_date, + inspect_user, + standardization_docking_user, + complete_date, + actual_inspect_user, + inspect_status, + group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object + from laws_enterprise_standard_inspect lesi + left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0' + left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id + group by lesi.id) t ${ew.customSqlSegment} - group by lesi.id diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index e2bf5061..39c50b9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -185,12 +185,13 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "lesi.id", enterpriseStandardInspectVo.getId()); + queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "id", enterpriseStandardInspectVo.getId()); if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getIds())){ List list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(",")); - queryWrapper.in("lesi.id", list); + queryWrapper.in("id", list); } - queryWrapper.orderByDesc("lesi.createTime"); + queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectStatus()), "inspect_status", enterpriseStandardInspectVo.getInspectStatus()); + queryWrapper.orderByDesc("create_time"); return queryWrapper; } }