From fed0b3dc858cd0bdd9541d870bc83bf8af646228 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 12 Jan 2022 10:20:28 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E5=AF=BC=E5=87=BA=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/controller/SarPublicIdeaAllController.java | 6 +++--- .../com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) 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 fcd93676..33e28534 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 @@ -123,6 +123,7 @@ public class SarPublicIdeaAllController extends BaseController Map map=new HashMap<>(); map.put("1","上报"); map.put("2","处理后上报"); + map.put("3","不上报"); String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); @@ -156,6 +157,7 @@ public class SarPublicIdeaAllController extends BaseController .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) .cause(sarPublicIdeaAll.getCause()) .build(); standExcel.add(getExcelDto); @@ -169,9 +171,7 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出人")); - if ("1".equals(type)){ - headList.add(Lists.newArrayList("处理意见")); - } + 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/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index fc5a877b..505f964e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -38,6 +38,8 @@ public class GetExcelDto { // @ExcelProperty("提出人") private String userName; + private String state; + private String cause; From d93e9fb2ba3db1cfa2d00eddaac23124eca98b23 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 12 Jan 2022 11:00:25 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/controller/SarPublicIdeaController.java | 8 ++++---- .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index e447f216..7b0341a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -74,10 +74,10 @@ public class SarPublicIdeaController extends BaseController { // c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 // sarPublicIdea.setStartTime(c.getTime()); // -// Calendar c2 = Calendar.getInstance(); -// c2.setTime(sarPublicIdea.getEndTime()); -// c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 -// sarPublicIdea.setEndTime(c2.getTime()); + Calendar c2 = Calendar.getInstance(); + c2.setTime(sarPublicIdea.getEndTime()); + c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 + sarPublicIdea.setEndTime(c2.getTime()); sarPublicIdeaService.save(sarPublicIdea); }catch(Exception e){ 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 3fe43621..94b5e2fa 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 @@ -11,7 +11,7 @@ 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 left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID - WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} and sar_public_idea_all.wk_flag is null + WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}