Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgTransferNoticeDto", description="移装造告知")
+@ApiModel(value = "JgTransferNoticeDto", description = "移装造告知")
 public class JgTransferNoticeDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -135,4 +137,7 @@ public class JgTransferNoticeDto  extends BaseDto {
     @ApiModelProperty(value = "接收机构机构代码")
     private String receiveOrgCode;
 
+    @ApiModelProperty(value = "是否西咸")
+    private String isXixian;
+
 }

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

@@ -250,4 +250,9 @@ public class JgTransferNotice extends BaseEntity {
 	@TableField("receive_org_code")
     private String receiveOrgCode;
 
+    /**
+     * 是否西咸
+     */
+    @TableField("is_xixian")
+    private String isXixian;
 }

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

@@ -184,6 +184,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setBusinessKey("1");
                 try {
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
+                    String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+                    noticeDto.setInstanceId(instanceId);
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);
                 }