修改bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java

@@ -190,7 +190,7 @@ public class JgTransferNoticeDto extends BaseDto {
         return (StringUtils.isEmpty(this.provinceName) ? "" : this.provinceName)
                 + (StringUtils.isEmpty(this.cityName) ? "" : this.cityName)
                 + (StringUtils.isEmpty(this.countyName) ? "" : this.countyName)
-                + (StringUtils.isEmpty(this.street) ? "" : this.street)
+                + (StringUtils.isEmpty(this.streetName) ? "" : this.streetName)
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml

@@ -15,6 +15,7 @@
         tjtn.province_name AS provinceName,
         tjtn.city_name AS cityName,
         tjtn.county_name AS countyName,
+        tjtn.street_name AS streetName,
         tjtn.instance_id AS instanceId,
         tjtn.transfer_type AS transferType,
         tjtn.plan_date AS planDate,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -13,7 +13,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeEqMapper;
@@ -620,7 +619,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             jgInstallationNotice.setStatus(taskName[0]);
             jgInstallationNotice.setPromoter("");
             jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
-            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             jgTransferNoticeMapper.updateById(jgInstallationNotice);
         }
     }