diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java index 2c89740a..9abc5d86 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java @@ -16,6 +16,8 @@ import java.util.List; */ public interface EsMatingRelationDao extends BaseMapper { + List getDatasOld(@Param("id") String id); + List getDatas(@Param("id") String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java index da0b6092..69e689fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java @@ -35,15 +35,6 @@ public class EsMatingRelation extends BaseEntity { @TableField("stand_id") private String standId; - @ApiModelProperty(value = "标准类型") - @TableField("stand_type") - private String standType; - - @TableField(exist = false) - private String standNumber; - - @TableField(exist = false) - private String standName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 6c95316b..e0eca02a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -76,10 +76,6 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "起草责任单位ID") private String unitName; -// @ApiModelProperty(value = "引用标准json") -// private String rsJson; -// @ApiModelProperty(value = "配套标准json") -// private String ptJson; @ApiModelProperty(value = "引入企业标准json(标准id)") private String rqbJson; @ApiModelProperty(value = "引入企业标准json(标准名称)") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java index ecbf69b6..2744748e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java @@ -15,5 +15,6 @@ import java.util.List; * @since 2021-12-24 */ public interface EsStandRelationDao extends BaseMapper { + List getDatasOld(@Param("id")String id); List getDatas(@Param("id")String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java index 01922222..d81ee237 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java @@ -52,15 +52,6 @@ public class EsStandRelation extends BaseEntity { @TableField("stand_id") private String standId; - @ApiModelProperty(value = "标准类型") - @TableField("stand_type") - private String standType; - - @TableField(exist = false) - private String standNumber; - - @TableField(exist = false) - private String standName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index f5c6e163..2a9b9275 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -48,7 +48,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl list = new QueryWrapper<>(); if ("1".equals(type)) { list.like(StringUtils.isNotEmpty(category), "category", category) - .like(StringUtils.isNotEmpty(cname), "cname", cname) + .like(StringUtils.isNotEmpty(cname), "cid", cname) .ge(start != null, "start_time", start) .le(end != null, "end_time", end) .orderByDesc("start_time"); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml index 5650c148..c86ee615 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml @@ -2,7 +2,7 @@ - select es_mating_relation.id , es_mating_relation.stand_id , es_mating_relation.stand_type,sar_standards_info.STAND_NAME as standName, concat(sar_standards_info.STAND_SORT,concat(' ',concat(concat(sar_standards_info.STAND_NUMBER,concat('-',sar_standards_info.STAND_YEAR))))) as standNumber from es_mating_relation @@ -15,4 +15,9 @@ left join sar_bussioness_stand on es_mating_relation.stand_id = sar_bussioness_stand.ID where es_mating_relation.es_id=#{id} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml index 5a2b1c6e..d56fdac9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml @@ -2,7 +2,7 @@ - select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,sar_standards_info.STAND_NAME as standName, concat(sar_standards_info.STAND_SORT,concat(' ',concat(concat(sar_standards_info.STAND_NUMBER,concat('-',sar_standards_info.STAND_YEAR))))) as standNumber, es_stand_relation.is_relate as isRelate,es_stand_relation.technologic,es_stand_relation.use_level as useLevel,ts_dictype.DIC_TYPE_NAME as useLevelName @@ -17,4 +17,10 @@ left join sar_bussioness_stand on es_stand_relation.stand_id = sar_bussioness_stand.ID where es_stand_relation.es_id=#{id} +