fix(标准主计划): 适用市场更改

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlan.java

@@ -1,5 +1,6 @@
 package com.jero.modules.laws.standardmasterplan.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.modules.laws.documenttool.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -25,7 +26,12 @@ public class LawsStandardMasterPlan extends BaseEntity {
     @ApiModelProperty(value = "标准id")
     private String standardId;
 
+    /**市场法规清单id*/
+    @ApiModelProperty(value = "市场法规清单id")
+    private String marketStandardId;
+
     /**适用市场*/
     @ApiModelProperty(value = "适用市场")
+    @TableField(exist = false)
     private String applicableMarket;
 }

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

@@ -12,9 +12,10 @@
     </select>
 
     <sql id="select">
-        select lsmp.id, lds.id standard_id, standard_number, standard_name, standard_state, lsmp.applicable_market
+        select lsmp.id, lds.id standard_id, standard_number, standard_name, standard_state, lms.country applicableMarket
         from laws_standard_master_plan lsmp
                  left join laws_domestic_standard lds on lsmp.standard_id = lds.id and lds.del_flag = 0
+                 left join laws_market_standard lms on lsmp.market_standard_id = lms.id and lms.del_flag = 0
             ${ew.customSqlSegment}
     </sql>
 </mapper>

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java

@@ -90,7 +90,7 @@ public class LawsStandardMasterPlanServiceImpl
         queryWrapper.like(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getStandardName()),
                 "lds.standard_name", lawsStandardMasterPlanVO.getStandardName());
         queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getApplicableMarket()),
-                "lsmp.applicable_market", lawsStandardMasterPlanVO.getApplicableMarket());
+                "lms.applicable_market", lawsStandardMasterPlanVO.getApplicableMarket());
         queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()),
                 "lsmp.id", lawsStandardMasterPlanVO.getId());
         queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0);

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java

@@ -1,5 +1,6 @@
 package com.jero.modules.laws.standardmasterplan.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,8 +37,13 @@ public class LawsStandardMasterPlanVO implements Serializable {
     @Dict(dicCode = "standard_state")
     private java.lang.String standardState;
 
+    /**市场法规清单id*/
+    @ApiModelProperty(value = "市场法规清单id")
+    private String marketStandardId;
+
     /** 适用市场 */
     @ApiModelProperty(value = "适用市场")
     @Dict(dicCode = "market_state")
+    @TableField(exist = false)
     private java.lang.String applicableMarket;
 }