From 59ca6ccc9feab59c241062bb50dbcde9ed60375e Mon Sep 17 00:00:00 2001 From: liuyuan <18551621088@163.com> Date: Wed, 15 May 2024 15:05:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java | 2 ++ src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java b/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java index 09b69d0..879c440 100644 --- a/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java +++ b/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java @@ -1,6 +1,7 @@ package com.szr.zdryztpg.service.impl; import com.szr.common.model.PageUtil; +import com.szr.data.scope.annotation.DataScope; import com.szr.zdryztpg.entity.ZdryJcjdztpgInfo; import com.szr.zdryztpg.mapper.ZdryJcjdztpgInfoMapper; import com.szr.zdryztpg.model.ZtpgPageListDTO; @@ -25,6 +26,7 @@ public class ZdryJcjdztpgServiceImpl implements ZdryJcjdztpgInfoService { private ZdryJcjdztpgInfoMapper zdryJcjdztpgInfoMapper; @Override + @DataScope(mainAlias = "zji") public PageUtil queryPageList(ZtpgPageListDTO params) { int beginIndex = (params.getPage() - 1) * params.getPageSize() + 1; int endIndex = params.getPage() * params.getPageSize(); diff --git a/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml b/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml index 94ad630..ece2e8a 100644 --- a/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml +++ b/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml @@ -597,6 +597,9 @@ and to_char(zji.jcsj,'yyyy-MM-dd HH:mm:ss') #{jcjssj,jdbcType=VARCHAR} + + ${params.dataScope} + order by zji.jcsj desc limit #{pageSize} offset (#{pageSize} * (#{page}-1)) @@ -631,6 +634,9 @@ and to_char(zji.jcsj,'yyyy-MM-dd HH:mm:ss') #{jcjssj,jdbcType=VARCHAR} + + ${params.dataScope} + \ No newline at end of file From 00aad469b67153d80f9d1b0488129eb5da06f4e9 Mon Sep 17 00:00:00 2001 From: liuyuan <18551621088@163.com> Date: Thu, 16 May 2024 16:53:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +- .../zdryztpg/controller/ZdryztpgController.java | 27 ++++++ .../zdryztpg/mapper/ZdryJcjdztpgInfoMapper.java | 2 + .../szr/zdryztpg/model/ZdryztpgExportModel.java | 107 +++++++++++++++++++++ .../zdryztpg/service/ZdryJcjdztpgInfoService.java | 5 + .../service/impl/ZdryJcjdztpgServiceImpl.java | 7 ++ .../resources/mapper/ZdryJcjdztpgInfoMapper.xml | 35 +++++++ 7 files changed, 188 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java diff --git a/pom.xml b/pom.xml index caa6f2d..ba75301 100644 --- a/pom.xml +++ b/pom.xml @@ -146,11 +146,11 @@ mybatis-generator-core 1.3.6 - - - - - + + com.alibaba + easyexcel + ${easyexcel.version} + commons-beanutils commons-beanutils diff --git a/src/main/java/com/szr/zdryztpg/controller/ZdryztpgController.java b/src/main/java/com/szr/zdryztpg/controller/ZdryztpgController.java index b4221c7..3546053 100644 --- a/src/main/java/com/szr/zdryztpg/controller/ZdryztpgController.java +++ b/src/main/java/com/szr/zdryztpg/controller/ZdryztpgController.java @@ -2,14 +2,21 @@ package com.szr.zdryztpg.controller; import com.szr.common.model.BaseResponse; import com.szr.common.model.PageUtil; +import com.szr.zdryztpg.entity.ZdryJcjdztpgInfo; import com.szr.zdryztpg.model.*; import com.szr.zdryztpg.service.ZdryJcjdztpgInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.time.DateFormatUtils; import org.springframework.web.bind.annotation.*; +import com.alibaba.excel.EasyExcel; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.Date; +import java.util.List; /** * 重点人员监控检查质态评估 @@ -38,4 +45,24 @@ public class ZdryztpgController { .build(); } + @PostMapping("/dataExport") + @ApiOperation(value = "质态评估数据导出") + public void dataExport(@RequestBody ZtpgPageListDTO params, HttpServletResponse response) throws Exception { + List ztpgPageListVOS = zdryJcjdztpgInfoService.queryList(params); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + //防止中文乱码 + String fileName = generateFileName(); + fileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), ZdryztpgExportModel.class).autoCloseStream(Boolean.FALSE).sheet("警情巡查数据") + .doWrite(ztpgPageListVOS); + } + + private String generateFileName() { + //自定义文件名 + return "重点人员检查监督-质态评估" + DateFormatUtils.format(new Date(), "yyyyMMddhhmmssSSS"); + } + } diff --git a/src/main/java/com/szr/zdryztpg/mapper/ZdryJcjdztpgInfoMapper.java b/src/main/java/com/szr/zdryztpg/mapper/ZdryJcjdztpgInfoMapper.java index 17f23e3..49f8562 100644 --- a/src/main/java/com/szr/zdryztpg/mapper/ZdryJcjdztpgInfoMapper.java +++ b/src/main/java/com/szr/zdryztpg/mapper/ZdryJcjdztpgInfoMapper.java @@ -99,4 +99,6 @@ public interface ZdryJcjdztpgInfoMapper { int countByParams(ZtpgPageListDTO params); List queryListByPage(ZtpgPageListDTO params); + + List queryList(ZtpgPageListDTO params); } \ No newline at end of file diff --git a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java new file mode 100644 index 0000000..e7d6607 --- /dev/null +++ b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java @@ -0,0 +1,107 @@ +package com.szr.zdryztpg.model; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; + +import java.util.Date; + +/** + * @ClassName ZdryztpgExportModel + * @Description TODO + * @Author ly + * @Date 2024/05/15 16:41 + * @Version 1.0 + **/ +public class ZdryztpgExportModel { + + @ExcelIgnore + private Integer id; + + @ExcelIgnore + private Date createTime; + + @ExcelProperty(value = "人员类型" ,index = 0) + @ColumnWidth(12) + private String rylx; + + @ExcelProperty(value = "身份号码" ,index = 1) + @ColumnWidth(12) + private String sfzhm; + + @ExcelProperty(value = "姓名" ,index = 2) + private String ryxm; + + @ExcelProperty(value = {"风险评估", "填写内容"} ,index = 3) + @ColumnWidth(12) + private String fxpgtxnr; + + @ExcelProperty(value = {"风险评估", "检查结果"} ,index = 4) + @ColumnWidth(12) + private String fxpgjcjg; + + @ExcelProperty(value = {"现实表现", "填写内容"} ,index = 5) + @ColumnWidth(12) + private String xsbxtxnr; + + @ExcelProperty(value = {"现实表现", "检查结果"} ,index = 6) + @ColumnWidth(12) + private String xsbxjcjg; + + @ExcelProperty(value = {"活动地", "填写内容"} ,index = 7) + @ColumnWidth(12) + private String hdztxnr; + + @ExcelProperty(value = {"活动地", "检查结果"} ,index = 8) + @ColumnWidth(12) + private String hdzjcjg; + + @ExcelProperty(value = {"在控情况", "填写内容"} ,index = 9) + @ColumnWidth(12) + private String zkqktxnr; + + @ExcelProperty(value = {"在控情况", "检查结果"} ,index = 10) + @ColumnWidth(12) + private String zkqkjcjg; + + @ExcelProperty(value = {"现实表现近三次情况", "填写内容"} ,index = 11) + @ColumnWidth(14) + private String jscqktxnr; + + @ExcelProperty(value = {"现实表现近三次情况", "检查结果"} ,index = 12) + @ColumnWidth(14) + private String jscqkjcjg; + + @ExcelProperty(value = {"是否见面&现实表现", "填写内容"} ,index = 13) + @ColumnWidth(12) + private String sfjmtxnr; + + @ExcelProperty(value = {"是否见面&现实表现", "检查结果"} ,index = 14) + @ColumnWidth(12) + private String sfjmjcjg; + + @ExcelProperty(value = {"现实表现&风险评估", "填写内容"} ,index = 15) + @ColumnWidth(12) + private String xsbxfxpgtxnr; + + @ExcelProperty(value = {"现实表现&风险评估", "检查结果"} ,index = 16) + @ColumnWidth(12) + private String xsbxfxpgjcjg; + + @ExcelProperty(value = "管控类型" ,index = 17) + @ColumnWidth(12) + private String gklx; + + @ExcelProperty(value = {"附件", "附件名称"} ,index = 18) + @ColumnWidth(12) + private String fjmc; + + @ExcelProperty(value = {"附件", "检查结果"} ,index = 19) + @ColumnWidth(12) + private String fjjcjg; + + @ExcelProperty(value = "检查时间" ,index = 20) + @ColumnWidth(12) + private Date jcsj; + +} diff --git a/src/main/java/com/szr/zdryztpg/service/ZdryJcjdztpgInfoService.java b/src/main/java/com/szr/zdryztpg/service/ZdryJcjdztpgInfoService.java index 5a43cb1..6e6f2e1 100644 --- a/src/main/java/com/szr/zdryztpg/service/ZdryJcjdztpgInfoService.java +++ b/src/main/java/com/szr/zdryztpg/service/ZdryJcjdztpgInfoService.java @@ -1,9 +1,12 @@ package com.szr.zdryztpg.service; import com.szr.common.model.PageUtil; +import com.szr.zdryztpg.entity.ZdryJcjdztpgInfo; import com.szr.zdryztpg.model.ZtpgPageListDTO; import com.szr.zdryztpg.model.ZtpgPageListVO; +import java.util.List; + /** * 重点人员质态评估 service * @@ -13,4 +16,6 @@ import com.szr.zdryztpg.model.ZtpgPageListVO; public interface ZdryJcjdztpgInfoService { PageUtil queryPageList(ZtpgPageListDTO params); + + List queryList(ZtpgPageListDTO params); } diff --git a/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java b/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java index 879c440..16a65c3 100644 --- a/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java +++ b/src/main/java/com/szr/zdryztpg/service/impl/ZdryJcjdztpgServiceImpl.java @@ -41,4 +41,11 @@ public class ZdryJcjdztpgServiceImpl implements ZdryJcjdztpgInfoService { return new PageUtil<>(counts, params.getPage(), params.getPageSize(), checkInfoPageListVOS); } + + @Override + @DataScope(mainAlias = "zji") + public List queryList(ZtpgPageListDTO params) { + List zdryJcjdztpgInfos = zdryJcjdztpgInfoMapper.queryList(params); + return zdryJcjdztpgInfos; + } } diff --git a/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml b/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml index ece2e8a..6492a8e 100644 --- a/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml +++ b/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml @@ -639,4 +639,39 @@ + \ No newline at end of file From 9b6e888fe8849c269bc9e0641183363885a08aff Mon Sep 17 00:00:00 2001 From: liuyuan <18551621088@163.com> Date: Thu, 6 Jun 2024 18:56:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/bootstrap-prod.yml | 3 +++ src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/resources/bootstrap-prod.yml b/src/main/resources/bootstrap-prod.yml index f0f47d2..12e6f64 100644 --- a/src/main/resources/bootstrap-prod.yml +++ b/src/main/resources/bootstrap-prod.yml @@ -4,6 +4,9 @@ spring: discovery: server-addr: 50.34.174.7:8848 namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a +# 鼓楼 +# server-addr: 50.32.58.101:8848 +# namespace: e2cee560-834b-4de8-9603-71100a82ba79 group: DEFAULT_GROUP config: namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a diff --git a/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml b/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml index 6492a8e..994cf7f 100644 --- a/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml +++ b/src/main/resources/mapper/ZdryJcjdztpgInfoMapper.xml @@ -577,7 +577,7 @@ and (zji.ryxm like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or zji.sfzhm like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or zji.rylx like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or - zji.gklx like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or) + zji.gklx like '%'||#{keyWord,jdbcType=VARCHAR}||'%') and zji.rylx = #{rylx,jdbcType=VARCHAR} @@ -614,7 +614,7 @@ and (zji.ryxm like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or zji.sfzhm like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or zji.rylx like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or - zji.gklx like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or) + zji.gklx like '%'||#{keyWord,jdbcType=VARCHAR}||'%') and zji.rylx = #{rylx,jdbcType=VARCHAR} @@ -648,7 +648,7 @@ and (zji.ryxm like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or zji.sfzhm like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or zji.rylx like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or - zji.gklx like '%'||#{keyWord,jdbcType=VARCHAR}||'%' or) + zji.gklx like '%'||#{keyWord,jdbcType=VARCHAR}||'%') and zji.rylx = #{rylx,jdbcType=VARCHAR} From e93f038f463f6aa6ebf8e76f5aad553ea604d6c3 Mon Sep 17 00:00:00 2001 From: liuyuan <18551621088@163.com> Date: Wed, 26 Jun 2024 17:50:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=87=8D=E5=8E=BB=E6=8E=89=E7=8E=B0=E5=AE=9E=E8=A1=A8=E7=8E=B0?= =?UTF-8?q?&=E9=A3=8E=E9=99=A9=E8=AF=84=E4=BC=B0=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java index e7d6607..517daef 100644 --- a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java +++ b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java @@ -80,12 +80,10 @@ public class ZdryztpgExportModel { @ColumnWidth(12) private String sfjmjcjg; - @ExcelProperty(value = {"现实表现&风险评估", "填写内容"} ,index = 15) - @ColumnWidth(12) + @ExcelIgnore private String xsbxfxpgtxnr; - @ExcelProperty(value = {"现实表现&风险评估", "检查结果"} ,index = 16) - @ColumnWidth(12) + @ExcelIgnore private String xsbxfxpgjcjg; @ExcelProperty(value = "管控类型" ,index = 17) From e07cf80aa215e04551c4f865e59ec9c2bf45769e Mon Sep 17 00:00:00 2001 From: liuyuan <18551621088@163.com> Date: Wed, 26 Jun 2024 18:40:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=87=8D=E5=8E=BB=E6=8E=89=E7=8E=B0=E5=AE=9E=E8=A1=A8=E7=8E=B0?= =?UTF-8?q?&=E9=A3=8E=E9=99=A9=E8=AF=84=E4=BC=B0=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java index 517daef..6d47c78 100644 --- a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java +++ b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java @@ -86,19 +86,19 @@ public class ZdryztpgExportModel { @ExcelIgnore private String xsbxfxpgjcjg; - @ExcelProperty(value = "管控类型" ,index = 17) + @ExcelProperty(value = "管控类型" ,index = 15) @ColumnWidth(12) private String gklx; - @ExcelProperty(value = {"附件", "附件名称"} ,index = 18) + @ExcelProperty(value = {"附件", "附件名称"} ,index = 16) @ColumnWidth(12) private String fjmc; - @ExcelProperty(value = {"附件", "检查结果"} ,index = 19) + @ExcelProperty(value = {"附件", "检查结果"} ,index = 17) @ColumnWidth(12) private String fjjcjg; - @ExcelProperty(value = "检查时间" ,index = 20) + @ExcelProperty(value = "检查时间" ,index = 18) @ColumnWidth(12) private Date jcsj; From 0662bc9d20a0cb613ea9c311b78648375fb531f9 Mon Sep 17 00:00:00 2001 From: liuyuan <18551621088@163.com> Date: Mon, 15 Jul 2024 15:41:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szr/zdryztpg/model/ZdryztpgExportModel.java | 36 +++++++++++----------- src/main/resources/bootstrap-prod.yml | 12 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java index 6d47c78..af36a88 100644 --- a/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java +++ b/src/main/java/com/szr/zdryztpg/model/ZdryztpgExportModel.java @@ -25,58 +25,62 @@ public class ZdryztpgExportModel { @ColumnWidth(12) private String rylx; - @ExcelProperty(value = "身份号码" ,index = 1) + @ExcelProperty(value = "管控类型" ,index = 1) + @ColumnWidth(12) + private String gklx; + + @ExcelProperty(value = "身份号码" ,index = 2) @ColumnWidth(12) private String sfzhm; - @ExcelProperty(value = "姓名" ,index = 2) + @ExcelProperty(value = "姓名" ,index = 3) private String ryxm; - @ExcelProperty(value = {"风险评估", "填写内容"} ,index = 3) + @ExcelProperty(value = {"风险评估", "填写内容"} ,index = 4) @ColumnWidth(12) private String fxpgtxnr; - @ExcelProperty(value = {"风险评估", "检查结果"} ,index = 4) + @ExcelProperty(value = {"风险评估", "检查结果"} ,index = 5) @ColumnWidth(12) private String fxpgjcjg; - @ExcelProperty(value = {"现实表现", "填写内容"} ,index = 5) + @ExcelProperty(value = {"现实表现", "填写内容"} ,index = 6) @ColumnWidth(12) private String xsbxtxnr; - @ExcelProperty(value = {"现实表现", "检查结果"} ,index = 6) + @ExcelProperty(value = {"现实表现", "检查结果"} ,index = 7) @ColumnWidth(12) private String xsbxjcjg; - @ExcelProperty(value = {"活动地", "填写内容"} ,index = 7) + @ExcelProperty(value = {"活动地", "填写内容"} ,index = 8) @ColumnWidth(12) private String hdztxnr; - @ExcelProperty(value = {"活动地", "检查结果"} ,index = 8) + @ExcelProperty(value = {"活动地", "检查结果"} ,index = 9) @ColumnWidth(12) private String hdzjcjg; - @ExcelProperty(value = {"在控情况", "填写内容"} ,index = 9) + @ExcelProperty(value = {"在控情况", "填写内容"} ,index = 10) @ColumnWidth(12) private String zkqktxnr; - @ExcelProperty(value = {"在控情况", "检查结果"} ,index = 10) + @ExcelProperty(value = {"在控情况", "检查结果"} ,index = 11) @ColumnWidth(12) private String zkqkjcjg; - @ExcelProperty(value = {"现实表现近三次情况", "填写内容"} ,index = 11) + @ExcelProperty(value = {"现实表现近三次情况", "填写内容"} ,index = 12) @ColumnWidth(14) private String jscqktxnr; - @ExcelProperty(value = {"现实表现近三次情况", "检查结果"} ,index = 12) + @ExcelProperty(value = {"现实表现近三次情况", "检查结果"} ,index = 13) @ColumnWidth(14) private String jscqkjcjg; - @ExcelProperty(value = {"是否见面&现实表现", "填写内容"} ,index = 13) + @ExcelProperty(value = {"是否见面&现实表现", "填写内容"} ,index = 14) @ColumnWidth(12) private String sfjmtxnr; - @ExcelProperty(value = {"是否见面&现实表现", "检查结果"} ,index = 14) + @ExcelProperty(value = {"是否见面&现实表现", "检查结果"} ,index = 15) @ColumnWidth(12) private String sfjmjcjg; @@ -86,10 +90,6 @@ public class ZdryztpgExportModel { @ExcelIgnore private String xsbxfxpgjcjg; - @ExcelProperty(value = "管控类型" ,index = 15) - @ColumnWidth(12) - private String gklx; - @ExcelProperty(value = {"附件", "附件名称"} ,index = 16) @ColumnWidth(12) private String fjmc; diff --git a/src/main/resources/bootstrap-prod.yml b/src/main/resources/bootstrap-prod.yml index 12e6f64..765e144 100644 --- a/src/main/resources/bootstrap-prod.yml +++ b/src/main/resources/bootstrap-prod.yml @@ -2,17 +2,17 @@ spring: cloud: nacos: discovery: - server-addr: 50.34.174.7:8848 - namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a +# server-addr: 50.34.174.7:8848 +# namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a # 鼓楼 -# server-addr: 50.32.58.101:8848 -# namespace: e2cee560-834b-4de8-9603-71100a82ba79 + server-addr: 50.32.58.101:8848 + namespace: e2cee560-834b-4de8-9603-71100a82ba79 group: DEFAULT_GROUP config: - namespace: 3f984aeb-5ff9-4ac1-b154-6f9e1f10175a + namespace: e2cee560-834b-4de8-9603-71100a82ba79 group: DEFAULT_GROUP # 配置中心的地址 - server-addr: 50.34.174.7:8848 + server-addr: 50.32.58.101:8848 # 默认加载与服务名相同文件 优先级最高 prefix: ${spring.application.name} file-extension: yaml