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

fix(稽查稽查): 79424

Browse Source
This commit is contained in:
yjz
2023-12-19 09:31:07 +08:00
parent 64fb127eac
commit 4fc063496e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
-2
View File
@@ -79,7 +79,6 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
@AutoLog(value = "企标稽查-分页列表查询2") @AutoLog(value = "企标稽查-分页列表查询2")
@ApiOperation(value="企标稽查-分页列表查询2", notes="企标稽查-分页列表查询2") @ApiOperation(value="企标稽查-分页列表查询2", notes="企标稽查-分页列表查询2")
@GetMapping(value = "/queryByPage") @GetMapping(value = "/queryByPage")
// @Translation
public Result<IPage<EnterpriseStandardInspectVo>> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, public Result<IPage<EnterpriseStandardInspectVo>> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo,
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
@@ -95,7 +94,6 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
@AutoLog(value = "企标稽查-列表查询2") @AutoLog(value = "企标稽查-列表查询2")
@ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2") @ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2")
@GetMapping(value = "/queryByList") @GetMapping(value = "/queryByList")
// @Translation
public Result<List<EnterpriseStandardInspectVo>> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { public Result<List<EnterpriseStandardInspectVo>> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo)); return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo));
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
+3 -1
View File
@@ -195,10 +195,12 @@
complete_date, complete_date,
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
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
group by lesi.id) t group by lesi.id) t
${ew.customSqlSegment} ${ew.customSqlSegment}
</sql> </sql>