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

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
@@ -71,7 +72,7 @@ public interface IJgChangeRegistrationReformService {
      * @param equipId
      * @return
      */
-    Map<String, Object> getDetail(String currentDocumentId, String equipId);
+    Map<String, Object> getDetail(String currentDocumentId, String equipId, CompanyBo companyBo);
 
     /**
      * @deprecated 根据当前的数据id导出使用登记证

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

@@ -4,6 +4,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
@@ -26,7 +27,7 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 
-    Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr);
+    Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, CompanyBo company);
 
     Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page,String sort, JgChangeRegistrationTransferDto params, String companyTypeCode, String companyType);
 

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
@@ -30,5 +31,5 @@ public interface IJgEquipTransferService  extends IService<JgEquipTransfer> {
      * @param sequenceNbr 主键
      * @return 设备移交详情
      */
-    Map<String, Object> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Object> queryBySequenceNbr(Long sequenceNbr, CompanyBo companyBo);
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
@@ -25,7 +26,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      * @param sequenceNbr 主键
      * @return 维修告知
      */
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, CompanyBo companyBo);
 
     /**
      * 更新维修告知

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
@@ -20,7 +21,7 @@ import java.util.Map;
  */
 public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
 
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel);
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, CompanyBo companyBo);
 
     JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op);
 

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

