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

fix(企标稽查): 81044

Browse Source
This commit is contained in:
yjz
2024-01-22 09:06:24 +08:00
parent 9b327d535a
commit 25753634bd
2 changed files with 4 additions and 2 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
+3 -1
View File
@@ -197,11 +197,13 @@
actual_inspect_user, actual_inspect_user,
inspect_status, inspect_status,
group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object, group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object,
(IF(lesid.id IS NOT NULL, TRUE, FALSE)) delay_flag (IF(lesid.id IS NOT NULL, TRUE, FALSE)) delay_flag,
realname
from laws_enterprise_standard_inspect lesi 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 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 left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
left join laws_enterprise_standard_inspect_delay lesid on lesi.id = lesid.inspect_id left join laws_enterprise_standard_inspect_delay lesid on lesi.id = lesid.inspect_id
left join sys_user u on lesi.inspect_user = u.id
group by lesi.id) t group by lesi.id) t
${ew.customSqlSegment} ${ew.customSqlSegment}
</sql> </sql>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+1 -1
View File
@@ -398,7 +398,7 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept()); queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept());
queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo()); queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo());
queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName()); queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName());
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "inspect_user", enterpriseStandardInspectVo.getInspectUser()); queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "realname", enterpriseStandardInspectVo.getInspectUser());
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
return queryWrapper; return queryWrapper;
} }