1.单位变更列表合并

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/CompanyBo.java

@@ -21,8 +21,17 @@ public class CompanyBo {
     private Long sequenceNbr;
     private String regionCode;
     private String companyCode;
+    private String companyType;
     private List<CompanyBo> children;
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
     public String getAddress() {
         return address;
     }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -28,8 +28,14 @@ public class BaseController {
     @Autowired
     protected HttpServletRequest request;
 
+    /**
+     * 企业
+     */
     public static final String COMPANY_TYPE_COMPANY = "company";
 
+    /**
+     * 监管/行政审批局
+     */
     public static final String COMPANY_TYPE_SUPERVISION = "supervision";
 
 

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

@@ -57,7 +57,7 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/creatTree")
 	@ApiOperation(httpMethod = "GET", value = "获取管辖分局树", notes = "获取管辖分局树")
 	public ResponseModel<Object> creatTree() {
-		return ResponseHelper.buildResponse(commonService.getTree());
+		return ResponseHelper.buildResponse(commonService.getTree(getSelectedOrgInfo()));
 	}
 
 
@@ -70,7 +70,8 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/getApproveTree")
 	@ApiOperation(httpMethod = "GET", value = "获取行政审批局树", notes = "获取行政审批局树")
 	public ResponseModel<Object> getApproveTree() {
-		return ResponseHelper.buildResponse(commonService.getApproveTree());
+		ReginParams reginParams = getSelectedOrgInfo();
+		return ResponseHelper.buildResponse(commonService.getApproveTree(reginParams));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -3,10 +3,8 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,8 +21,8 @@ public interface ICommonService {
 
     List<LinkedHashMap> getRegion(String level, String parentId);
 
-    List<LinkedHashMap> getTree();
-    List<LinkedHashMap> getApproveTree();
+    List<LinkedHashMap> getTree(ReginParams selectedOrgInfo);
+    List<LinkedHashMap> getApproveTree(ReginParams reginParams);
 
     List<LinkedHashMap> creatTree();
 

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/CommonServiceImpl.java

@@ -7,6 +7,7 @@ import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -259,10 +260,16 @@ public class CommonServiceImpl implements ICommonService {
 
 
     @Override
-    public List<LinkedHashMap> getTree() {
+    public List<LinkedHashMap> getTree(ReginParams reginParams) {
+        // 企业逻辑
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
             //判断redis是否存在管辖机构树
             return !ObjectUtils.isEmpty(result) ? result : creatTree();
+        } else {
+            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+        }
+
     }
 
     @Override
@@ -277,10 +284,17 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<LinkedHashMap> getApproveTree() {
+    public List<LinkedHashMap> getApproveTree(ReginParams reginParams) {
+        // 企业逻辑
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(ADMINISTRATION_UNIT_TREE);
             //判断redis是否存在行政审批局树
             return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
+        } else {
+            // 监管单位逻辑
+            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+        }
+
     }
 
 
@@ -598,7 +612,7 @@ public class CommonServiceImpl implements ICommonService {
             jgChangeRegistrationNameService.save2(submitType, jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode()) || type.equals(ApplicationFormTypeEnum.SBTY.getBusinessCode())) {
             noticeObj.put("submit", submitType);
-            noticeObj.put("formType","add");
+            noticeObj.put("formType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);