@@ -119,7 +119,7 @@ public class JgChangeRegistrationReformController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
     @GetMapping(value = "/getDetail")
     public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId, @RequestParam(value = "equipId", required = false) String equipId) {
-        return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId, equipId));
+        return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId, equipId, getSelectedOrgInfo().getCompany()));
     }
 
     /**

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

@@ -112,7 +112,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@GetMapping(value = "/detail")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个移装变更登记登记",  notes = "根据sequenceNbr查询单个移装变更登记登记")
 	public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
-	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.getTransferDetail(sequenceNbr));
+	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.getTransferDetail(sequenceNbr, getSelectedOrgInfo().getCompany()));
 	}
 
 	/**

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

@@ -95,6 +95,6 @@ public class JgEnableDisableController extends BaseController {
     @GetMapping(value = "/detail")
     @ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
     public ResponseModel<Object> detail(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.getDetail(sequenceNbr));
+        return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.getDetail(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 }

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

@@ -99,7 +99,7 @@ public class JgEquipTransferController extends BaseController {
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个设备移交", notes = "根据sequenceNbr查询单个设备移交")
     public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
     /**

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

@@ -111,7 +111,7 @@ public class JgMaintainNoticeController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维修告知", notes = "根据sequenceNbr查询单个维修告知")
     public ResponseModel<Map<String,
             Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(iJgMaintainNoticeService.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(iJgMaintainNoticeService.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
     /**

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

@@ -107,8 +107,8 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保合同备案", notes = "根据sequenceNbr查询单个维保合同备案")
-    public ResponseModel<JgMaintenanceContractVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr));
+    public ResponseModel<Object> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -106,7 +106,7 @@ public class JgReformNoticeController extends BaseController {
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个改造告知", notes = "根据sequenceNbr查询单个改造告知")
     public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgReformNoticeService.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgReformNoticeService.queryBySequenceNbrWithAuth(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
 

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

@@ -127,7 +127,7 @@ public class JgScrapCancelController extends BaseController {
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个详情", notes = "根据sequenceNbr查询单个详情")
     public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgScrapCancelService.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgScrapCancelService.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
 

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

@@ -120,8 +120,7 @@ public class JgTransferNoticeController extends BaseController {
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个移装造告知", notes = "根据sequenceNbr查询单个移装造告知")
     public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
-        String companyLevel = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
-        return ResponseHelper.buildResponse(jgTransferNoticeService.queryBySequenceNbr(sequenceNbr, companyLevel));
+        return ResponseHelper.buildResponse(jgTransferNoticeService.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
 

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

@@ -184,8 +184,8 @@ public class JgVehicleInformationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个车用气瓶控制类", notes = "根据sequenceNbr查询单个车用气瓶控制类")
-    public ResponseModel<JgVehicleInformationVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
+    public ResponseModel<Object> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbrWithAuth(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/BizDataChangeServiceImpl.java

@@ -6,8 +6,8 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.RequestChangeData;
 import com.yeejoin.amos.boot.module.jg.biz.context.BizDataHandleStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.controller.BizDataChangeController;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingCompanyTypeForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.FillingEditPermForCurrentUser;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,7 +43,7 @@ public class BizDataChangeServiceImpl {
     public Map<String, Object> querySubDetail(String applyNo, String bizId, String bizType, BizDataChangeController.DetailType type, ReginParams selectedOrgInfo) {
         IBizDataChangeHandleStrategy handleStrategy = BizDataHandleStrategyContext.getStrategy(bizType);
         // 装饰器模式增强结果
-        return new FillingEditPermForCurrentUser(new JSONObject(handleStrategy.getSubDetail(applyNo, bizId, type)), selectedOrgInfo.getCompany()).getData();
+        return new FillingCompanyTypeForCurrentUser(new JSONObject(handleStrategy.getSubDetail(applyNo, bizId, type)), selectedOrgInfo.getCompany()).getData();
     }
 
     public IPage<?> getChangeLogPage(String bizId, String bizType, int current, int size) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/permission/FillingCompanyTypeForCurrentUser.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.permission;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.BaseUseRegisterResultData;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class FillingCompanyTypeForCurrentUser extends BaseUseRegisterResultData {
+
+    private final CompanyBo company;
+
+    private static final String COMPANY_TYPE = "companyType";
+
+
+    public FillingCompanyTypeForCurrentUser(JSONObject data, CompanyBo company) {
+        super(data);
+        this.company = company;
+    }
+
+    @Override
+    public JSONObject getData() {
+        JSONObject data = super.getData();
+        fillingEditPermission(data);
+        return data;
+    }
+
+
+    private void fillingEditPermission(JSONObject jsonObject) {
+        if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            jsonObject.put(COMPANY_TYPE, BaseController.COMPANY_TYPE_COMPANY);
+        } else {
+            jsonObject.put(COMPANY_TYPE, BaseController.COMPANY_TYPE_SUPERVISION);
+        }
+
+    }
+
+}

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/FillingEditPermForCurrentUser.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/permission/FillingEditPermForCurrentUser.java

-package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+package com.yeejoin.amos.boot.module.jg.biz.edit.permission;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.BaseUseRegisterResultData;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
@@ -23,10 +24,19 @@ public class FillingEditPermForCurrentUser extends BaseUseRegisterResultData {
 
     private static final String HAS_PERMISSION = "hasPermission";
 
+    private final BusinessTypeEnum businessType;
+
 
     public FillingEditPermForCurrentUser(JSONObject data, CompanyBo company) {
         super(data);
         this.company = company;
+        this.businessType = null;
+    }
+
+    public FillingEditPermForCurrentUser(JSONObject data, CompanyBo company, BusinessTypeEnum businessTypeEnum) {
+        super(data);
+        this.company = company;
+        this.businessType = businessTypeEnum;
     }
 
 
@@ -43,11 +53,11 @@ public class FillingEditPermForCurrentUser extends BaseUseRegisterResultData {
         // 当前登录人所在用户组
         List<GroupModel> groupModels = FeignUtil.remoteCall(() -> Privilege.groupClient.queryByUserId(RequestContext.getExeUserId()));
         // 有权限编辑设备的用户组（value为用户组名称）
-        List<DictionarieValueModel> hasPermGroup = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues("USE_REG_PERMISSION_GROUP"));
+        List<DictionarieValueModel> hasPermGroup = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(this.getDictCode()));
         if (groupModels.stream().anyMatch(g -> hasPermGroup.stream().anyMatch(h -> h.getDictDataValue().equals(g.getGroupName())))) {
             jsonObject.put(HAS_PERMISSION, true);
         }
-        if(company != null) {
+        if (company != null) {
             if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
                 jsonObject.put(COMPANY_TYPE, BaseController.COMPANY_TYPE_COMPANY);
             } else {
@@ -55,4 +65,8 @@ public class FillingEditPermForCurrentUser extends BaseUseRegisterResultData {
             }
         }
     }
+
+    private String getDictCode() {
+        return this.businessType == null ? "USE_REG_PERMISSION_GROUP" : this.businessType.getName() + "_PERMISSION_GROUP";
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -891,6 +891,9 @@ public class CommonEquipDataProcessService {
         Page<IdxBizJgProjectContraption> page = new Page<>();
         page.setCurrent(params.getLong("current"));
         page.setSize(params.getLong("size"));
+        if(projectContraptionIds.isEmpty()){
+            return page;
+        }
         // 工程装置名称
         String projectContraption = params.getString(PROJECT_CONTRAPTION);
         // 工程装置编号

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

@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -61,7 +62,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -924,7 +924,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Override
-    public Map<String, Object> getDetail(String currentDocumentId, String equipId) {
+    public Map<String, Object> getDetail(String currentDocumentId, String equipId, CompanyBo companyBo) {
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectById(currentDocumentId);
         this.doCompensate(jgChangeRegistrationReform);
         Map<String, Object> detail = new HashMap<>();
@@ -950,7 +950,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         detail.remove("submit");
         detail.remove("instanceId");
         this.fillingEquCategoryNameForHisData(detail, jgChangeRegistrationReform);
-        return detail;
+        // 设置登录人公司类型区分监管还是企业及编辑权限
+        return new FillingEditPermForCurrentUser(new JSONObject(detail),companyBo, BusinessTypeEnum.JG_RENOVATION_REGISTRATION).getData();
     }
 
 

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

@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -600,11 +601,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * 根据移装变更记录sequenceNbr查询详情
      *
      * @param sequenceNbr 变更记录sequenceNbr
+     * @param company
      * @return
      */
     @Override
     @ResultFieldMapping({@ResultFieldMapping.ResultFieldMap(sourceField = "changeRegistrationTransfer.transferUseInfo", targetField = "changeRegistrationTransfer.estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")})
