安装改造适配多流程节点

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

@@ -225,4 +225,15 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "设备使用地点-街道（镇）")
     private String streetName;
 
+    private List<String> roleIds;
+
+    private  String dataType  ;
+
+    private String nextExecuteIds;
+
+
+    private String promoter;
+
+    private String instanceStatus;
+
 }

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

@@ -367,4 +367,15 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField(value ="\"street_name\"")
     private String streetName;
 
+
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+
+    @TableField(value = "promoter")
+    private String promoter;
+
+    @TableField("instance_status")
+    private String instanceStatus;
 }

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

@@ -18,6 +18,9 @@
             isn.city_name AS cityName,
             isn.county_name AS countyName,
             isn.instance_id AS instanceId,
+            isn.promoter,
+            isn.next_execute_ids AS nextExecuteIds,
+            isn.instance_status AS instanceStatus,
             isn.notice_report_url AS noticeReportUrl
         FROM
             tzs_jg_installation_notice isn
@@ -41,7 +44,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
+                AND (isn.notice_status in ('6612', '6613', '6610')  )
                 AND isn.receive_org_credit_code = #{orgCode}
             </if>
             <if test="type == 'enterprise'">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TzsServiceFeignClient.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.Map;
 
-@FeignClient(name = "TZS-YMT",  path = "/ymt", configuration =
+@FeignClient(name = "TZS-YMT", path = "/ymt", configuration =
         {FeignConfiguration.class})
 public interface TzsServiceFeignClient {
 
@@ -44,5 +44,21 @@ public interface TzsServiceFeignClient {
     ResponseModel<Map<String, Object>> applicationFormCode(@RequestParam("type") String type,
                                                      @RequestParam("batchSize") int batchSize);
 
+    /**
+     * 申请单编号生成
+     * @param key
+     * @return String
+     */
+    @RequestMapping(value = "/generate-code/deviceRegistrationCode", method = RequestMethod.POST)
+    ResponseModel<String> deviceRegistrationCode(@RequestParam("key") String key);
+
+    /**
+     * 申请单编号生成
+     * @param key
+     * @return String
+     */
+    @RequestMapping(value = "/generate-code/useRegistrationCode", method = RequestMethod.POST)
+    ResponseModel<String> useRegistrationCode(@RequestParam("key") String key);
+
 
 }