1.车用气瓶登记使用单位地址bug Bug-23838

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -263,4 +263,10 @@ public class JgVehicleInformationVo implements Serializable {
     private String oRegDate;
 
     private CompanyBo companyInfo;
+
+    @ApiModelProperty(value = "主体类型")
+    private String companyType;
+
+    @ApiModelProperty(value = "是否有权限")
+    private Boolean havingPermission;
 }

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

@@ -154,11 +154,15 @@ public class CommonController extends BaseController {
             String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
             map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
             map.put("address", commonService.getEnterpriseInfo(useUnitCode).get("address"));
+            // 冗余兼容其他业务
+            map.put("useUnitAddress", map.get("address"));
             map.put("companyType", "person");
         } else {
             map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
             map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
             map.put("address", commonService.getEnterpriseInfo(selectedOrgInfo.getCompany().getCompanyCode()).get("address"));
+            // 冗余兼容其他业务
+            map.put("useUnitAddress", map.get("address"));
             map.put("companyType", "company");
         }
         return ResponseHelper.buildResponse(map);

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

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

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

@@ -573,9 +573,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
      * 查看详情
      *
      * @param sequenceNbr sequenceNbr
+     * @param selectedOrgInfo
      * @return JgVehicleInformationModel
      */
-    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr) {
+    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationVo vo = new JgVehicleInformationVo();
         JgVehicleInformationDto dto = this.baseMapper.queryBySequenceNbr(sequenceNbr);
@@ -680,6 +681,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
             vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
         }
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            vo.setCompanyType("person");
+        } else {
+            vo.setCompanyType("company");
+        }
+        vo.setHavingPermission(dto.getNextExecuteUserIds() != null && dto.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
         return vo;
     }