fit:重点人员督察详情

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;
+
 }

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;
 
     // 工作状态

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());

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