21052 单位变更限制设备不能多次出现在执行的流程中

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java

@@ -33,7 +33,7 @@ public interface IJgChangeRegistrationUnitService {
      * @param noticeDto 安装告知
      * @param op        操作类型
      */
-    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op);
+    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams);
 
     /**
      * 分页查询

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java

@@ -3,34 +3,30 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
 /**
  * 单位变更登记
  *
@@ -77,7 +73,9 @@ public class JgChangeRegistrationUnitController extends BaseController {
         }
         Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
         jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,jgChangeRegistrationUnitDto, op));
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType, jgChangeRegistrationUnitDto, op, reginParams));
     }
 
     /**
@@ -137,18 +135,17 @@ public class JgChangeRegistrationUnitController extends BaseController {
             @ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
             @ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
             @ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
-			@ApiParam(value = "排序字段",required = false) @RequestParam(value = "sort",required = false) String sort,
+            @ApiParam(value = "排序字段", required = false) @RequestParam(value = "sort", required = false) String sort,
             @RequestBody(required = false) JgChangeRegistrationUnitDto model
     ) {
         Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-		 ReginParams info = getSelectedOrgInfo();
-		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             type = "enterprise";
-		}else {
+        } else {
             type = "supervision";
         }
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page,sort, model, type, reginParams));
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page, sort, model, type, reginParams));
     }
 
     /**
@@ -164,6 +161,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }
+        ReginParams reginParams = getSelectedOrgInfo();
         jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
         return ResponseHelper.buildResponse(installationInfo);
     }
@@ -178,18 +176,20 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
     public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
         // TODO 受理单位变更流程
-		LinkedHashMap model1 = (LinkedHashMap)model.get("changeRegisInfo");
-		String opinion = (String)model.get("opinion");
-		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("changeRegisInfo");
+        LinkedHashMap model1 = (LinkedHashMap) model.get("changeRegisInfo");
+        String opinion = (String) model.get("opinion");
+        LinkedHashMap installationInfo = (LinkedHashMap) model1.get("changeRegisInfo");
         JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
         jgInstallationNoticeDto.setProcessAdvice(opinion);
-		jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto,op);
+        ReginParams reginParams = getSelectedOrgInfo();
+        jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto, op, reginParams);
         return ResponseHelper.buildResponse(null);
     }
 
 
     /**
      * 导出使用登记证
+     *
      * @param response    返回
      * @param sequenceNbr 主键
      * @param printType   打印类型，0-正常打印，1-套打（默认0）