公开征求意见模块导出上报意见功能 修复

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

@@ -84,6 +84,15 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
 
     }
 
+
+    @ApiOperation(value = "增加意见")
+    @PostMapping("/saveBatchByWk")
+    public ResponseMessage saveBatchByWk(@RequestBody List<SarPublicIdeaAll> sar){
+           boolean flag=sarPublicIdeaAllImpl.saveOrUpdateBatch(sar);
+           return Result.success("200",flag);
+
+    }
+
     @ApiOperation(value = "删除意见")
     @GetMapping("/deleteStand")
     public ResponseMessage deleteStand(DelStandDto delStandDto){
@@ -136,6 +145,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
                             .userName(sarPublicIdeaAll.getUserName())
                             .deptName(sarPublicIdeaAll.getDeptName())
                             .state(map.get(sarPublicIdeaAll.getState()))
+                            .cause(sarPublicIdeaAll.getCause())
                             .build();
                     standExcel2.add(getExcelDto);
                 }else {
@@ -160,6 +170,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             headList.add(Lists.newArrayList("提出人"));
             if ("1".equals(type)){
                 headList.add(Lists.newArrayList("处理意见"));
+                headList.add(Lists.newArrayList("原因"));
             }
             if ("1".equals(type)) {
                 EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1")

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

@@ -37,6 +37,8 @@ public class GetExcelDto2 {
 
     private String state;
 
+    private String cause;
+
 
 
 }

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

@@ -75,4 +75,7 @@ public class SarPublicIdeaAll extends BaseEntity {
     @TableField("state")
     private String state;
 
+    @TableField("cause")
+    private String cause;
+
 }

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

@@ -6,7 +6,7 @@
         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
          sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
          sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
-         sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag
+         sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause
         FROM sar_public_idea
         INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
         left join ts_user on ts_user.USID = sar_public_idea_all.user_id
@@ -17,7 +17,8 @@
     <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
          SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag,
          sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
-         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName
+         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName,
+         sar_public_idea_all.cause
          FROM sar_public_idea_all
          left join ts_user on sar_public_idea_all.user_id=ts_user.USID
          left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
@@ -33,7 +34,7 @@
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
@@ -48,7 +49,7 @@
     </select>
 
     <select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID