标准征求意见流程汇总

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java

@@ -114,7 +114,6 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
                         fileNameDto.setFileName(FileNames);//存入
 
                     }
-                    list1.set(a,fileNameDto);
                 }else if (null!=list.get(a).getFileIds()){
                     AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData();
                     FindFileNameDto fileNameDto = list1.get(a);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +53,13 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
         return Result.success("200",publicList);
     }
 
+    @ApiOperation(value = "查询流程汇总-公共意见")
+    @GetMapping("/getPublicIdea")
+    public ResponseMessage getPublicIdea(@Param("unique") String unique){
+        List<SarPublicIdeaAll> publicList =sarPublicIdeaAllDao.getPublicIdea(unique);
+        return Result.success("200",publicList);
+    }
+
 
     @ApiOperation(value = "查询全部意见")
     @GetMapping("/checkIsShow")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java

@@ -3,6 +3,11 @@ package com.adc.da.slrs.sarStandIdea.dao;
 import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
 
+    List<SarPublicIdeaAll> getPublicIdea(@Param("unique")String unique);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java

@@ -10,4 +10,5 @@ public class DetAllStandDto {
     String userId;
     String endTime;
     String Account;
+    String ideaId;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java

@@ -63,5 +63,8 @@ public class SarPublicIdea extends BaseEntity {
     @TableField("stand_type")
     private String standType;
 
+    @TableField("uniques")
+    private String uniques;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java

@@ -58,6 +58,9 @@ public class SarPublicIdeaAll extends BaseEntity {
     @TableField("new_text")
     private String newText;
 
+    @TableField("idea_id")
+    private String ideaId;
+
     public static final String CID = "cid";
 
 }

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

@@ -49,7 +49,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
                 e.printStackTrace();
             }
             QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
-            wrapper.eq("CID", detAllStandDto.getCid());
+            wrapper.eq("idea_id", detAllStandDto.getIdeaId());
             Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize());
             IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
             System.out.println("总条数" + userIPage.getTotal());

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao">
+
+    <select id="getPublicIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
+        SELECT sar_public_idea_all.* FROM sar_public_idea
+        INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
+        WHERE sar_public_idea_all IS NOT NULL and sar_public_idea = #{unique}
+    </select>
 </mapper>