From 986db0079db6fabab37cabd9f76400287caa6de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 31 Mar 2023 16:36:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysPdfTemplateController.java | 13 ++++++++++++- .../api/entity/system/SystemPDFTemplateEntity.java | 3 +++ .../api/req/system/SysPdfTemplateSaveRequest.java | 4 ++++ .../api/res/system/SystemPDFTemplateResponse.java | 4 ++++ .../mybatis/mapper/system/SystemPDFTemplateDao.xml | 8 +++++--- 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index fefb9455..95cf3a9b 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.File; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -47,6 +48,9 @@ public class SysPdfTemplateController { List systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); BeanUtils.copyProperties(item, systemPDFTemplateResponse); + if(item.getBussinessStatus()!=null){ + systemPDFTemplateResponse.setBussinessStatusList(Arrays.asList(item.getBussinessStatus().split(","))); + } return systemPDFTemplateResponse; }).collect(Collectors.toList()); @@ -115,7 +119,10 @@ public class SysPdfTemplateController { SystemPDFTemplateEntity systemPDFTemplateEntity = new SystemPDFTemplateEntity(); BeanUtils.copyProperties(sysPdfTemplateSaveRequest, systemPDFTemplateEntity); - + if(sysPdfTemplateSaveRequest.getBussinessStatusList().size()>0){ + String bussinessStatus = String.join(",", sysPdfTemplateSaveRequest.getBussinessStatusList()); + systemPDFTemplateEntity.setBussinessStatus(bussinessStatus); + } systemPDFTemplateEntity.setCreate_time(new Date()); systemPDFTemplateEntity.setUpdate_time(new Date()); @@ -131,6 +138,10 @@ public class SysPdfTemplateController { @PostMapping("/system/pdf/template/update") public BaseResponse update(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) { // systemPDFTemplateSaveRequest.setId(1); + if(sysPdfTemplateSaveRequest.getBussinessStatusList().size()>0){ + String bussinessStatus = String.join(",", sysPdfTemplateSaveRequest.getBussinessStatusList()); + sysPdfTemplateSaveRequest.setBussinessStatus(bussinessStatus); + } sysPdfTemplateSaveRequest.setUpdate_time(new Date()); systemPDFTemplateService.updateById(sysPdfTemplateSaveRequest); diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java index da7656a2..78080d25 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java @@ -3,6 +3,7 @@ package com.glxp.api.entity.system; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class SystemPDFTemplateEntity { @@ -19,4 +20,6 @@ public class SystemPDFTemplateEntity { private Date create_time; private Date update_time; private String jrxmlPath; + private Integer bussinessType; + private String bussinessStatus; } diff --git a/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java b/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java index b59edb36..9884f055 100644 --- a/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java @@ -3,6 +3,7 @@ package com.glxp.api.req.system; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class SysPdfTemplateSaveRequest { @@ -19,4 +20,7 @@ public class SysPdfTemplateSaveRequest { private Date create_time; private Date update_time; private String jrxmlPath; + private Integer bussinessType; + private List bussinessStatusList; + private String bussinessStatus; } diff --git a/src/main/java/com/glxp/api/res/system/SystemPDFTemplateResponse.java b/src/main/java/com/glxp/api/res/system/SystemPDFTemplateResponse.java index d88058c3..9ced2e04 100644 --- a/src/main/java/com/glxp/api/res/system/SystemPDFTemplateResponse.java +++ b/src/main/java/com/glxp/api/res/system/SystemPDFTemplateResponse.java @@ -3,6 +3,7 @@ package com.glxp.api.res.system; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class SystemPDFTemplateResponse { @@ -19,4 +20,7 @@ public class SystemPDFTemplateResponse { private Date create_time; private Date update_time; private String jrxmlPath; + private Integer bussinessType; + private String bussinessStatus; + private List bussinessStatusList; } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index f024c5cc..875b46d7 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -5,7 +5,7 @@