Merge remote-tracking branch 'origin/develop_master' into develop_3

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

@@ -15,11 +15,8 @@ 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;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import javax.servlet.http.HttpServletResponse;
@@ -77,6 +74,14 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
 
     }
 
+    @ApiOperation(value = "增加意见")
+    @PostMapping("/saveBatch")
+    public ResponseMessage saveBatch(@RequestBody List<SarPublicIdeaAll> sar){
+           boolean flag=sarPublicIdeaAllImpl.saveBatch(sar);
+           return Result.success("200",flag);
+
+    }
+
     @ApiOperation(value = "删除意见")
     @GetMapping("/deleteStand")
     public ResponseMessage deleteStand(DelStandDto delStandDto){
@@ -94,7 +99,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
 
     @ApiOperation(value = "导出全部意见")
     @GetMapping("/tuallStand")
-    public void getAllStand(HttpServletResponse response,String cid){
+    public void getAllStand(HttpServletResponse response,@RequestParam(value = "cid")String cid,@RequestParam(value = "type",required = false)String type){
         try {
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
@@ -102,7 +107,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             List<SarPublicIdeaAll> data=new ArrayList<>();
             if (!StringUtils.isEmpty(cid)){
-                data=sarPublicIdeaAllDao.getPublicAllIdea(cid);
+                data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type);
             }
             List<GetExcelDto> standExcel=new ArrayList<>();
             for (SarPublicIdeaAll sarPublicIdeaAll:data){

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

@@ -27,5 +27,5 @@ public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
 
     Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
 
-    List<SarPublicIdeaAll> getPublicAllIdea(@Param("cid") String cid);
+    List<SarPublicIdeaAll> getPublicAllIdea(@Param("cid") String cid,@Param("type")String type);
 }

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

@@ -72,5 +72,8 @@ public class SarPublicIdea extends BaseEntity {
     @TableField("files_name")
     private String filesName;
 
+    @TableField("wkfiles")
+    private String wkfiles;
+
 
 }

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

@@ -63,4 +63,13 @@ public class SarPublicIdeaAll extends BaseEntity {
 
     public static final String CID = "cid";
 
+    @TableField("chapter_name")
+    private String chapterName;
+
+    @TableField(exist = false)
+    private String department;
+
+    @TableField("wk_flag")
+    private String wkFlag;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java

@@ -162,7 +162,7 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
     @GetMapping("/querySourceFileInfo")
     public ResponseMessage<List<SarStandFileEO>> querySourceFileInfo(String standId){
 
-        List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId);
+        List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.querySourceFileInfo(standId);
         return Result.success(sarStandFileEOS);
     }
 }