公开征求意见 查询bug修复

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<EsMatingRelation> {
 
+    List<EsMatingRelation> getDatasOld(@Param("id") String id);
+
     List<EsMatingRelation> getDatas(@Param("id") String id);
 
 }

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;
 
 
 }

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(标准名称)")

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<EsStandRelation> {
+    List<EsStandRelation> getDatasOld(@Param("id")String id);
     List<EsStandRelation> getDatas(@Param("id")String id);
 }

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;
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java

@@ -48,7 +48,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         QueryWrapper<SarPublicIdea> 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");

adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.esMatingRelation.dao.EsMatingRelationDao">
 
-    <select id="getDatas" resultType="com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation">
+    <select id="getDatasOld" resultType="com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation">
         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}
     </select>
+    <select id="getDatas" resultType="com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation">
+        select es_mating_relation.id , es_mating_relation.stand_id
+        from es_mating_relation
+        where es_mating_relation.es_id=#{id}
+    </select>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.esStandRelation.dao.EsStandRelationDao">
 
-    <select id="getDatas" resultType="com.adc.da.slrs.esStandRelation.entity.EsStandRelation">
+    <select id="getDatasOld" resultType="com.adc.da.slrs.esStandRelation.entity.EsStandRelation">
         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}
     </select>
+    <select id="getDatas" resultType="com.adc.da.slrs.esStandRelation.entity.EsStandRelation">
+        select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,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
+        from es_stand_relation
+        left join ts_dictype on es_stand_relation.use_level = ts_dictype.DIC_TYPE_CODE
+        where es_stand_relation.es_id=#{id}
+    </select>
 </mapper>