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-11-24 14:58:06 +08:00
parent 2a0249153f
commit 2460d8339e
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
+21 -20
View File
@@ -179,26 +179,27 @@
</select> </select>
<sql id="select_laws_enterprise_standard_inspect"> <sql id="select_laws_enterprise_standard_inspect">
select lesi.id, select t.*
lesi.create_by, from (select lesi.id,
lesi.create_time, lesi.create_by,
lesi.update_by, lesi.create_time,
lesi.update_time, lesi.update_by,
inspect_no, lesi.update_time,
(IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, inspect_no,
standardization_work_group, (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name,
belong_dept, standardization_work_group,
plan_inspect_date, belong_dept,
inspect_user, plan_inspect_date,
standardization_docking_user, inspect_user,
complete_date, standardization_docking_user,
actual_inspect_user, complete_date,
inspect_status, actual_inspect_user,
group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object inspect_status,
from laws_enterprise_standard_inspect lesi group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object
left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0' from laws_enterprise_standard_inspect lesi
left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id 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} ${ew.customSqlSegment}
group by lesi.id
</sql> </sql>
</mapper> </mapper>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+4 -3
View File
@@ -185,12 +185,13 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
@NotNull @NotNull
private static QueryWrapper<EnterpriseStandardInspectVo> getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { private static QueryWrapper<EnterpriseStandardInspectVo> getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = new QueryWrapper<>(); QueryWrapper<EnterpriseStandardInspectVo> 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())){ if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getIds())){
List<String> list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(",")); List<String> 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; return queryWrapper;
} }
} }