-    public Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr) {
+    public Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, CompanyBo company) {
         Map<String, Map<String, Object>> pageDataMap = new HashMap<>();
         Map<String, Object> resultDataMap = new HashMap<>();
         //移装变更详情
@@ -666,6 +668,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 resultDataMap.put("transferSafetyManagerName", transferSafetyManagerList[1]);
             }
         }
+        new FillingEditPermForCurrentUser(new JSONObject(resultDataMap), company, BusinessTypeEnum.JG_EQUIPMENT_HANDOVER).getData();
         if (!resultDataMap.isEmpty()) {
             pageDataMap.put(TABLE_PAGE_ID, resultDataMap);
         }

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

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationUnitService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
@@ -243,11 +244,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
         String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        // todo 1 公共权限赋值查询
+        new FillingEditPermForCurrentUser(new JSONObject(changeInfo), selectedOrgInfo.getCompany(), BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION).getData();
+        // todo 注意顺序 通用的FillingEditPermForCurrentUser里有companyType了 但是和此业务不一样，故还是使用原来的，否则页面需要调整较多
         if ("个人主体".equals(companyType)) {
             changeInfo.put("companyType", "person");
         } else {
             changeInfo.put("companyType", "company");
         }
+        // todo 本来FillingEditPermForCurrentUser已赋值但是此业务也使用的key companyType故新赋值key
+        changeInfo.put("companyType2", CommonServiceImpl.getCompanyType(selectedOrgInfo.getCompany()));
         return new HashMap<String, Map<String, Object>>() {{
 //            this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo));
             this.put("changeRegisInfo", changeInfo);

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

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeVehicleRegistrationU
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
@@ -853,11 +854,16 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 object.put("newCarNumber", registrationUnit.getCarNumber());
             }
             String companyType = selectedOrgInfo.getCompany().getCompanyType();
+            // todo 注意顺序1
+            new FillingEditPermForCurrentUser(new JSONObject(object), selectedOrgInfo.getCompany(), BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE).getData();
+            // todo 注意顺序2
             if ("个人主体".equals(companyType)) {
                 object.put("companyType", "person");
             } else {
                 object.put("companyType", "company");
             }
+            //  todo 注意顺序3
+            object.put("companyType2", CommonServiceImpl.getCompanyType(selectedOrgInfo.getCompany()));
             object.put("havingPermission", registrationUnit.getNextExecuteUserIds() != null && registrationUnit.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
             return object;
         } else {

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

@@ -22,11 +22,10 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
-import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
-import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
@@ -770,7 +769,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 .eq(JgRegistrationHistory::getCurrentDocumentId, jgEnableDisable.getSequenceNbr()));
     }
 
