feat(laws-modules): 查看返回参数增加

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 = "标准主计划_子表信息")

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/LawsStandardMasterPlanMapper.java

@@ -33,5 +33,5 @@ public interface LawsStandardMasterPlanMapper extends BaseMapper<LawsStandardMas
      * @param queryWrapper
      * @return
      */
-    LawsStandardMasterPlanVO queryByList(QueryWrapper<LawsStandardMasterPlanVO> queryWrapper);
+    LawsStandardMasterPlanVO queryByList(@Param(Constants.WRAPPER) QueryWrapper<LawsStandardMasterPlanVO> queryWrapper);
 }

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml

@@ -12,7 +12,7 @@
     </select>
 
     <sql id="select">
-        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

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<LawsStandardMasterPlanSublist> 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);
+        LawsStandardMasterPlanVO lawsStandardMasterPlanVO = new LawsStandardMasterPlanVO();
-        lawsStandardMasterPlanDetailsVO.setLawsStandardMasterPlan(lawsStandardMasterPlan);
+        lawsStandardMasterPlanVO.setId(id);
+        lawsStandardMasterPlanDetailsVO.setLawsStandardMasterPlanVO(queryByList(lawsStandardMasterPlanVO));
 
         // 查询 标准主计划_子表信息
         List<LawsStandardMasterPlanSublist> lawsStandardMasterPlanSublistList =

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;