安装告知新增街道字段

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

@@ -217,4 +217,12 @@ public class JgInstallationNoticeDto extends BaseDto {
    @ApiModelProperty(value = "设备注册代码")
    private String equRegisterCode;
 
+
+    @ApiModelProperty(value = "设备使用地点-街道（镇）")
+    private String factoryUseSiteStreet;
+
+
+    @ApiModelProperty(value = "设备使用地点-街道（镇）")
+    private String streetName;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -353,5 +353,18 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("equ_register_code")
     private String equRegisterCode;
 
+    /**
+     *  	 * 设备使用地点-街道（镇）
+     *      */
+
+    @TableField(value ="\"factory_use_site_street\"")
+    private String factoryUseSiteStreet;
+
+    /**
+     *  	 * 设备使用地点-街道（镇）-名称
+     *      */
+
+    @TableField(value ="\"street_name\"")
+    private String streetName;
 
 }

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/JgInstallationNoticeServiceImpl.java

@@ -68,7 +68,7 @@ import java.text.ParseException;
 public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationNoticeDto,JgInstallationNotice,JgInstallationNoticeMapper> implements IJgInstallationNoticeService {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
-    private static final String PROCESS_DEFINITION_KEY = "installationNotification";
+    private static final String PROCESS_DEFINITION_KEY = "installationNotificationNew";
     private static final String TABLE_PAGE_ID = "1734141426742095873";