-    public Map<String, Object> getDetail(Long sequenceNbr) {
+    public Map<String, Object> getDetail(Long sequenceNbr, CompanyBo company) {
         Map<String, Object> resultMap = new HashMap<>();
         JgEnableDisable enableDisable = this.getById(sequenceNbr);
         this.doCompensate(enableDisable);
@@ -784,7 +783,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         resultMap.put("receiveOrgCode", enableDisable.getReceiveCompanyCode() + '_' + enableDisable.getReceiveOrgName());
         resultMap.put("sequenceNbr", enableDisable.getSequenceNbr());
         resultMap.put("applyNo", enableDisable.getApplyNo());
+        resultMap.put("auditStatus", enableDisable.getAuditStatus());
         commonService.convertStringToJsonobject(resultMap, new String[]{"otherAccessories"});
+        new FillingEditPermForCurrentUser(new JSONObject(resultMap), company, BusinessTypeEnum.JG_EQUIPMENT_START_STOP).getData();
         return resultMap;
     }
 

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 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.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -29,6 +27,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EquipTransferVo;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
@@ -68,8 +67,6 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static java.util.stream.Collectors.toSet;
-
 /**
  * 设备移交服务实现类
  *
@@ -696,7 +693,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
 
     @Override
-    public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Object> queryBySequenceNbr(Long sequenceNbr, CompanyBo companyBo) {
         JgEquipTransfer equipTransfer = baseMapper.selectById(sequenceNbr);
         if (Objects.isNull(equipTransfer)) {
             return null;
@@ -713,15 +710,18 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 Map<String, Object> equipMap = (Map<String, Object>) getEquipInfonNew(sequenceNbr);
                 // 2.移交业务字段信息
                 equipMap.putAll(equipTransferInfo);
+                new FillingEditPermForCurrentUser(new JSONObject(equipMap), companyBo, BusinessTypeEnum.JG_EQUIPMENT_HANDOVER).getData();
                 return equipMap;
             } else {
                 // 2.移交业务字段信息
                 CommonServiceImpl.formatTime2StrDateForEquip(his);
                 his.putAll(equipTransferInfo);
+                new FillingEditPermForCurrentUser(his, companyBo, BusinessTypeEnum.JG_EQUIPMENT_HANDOVER).getData();
                 return his;
             }
         } else {
             Map<String, Object> equipMap = (Map<String, Object>) getEquipInfonNew(sequenceNbr);
+            new FillingEditPermForCurrentUser(new JSONObject(equipMap), companyBo, BusinessTypeEnum.JG_EQUIPMENT_HANDOVER).getData();
             return Stream.concat(equipTransferInfo.entrySet().stream(),
                             equipMap.entrySet().stream())
                     .filter(entry -> entry.getValue() != null)

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

@@ -38,6 +38,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.InstallationVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -314,7 +315,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 // todo companyLevel赋值这个不能少，控制前端页面的字段(安装负责人）显示隐藏
                 Map<String, Object> detail = setNewEquipData(companyLevel, installationInfo);
                 this.fillingEquCategoryNameForHisData(detail, notice);
-                new FillingEditPermForCurrentUser(new JSONObject(detail), company).getData();;
+                new FillingEditPermForCurrentUser(new JSONObject(detail), company, BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION).getData();;
                 return new HashMap<String, Map<String, Object>>() {{
                     this.put("installationInfo", detail);
                 }};
@@ -322,7 +323,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 hisData.putAll(installationInfo);
                 CommonServiceImpl.formatTime2StrDateForEquip(hisData);
                 this.fillingEquCategoryNameForHisData(hisData, notice);
-                new FillingEditPermForCurrentUser(hisData, company).getData();
+                new FillingEditPermForCurrentUser(hisData, company, BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION).getData();
                 // todo 这个不能少 控制前端页面的字段(安装负责人）显示隐藏
                 hisData.put("companyLevel", companyLevel);
                 return new HashMap<String, Map<String, Object>>() {{
@@ -335,7 +336,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             Map<String, Object> detail = setNewEquipData(companyLevel, installationInfo);
             detail.put("startLatitudeLongitude", JSON.parseObject(notice.getStartLatitudeLongitude()));
             detail.put("endLatitudeLongitude", JSON.parseObject(notice.getEndLatitudeLongitude()));
-            new FillingEditPermForCurrentUser(new JSONObject(detail), company).getData();
+            new FillingEditPermForCurrentUser(new JSONObject(detail), company, BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION).getData();
             return new HashMap<String, Map<String, Object>>() {{
                 this.put("installationInfo", detail);
             }};

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

@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.MaintainVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -166,7 +167,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @ResultFieldMapping({
             @ResultFieldMapping.ResultFieldMap(sourceField = "maintainInfo.useUnitCreditCode", targetField = "maintainInfo.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
     })
-    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, CompanyBo companyBo) {
         // 维修告知信息
         JgMaintainNotice notice = jgMaintainNoticeMapper.selectById(sequenceNbr);
         if (Objects.isNull(notice)) {
@@ -210,6 +211,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (hisData == null || ObjectUtils.isEmpty(hisData.get("deviceList"))) {
                 // 老数据逻辑
                 setNewEquipInfo(sequenceNbr, maintainInfo);
+                new FillingEditPermForCurrentUser(new JSONObject(maintainInfo), companyBo, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION).getData();
                 return new HashMap<String, Map<String, Object>>() {{
                     put(TABLE_PAGE_ID, maintainInfo);
                 }};
@@ -219,12 +221,14 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 CommonServiceImpl.formatTime2StrDateForEquip(hisData);
 //                setNewEquipInfo(sequenceNbr, maintainInfo);
 //                hisData.put("deviceList", maintainInfo.get("deviceList"));
+                new FillingEditPermForCurrentUser(hisData, companyBo, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION).getData();
                 return new HashMap<String, Map<String, Object>>() {{
                     this.put(TABLE_PAGE_ID, hisData);
                 }};
             }
         } else {
             setNewEquipInfo(sequenceNbr, maintainInfo);
+            new FillingEditPermForCurrentUser(new JSONObject(maintainInfo), companyBo, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION).getData();
             return new HashMap<String, Map<String, Object>>() {{
                 put(TABLE_PAGE_ID, maintainInfo);
             }};

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

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -150,7 +151,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     /**
      * 根据sequenceNbr查询数据
      */
-    public JgMaintenanceContractVo queryBySequenceNbr(Long sequenceNbr) {
+    public Object queryBySequenceNbr(Long sequenceNbr, CompanyBo company) {
         JgMaintenanceContractDto dto = maintenanceContractMapper.queryBySequenceNbr(sequenceNbr);
         JgMaintenanceContractVo vo = new JgMaintenanceContractVo();
         BeanUtils.copyProperties(dto, vo);
@@ -187,7 +188,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 vo.setEquipmentLists(equList);
             }
         }
-        return vo;
+        // 对象转换 填充登录人单位类型 权限
+        JSONObject re = BeanUtil.copyProperties(vo, JSONObject.class);
+        new FillingEditPermForCurrentUser(re, company, BusinessTypeEnum.JG_MAINTENANCE_RECORD).getData();
+        return re;
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -35,6 +35,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ReformVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -140,6 +141,17 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private final IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
     private final JgUseRegistrationServiceImpl useRegistrationService;
 
+
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "useUnitCreditCode", targetField = "useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+    })
+    public Map<String, Object> queryBySequenceNbrWithAuth(Long sequenceNbr, CompanyBo companyBo) {
+        Map<String, Object> re = this.queryBySequenceNbr(sequenceNbr);
+        return new FillingEditPermForCurrentUser(new JSONObject(re), companyBo, BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION).getData();
+    }
+
+
+
     /**
      * 根据sequenceNbr查询
      *

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

@@ -6,11 +6,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -28,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.ScrapCancelVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
@@ -754,7 +753,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
 
-    public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Object> queryBySequenceNbr(Long sequenceNbr, CompanyBo company) {
         Map<String, Object> resultMap = new HashMap<>();
         JgScrapCancel scrapCancel = this.baseMapper.selectById(sequenceNbr);
         this.doCompensate(scrapCancel);
@@ -780,6 +779,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
         resultMap.putAll(beanMap);
         resultMap.put("receiveOrgCode", scrapCancel.getReceiveCompanyCode() + '_' + scrapCancel.getReceiveOrgName());
+        // 单位类型及人员权限设置
+        new FillingEditPermForCurrentUser(new JSONObject(resultMap), company, BusinessTypeEnum.JG_EQUIPMENT_MOVE_CANCEL).getData();
         return new HashMap<String, Object>() {{
             this.put(PAGE_KEY, resultMap);
         }};

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESElavtorRepository;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
@@ -132,7 +133,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @ResultFieldMapping({
             @ResultFieldMapping.ResultFieldMap(sourceField = "transferNoticeInfo.useUnitCreditCode", targetField = "transferNoticeInfo.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
     })
-    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel) {
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, CompanyBo companyBo) {
         // 移装告知信息
         JgTransferNotice notice = jgTransferNoticeMapper.selectById(sequenceNbr);
         if (Objects.isNull(notice)) {
@@ -180,20 +181,23 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             JSONObject hisData = commonService.queryHistoryData(notice.getSequenceNbr());
             // 兼容老数据
             if (hisData == null) {
-                Map<String, Object> detail = getEquipInfoNew(companyLevel, transferNotice, equipListMaps);
+                Map<String, Object> detail = getEquipInfoNew(companyBo, transferNotice, equipListMaps);
+                new FillingEditPermForCurrentUser(new JSONObject(detail), companyBo, BusinessTypeEnum.JG_ADVICE_REMOVAL).getData();
                 return new HashMap<String, Map<String, Object>>() {{
                     this.put("transferNoticeInfo", detail);
                 }};
             } else {
                 CommonServiceImpl.formatTime2StrDateForEquip(hisData);
                 hisData.putAll(transferNotice);
+                new FillingEditPermForCurrentUser(hisData, companyBo, BusinessTypeEnum.JG_ADVICE_REMOVAL).getData();
                 return new HashMap<String, Map<String, Object>>() {{
                     this.put("transferNoticeInfo", hisData);
                 }};
             }
         } else {
             // 显示最新的设备信息
-            Map<String, Object> detail = getEquipInfoNew(companyLevel, transferNotice, equipListMaps);
+            Map<String, Object> detail = getEquipInfoNew(companyBo, transferNotice, equipListMaps);
+            new FillingEditPermForCurrentUser(new JSONObject(detail), companyBo, BusinessTypeEnum.JG_ADVICE_REMOVAL).getData();
             return new HashMap<String, Map<String, Object>>() {{
                 this.put("transferNoticeInfo", detail);
             }};
@@ -250,7 +254,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         });
     }
 
-    private Map<String, Object> getEquipInfoNew(String companyLevel, Map<String, Object> transferNotice, List<Map<String, Object>> equipmentInfos) {
+    private Map<String, Object> getEquipInfoNew(CompanyBo companyBo, Map<String, Object> transferNotice, List<Map<String, Object>> equipmentInfos) {
 //        Map<String, Object> detail = equipmentInfos.get(0);
 //        Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
 //        equInfo.put("useUnitCreditCodeUse", equInfo.getOrDefault("useUnitCreditCode", ""));
@@ -264,7 +268,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 //        equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
 //        BeanUtil.copyProperties(equInfo, detail);
 //        BeanUtil.copyProperties(transferNotice, detail, "equList", "supervisoryCode");
-        transferNotice.put("companyLevel", companyLevel);
+        transferNotice.put("companyLevel", CommonServiceImpl.getCompanyType(companyBo));
         transferNotice.put("deviceList", equipmentInfos);
         return transferNotice;
     }

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

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -41,6 +40,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -2239,7 +2239,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 结果增强，填充单据是否可变更设备状态，用来控制前端按钮的显示隐藏。
             new FillingUseRegisterResult(sequenceNbr, jsonObject, applicationContext).getData();
             // 结果增强，填充当前人是否有编辑按钮权限
-            new FillingEditPermForCurrentUser(jsonObject, Optional.ofNullable(selectedOrgInfo).map(ReginParams::getCompany).orElse(null)).getData();
+            new FillingEditPermForCurrentUser(jsonObject, Optional.ofNullable(selectedOrgInfo).map(ReginParams::getCompany).orElse(null), BusinessTypeEnum.JG_USAGE_REGISTRATION).getData();
             return jsonObject;
         }
         // 基本信息 + 制造信息
@@ -2290,7 +2290,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 结果增强，填充单据是否可变更设备状态
         new DefaultUseRegisterResult(result).getData();
         // 结果增强，填充当前人是否有编辑按钮权限
-        new FillingEditPermForCurrentUser(result, selectedOrgInfo.getCompany()).getData();
+        new FillingEditPermForCurrentUser(result, selectedOrgInfo.getCompany(), BusinessTypeEnum.JG_USAGE_REGISTRATION).getData();
         return result;
     }
 

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

@@ -35,6 +35,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -586,15 +587,26 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         });
     }
 
+    @ResultFieldMapping({@ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitName", targetField = "estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")})
+    public Object queryBySequenceNbrWithAuth(Long sequenceNbr,  CompanyBo companyBo) {
+        JSONObject re = new JSONObject();
+        // todo 注意顺序1
+        new FillingEditPermForCurrentUser(re, companyBo, BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION).getData();
+        JgVehicleInformationVo vehicleInformationVo = this.queryBySequenceNbr(sequenceNbr);
+        // todo 注意顺序2
+        BeanUtil.copyProperties(vehicleInformationVo, re);
+        // todo 本来FillingEditPermForCurrentUser已赋值但是此业务也使用的key companyType故新赋值key
+        re.put("companyType2", CommonServiceImpl.getCompanyType(companyBo));
+        return re;
+    }
+
     /**
      * 查看详情
      *
      * @param sequenceNbr sequenceNbr
-     * @param selectedOrgInfo
      * @return JgVehicleInformationModel
      */
-        @ResultFieldMapping({@ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitName", targetField = "estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")})
-        public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
+        public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationVo vo = new JgVehicleInformationVo();
         JgVehicleInformationDto dto = this.baseMapper.queryBySequenceNbr(sequenceNbr);
@@ -705,7 +717,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
             }
         }
-        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        String companyType = reginParams.getCompany().getCompanyType();
         if ("个人主体".equals(companyType)) {
             vo.setCompanyType("person");
         } else {
@@ -2397,7 +2409,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         if(CollUtil.isNotEmpty(vehicleInformations)){
             for (JgVehicleInformation vehicleInformation : vehicleInformations) {
                 try {
-                    JgVehicleInformationVo jgVehicleInformationVo = this.queryBySequenceNbr(vehicleInformation.getSequenceNbr(), reginParams);
+                    JgVehicleInformationVo jgVehicleInformationVo = this.queryBySequenceNbr(vehicleInformation.getSequenceNbr());
                     String jsonString = JSONObject.toJSONString(jgVehicleInformationVo);
                     JSONObject jsonObject = JSONObject.parseObject(jsonString);
                     jsonObject.put("userName",jgVehicleInformationVo.getCreateUserName());