公开征求意见 查询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");