1.检验业务在线开通流程接口调整

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModel;
@@ -82,5 +83,5 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     private String latitude;
 
     @ApiModelProperty ("企业营业执照")
-    private String unitBusinessLicense;
+    private List<AttachmentDto> unitBusinessLicense;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -124,8 +124,8 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "接收或者驳回业务开通申请",   notes = "接收或者驳回业务开通申请")
 	@GetMapping(value = "/execueFlow")
-	public void execueFlow(@RequestParam("op") String op, @RequestParam("instanceId") String instanceId) {
-		jyjcOpeningApplicationServiceImpl.execueFlow(op,instanceId);
+	public void execueFlow(@RequestParam("op") String op, @RequestParam("instanceId") String instanceId,@RequestParam("comments") String comments) {
+		jyjcOpeningApplicationServiceImpl.execueFlow(op,instanceId,comments);
 	}
 
 	/**

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.common.CommonConstants;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
@@ -231,7 +232,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             jyjcOpeningApplicationModel.setIndustrySupervisor(baseUnitLicenceEntity.getIndustrySupervisor());
             jyjcOpeningApplicationModel.setLongitude(baseUnitLicenceEntity.getLongitude());
             jyjcOpeningApplicationModel.setLatitude(baseUnitLicenceEntity.getLatitude());
-            jyjcOpeningApplicationModel.setUnitBusinessLicense(baseUnitLicenceEntity.getUnitBusinessLicense());
+            if(ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
+                jyjcOpeningApplicationModel.setUnitBusinessLicense(JSONArray.parseArray(baseUnitLicenceEntity.getUnitBusinessLicense(), AttachmentDto.class));
+            }
         }
         // QueryWrapper unitLicenceQueryWrapper = new QueryWrapper<>();
         // unitLicenceQueryWrapper.eq("unit_code", unitCode);
@@ -288,7 +291,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
-   public void execueFlow(String op, String instanceId) {
+   public void execueFlow(String op, String instanceId,String comments) {
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -296,9 +299,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
             dto.setResult(op);
-            dto.setResultCode("condition");
+            dto.setResultCode("approvalStatus");
             dto.setTaskId(taskId);
-            dto.setComment("流程结束，你可以开始办理业务了");
+            dto.setComment(comments);
             //执行流程
             AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
             if (ObjectUtils.isEmpty(ajaxResult1)) {