From 067d02f45e6012e86c840db3f4293b18a1f7bc82 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 11 Sep 2023 16:18:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/service/ILawsCommonService.java | 7 +++++++ .../laws/common/service/impl/LawsCommonServiceImpl.java | 5 +++++ .../controller/EnterpriseStandardInspectController.java | 2 +- .../enterprise/mapper/EnterpriseStandardInspectMapper.java | 3 ++- .../mapper/xml/EnterpriseStandardInspectMapper.xml | 4 ++-- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index 745b9101..4ced9552 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -69,4 +69,11 @@ public interface ILawsCommonService { **/ String deleteByIdsAndModule(String ids, String module); + /** + * @Author: caihaohan + * @Date: 2023/9/11 16:05 + * @Description: 获取体系树 + **/ + String getSystemTree(String module); + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 9d632e98..89518dd9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -402,6 +402,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return MessageUtils.getMessage(ResultCommon.ERROR); } + @Override + public String getSystemTree(String module) { + return null; + } + /** * @Author: liao * @Date: 2023/8/24 9:53 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java index 242359f0..a2ca6ddb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -28,7 +28,7 @@ import javax.annotation.Resource; * @Date: 2022-02-12 * @Version: V1.0 */ -@Api(tags="企标宣贯") +@Api(tags="企标稽查") @RestController @RequestMapping("/enterprise/inspect") @Slf4j diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java index 7e51d8a7..2cc181c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java @@ -5,6 +5,7 @@ import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; +import org.apache.ibatis.annotations.Param; /** * @author ThinkBook @@ -20,7 +21,7 @@ public interface EnterpriseStandardInspectMapper extends BaseMapper page(IPage page, ESQueryCommonDTO esInspect); + IPage page(IPage page, @Param("param") ESQueryCommonDTO esInspect); } 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 86ee7bed..4e60bd0f 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 @@ -40,11 +40,11 @@ FROM `laws_enterprise_standard_inspect` AS i LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no - LEFT JOIN sys_depart AS d on d.id = i.belone_dept + LEFT JOIN sys_depart AS d on d.id = i.belong_dept LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user - WHERE + WHERE 1 = 1 AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')