From 892c024bff168b054e69c7398f634b93de19139f Mon Sep 17 00:00:00 2001 From: pengwei Date: Tue, 15 Jul 2025 10:02:36 +0800 Subject: [PATCH] =?UTF-8?q?fit:=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=9D=A3=E5=AF=9F=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/supervision/pojo/dto/SupRiskDto.java | 3 +++ .../com/biutag/supervision/pojo/entity/SupRiskPersonal.java | 1 + .../biutag/supervision/service/TaskManagementService.java | 3 +++ src/main/resources/application-dev.yml | 6 ++++++ 4 files changed, 13 insertions(+) diff --git a/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java b/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java index 40af707..cf72d6e 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java @@ -67,4 +67,7 @@ public class SupRiskDto { @ExcelProperty({"imgBase64"}) private String imgBase64; + @ExcelProperty({"sup_status"}) + private String supStatus; + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonal.java b/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonal.java index 557d835..9345419 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonal.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonal.java @@ -70,6 +70,7 @@ public class SupRiskPersonal { private Integer taskId; // 督察状态 + @TableField("sup_status") private String supStatus; // 工作状态 diff --git a/src/main/java/com/biutag/supervision/service/TaskManagementService.java b/src/main/java/com/biutag/supervision/service/TaskManagementService.java index 738f8f9..1ff70eb 100644 --- a/src/main/java/com/biutag/supervision/service/TaskManagementService.java +++ b/src/main/java/com/biutag/supervision/service/TaskManagementService.java @@ -246,6 +246,9 @@ public class TaskManagementService { personal.forEach(s->{ SupRiskDto supRiskDto = new SupRiskDto(); BeanUtils.copyProperties(s,supRiskDto); + if (StrUtil.isNotBlank(s.getImageBase64())){ + supRiskDto.setImgBase64(s.getImageBase64()); + } if(s.getTaskPersonId() != null){ SupTaskPerson person = taskPersonService.getById(s.getTaskPersonId()); supRiskDto.setControlEmpNo(person.getEmpNo()); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 90910e1..4fa313c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -48,6 +48,12 @@ spring: url: jdbc:dm://65.47.22.243:5236?SCHEMA=JSDZ_4GDB username: DCZD password: DCZD@2024 + zbdm: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: dm.jdbc.driver.DmDriver + url: jdbc:dm://65.32.34.9:5237?SCHEMA=JSDZ_4GDB + username: dczd_cx + password: dczd#110110 data: redis: host: 172.31.217.20