From e7899b32a05bc9f2a8e39f55ec6397ec5af8a788 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 14 Jun 2024 17:51:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(laws-modules):=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/LawsStandardMasterPlanDTO.java | 4 ++-- .../mapper/LawsStandardMasterPlanMapper.java | 2 +- .../LawsStandardMasterPlanSublistMapper.xml | 2 +- .../LawsStandardMasterPlanServiceImpl.java | 19 ++++++++++++++----- .../vo/LawsStandardMasterPlanVO.java | 4 ++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/dto/LawsStandardMasterPlanDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/dto/LawsStandardMasterPlanDTO.java index 0a708809..f607e665 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/dto/LawsStandardMasterPlanDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/dto/LawsStandardMasterPlanDTO.java @@ -1,7 +1,7 @@ package com.jero.modules.laws.standardmasterplan.dto; -import com.jero.modules.laws.standardmasterplan.entity.LawsStandardMasterPlan; import com.jero.modules.laws.standardmasterplan.entity.LawsStandardMasterPlanSublist; +import com.jero.modules.laws.standardmasterplan.vo.LawsStandardMasterPlanVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +19,7 @@ import java.util.List; public class LawsStandardMasterPlanDTO implements Serializable { /** 标准主计划基础信息 */ @ApiModelProperty(value = "标准主计划基础信息") - private LawsStandardMasterPlan lawsStandardMasterPlan; + private LawsStandardMasterPlanVO lawsStandardMasterPlanVO; /** 信息输入 */ @ApiModelProperty(value = "标准主计划_子表信息") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/LawsStandardMasterPlanMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/LawsStandardMasterPlanMapper.java index c6ed79eb..510b9a18 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/LawsStandardMasterPlanMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/LawsStandardMasterPlanMapper.java @@ -33,5 +33,5 @@ public interface LawsStandardMasterPlanMapper extends BaseMapper queryWrapper); + LawsStandardMasterPlanVO queryByList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml index 62326fbb..f24255bc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml @@ -12,7 +12,7 @@ - select lsmp.id, standard_number, standard_name, standard_state, applicable_market + select lsmp.id, s.id standard_id, standard_number, standard_name, standard_state, applicable_market from laws_standard_master_plan lsmp left join (select * from (select id, standard_number, standard_name, standard_state diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java index 014adc4e..63f4b588 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java @@ -93,21 +93,26 @@ public class LawsStandardMasterPlanServiceImpl "standard_name", lawsStandardMasterPlanVO.getStandardName()); queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getApplicableMarket()), "applicable_market", lawsStandardMasterPlanVO.getApplicableMarket()); + queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()), + "lsmp.id", lawsStandardMasterPlanVO.getId()); return queryWrapper; } @Override public void add(LawsStandardMasterPlanDTO lawsStandardMasterPlanDTO) { // 保存 标准主计划基础信息 - LawsStandardMasterPlan lawsStandardMasterPlan = lawsStandardMasterPlanDTO.getLawsStandardMasterPlan(); + LawsStandardMasterPlanVO lawsStandardMasterPlanVO = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanVO(); + LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); lawsStandardMasterPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); + lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); + lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket()); save(lawsStandardMasterPlan); // 保存 标准主计划_子表信息 List lawsStandardMasterPlanSublistList = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanSublistList(); lawsStandardMasterPlanSublistList = lawsStandardMasterPlanSublistList.stream() - .map(v -> v.setMasterPlanId(lawsStandardMasterPlan.getId())) + .map(v -> v.setMasterPlanId(lawsStandardMasterPlanVO.getId())) .collect(Collectors.toList()); lawsStandardMasterPlanSublistService.saveBatch(lawsStandardMasterPlanSublistList); } @@ -115,7 +120,10 @@ public class LawsStandardMasterPlanServiceImpl @Override public void edit(LawsStandardMasterPlanDTO lawsStandardMasterPlanDTO) { // 编辑 标准主计划基础信息 - LawsStandardMasterPlan lawsStandardMasterPlan = lawsStandardMasterPlanDTO.getLawsStandardMasterPlan(); + LawsStandardMasterPlanVO lawsStandardMasterPlanVO = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanVO(); + LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); + lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); + lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket()); updateById(lawsStandardMasterPlan); // 编辑 标准主计划_子表信息 @@ -148,8 +156,9 @@ public class LawsStandardMasterPlanServiceImpl public LawsStandardMasterPlanDetailsVO queryDetails(String id) { LawsStandardMasterPlanDetailsVO lawsStandardMasterPlanDetailsVO = new LawsStandardMasterPlanDetailsVO(); // 查询 标准主计划基础信息 - LawsStandardMasterPlan lawsStandardMasterPlan = getById(id); - lawsStandardMasterPlanDetailsVO.setLawsStandardMasterPlan(lawsStandardMasterPlan); + LawsStandardMasterPlanVO lawsStandardMasterPlanVO = new LawsStandardMasterPlanVO(); + lawsStandardMasterPlanVO.setId(id); + lawsStandardMasterPlanDetailsVO.setLawsStandardMasterPlanVO(queryByList(lawsStandardMasterPlanVO)); // 查询 标准主计划_子表信息 List lawsStandardMasterPlanSublistList = diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java index 3ef19c63..f83c33ee 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java @@ -19,6 +19,10 @@ public class LawsStandardMasterPlanVO implements Serializable { @ApiModelProperty(value = "ID") private java.lang.String id; + /** 标准id */ + @ApiModelProperty(value = "标准id") + private java.lang.String standardId; + /** 标准编号 */ @ApiModelProperty(value = "标准编号") private java.lang.String standardNumber;