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

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

@@ -114,4 +114,31 @@ public class JyjcOpeningApplicationController extends BaseController {
 	public ResponseModel<List<JyjcOpeningApplicationDto>> selectForList() {
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationList());
 	}
+
+
+
+	/**
+	 * 列表全部数据查询
+	 *
+	 * @return
+	 */
+	@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);
+	}
+
+	/**
+	 * 列表全部数据查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "撤回业务开通申请",   notes = "撤回业务开通申请")
+	@GetMapping(value = "/stopFlow")
+	public void overflow( @RequestParam("instanceId") String instanceId) {
+		jyjcOpeningApplicationServiceImpl.stopFlow(instanceId);
+	}
+
 }

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

@@ -20,6 +20,8 @@ import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -35,6 +37,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+
+
 /**
  * 服务实现类
  *
@@ -42,6 +46,7 @@ import java.util.Map;
  * @date 2023-12-13
  */
 @Service
+public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningApplicationDto, JyjcOpeningApplication, JyjcOpeningApplicationMapper> implements IJyjcOpeningApplicationService {
 @Slf4j
 public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningApplicationDto,JyjcOpeningApplication,JyjcOpeningApplicationMapper> implements IJyjcOpeningApplicationService {
     @Autowired
@@ -83,34 +88,34 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 分页查询
      */
 
-    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplicationDto> page)   {
+    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplicationDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationList()   {
-        return this.queryForList("" , false);
+    public List<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationList() {
+        return this.queryForList("", false);
     }
-    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page,JyjcOpeningApplicationDto jyjcOpeningApplicationDto)   {
+
+    public Page<JyjcOpeningApplicationDto> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationDto jyjcOpeningApplicationDto) {
         //根据申请单中的单位信息对于列表数据进行过滤
-         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
-        if(companyBo.getLevel().equals("company")){
+        CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
+        if (companyBo.getLevel().equals("company")) {
             jyjcOpeningApplicationDto.setUnitCode(companyBo.getCompanyCode());
         }
-        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page,jyjcOpeningApplicationDto);
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationDto);
     }
 
 
     /**
      * 获取详情跳转
      *
-     *
      * @param
      * @return {@link }
-     * @author yangyang
      * @throws
+     * @author yangyang
      */
     public JyjcOpeningApplicationDto queryDetail(Long sequenceNbr) {
         ReginParams reginParams = commonserviceImpl.getReginParamsOfCurrentUser();
@@ -119,7 +124,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
         JyjcOpeningApplicationDto jyjcOpeningApplicationDto;
         if (null != sequenceNbr) {
-            jyjcOpeningApplicationDto =  this.queryBySeq(sequenceNbr);
+            jyjcOpeningApplicationDto = this.queryBySeq(sequenceNbr);
         } else {
             jyjcOpeningApplicationDto = new JyjcOpeningApplicationDto();
         }
@@ -127,8 +132,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseMapper.selectEnterpriseInfo(unitCode);
         // 获取企业资质
         List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create()
-                                                                                                     .put("unitCode", unitCode)
-                                                                                                     .put("licenceType", LicenceTypeEnum.JYJC.getCode()).build());
+                .put("unitCode", unitCode)
+                .put("licenceType", LicenceTypeEnum.JYJC.getCode()).build());
         // 获取检验人员信息
         List<TzsUserInfoDto> userInfos = baseMapper.selectUserInfoByUnitCodeList(unitCode);
         if (baseEnterpriseInfoDto != null) {
@@ -142,4 +147,49 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         jyjcOpeningApplicationDto.setUserInfos(userInfos);
         return jyjcOpeningApplicationDto;
     }
+
+    /**
+     * 接收/驳回通知检验单
+     */
+   public void execueFlow(String op, String instanceId) {
+        try {
+            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            String taskId = dataObject.getString("id");
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResult(op);
+            dto.setResultCode("condition");
+            dto.setTaskId(taskId);
+            dto.setComment("流程结束，你可以开始办理业务了");
+            //执行流程
+            AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+            if (ObjectUtils.isEmpty(ajaxResult1)) {
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 撤回流程办理单
+     */
+   public void stopFlow(String instanceId) {
+        try {
+            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            String taskId = dataObject.getString("id");
+            //执行流程
+            AjaxResult ajaxResult1 = Workflow.taskClient.stopProcess(taskId);
+            if (ObjectUtils.isEmpty(ajaxResult1)) {
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }
\ No newline at end of file