diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 82fb5ece..f1d5d28a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -84,6 +84,15 @@ public class SarPublicIdeaAllController extends BaseController } + + @ApiOperation(value = "增加意见") + @PostMapping("/saveBatchByWk") + public ResponseMessage saveBatchByWk(@RequestBody List 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 .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 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") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java index 6d2b104d..fc79bf30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java +++ b/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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 72cfc5f8..589fb322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/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; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index a9f5c8c2..a55a303a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/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 @@