diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java index 6d403bb7..5899d199 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java @@ -150,7 +150,7 @@ public class LawsBindPartController { @PostMapping(value = "/selectClause") public Result>> selectClause(@RequestBody Map parameter) { try { - IPage> data = documentSplitService.queryDocumentSplitDetail(parameter); + IPage> data = documentSplitService.queryDocumentSplitDetail(parameter, false); return Result.OK(data); } catch (JeroBootException e){ return Result.error(e.getMessage()); @@ -166,7 +166,7 @@ public class LawsBindPartController { */ @AutoLog(value = "绑定零部件-条款目录树") @ApiOperation(value="绑定零部件-条款目录树", notes="绑定零部件-条款目录树") - @GetMapping(value = "/selectClause") + @GetMapping(value = "/clauseTree") public Result> clauseTree(SarFileSplitMenuEOPage page) { page.setValidFlag("0"); page.setOrderBy("display_seq asc"); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java index b201465d..a890cb39 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java @@ -57,6 +57,18 @@ public class LawsBindPart implements Serializable { @ApiModelProperty(value = "所属部门") private String orgCode; + /** + * 标准Id + */ + @ApiModelProperty(value = "标准Id") + private String standardId; + + /** + * 标准类型 + */ + @ApiModelProperty(value = "标准类型") + private String standardType; + /** * 零部件号 */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml index b5986ff1..60be2b5f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml @@ -11,6 +11,8 @@ + + @@ -31,24 +33,26 @@ bp.part_no, bp.part_name, bp.doc_split_id, - standard.standard_number, + bp.standard_id, + standard.standard_number AS standardNo, standard.standard_name, - GROUP_CONCAT(lbpd.clause_id ORDER BY split.item_num SEPARATOR ', ') AS clauseIds, - GROUP_CONCAT(split.item_num ORDER BY split.item_num SEPARATOR ', ') AS clauseNos, + GROUP_CONCAT(lbpd.clause_id ORDER BY split.item_num SEPARATOR ',') AS clauseIds, + GROUP_CONCAT(split.item_num ORDER BY split.item_num SEPARATOR ',') AS clauseNos, bp.bind_user, bp.bind_time FROM `laws_bind_part` AS bp - LEFT JOIN sar_file_split_info AS sfsi ON bp.doc_split_id = sfsi.id LEFT JOIN ( select id, standard_number, standard_name from laws_enterprise_standard where del_flag = 0 UNION ALL select id, standard_number, standard_name from laws_domestic_standard where del_flag = 0 UNION ALL select id, standard_number, standard_name from laws_overseas_standard where del_flag = 0 - ) AS standard ON sfsi.standard_id = standard.id + ) AS standard ON bp.standard_id = standard.id + LEFT JOIN sar_file_split_info AS sfsi ON bp.doc_split_id = sfsi.id LEFT JOIN laws_bind_part_doc AS lbpd ON lbpd.bind_id = bp.id LEFT JOIN laws_document_split AS split ON split.id = lbpd.clause_id + LEFT JOIN sys_user AS u ON u.id = bp.bind_user @@ -68,9 +72,11 @@ - AND bp.bind_user = #{param.bindUser} + AND CONCAT(u.realname, '(', u.username, ')') LIKE CONCAT('%',#{param.bindUser},'%') + GROUP BY + bp.id