1.单位办理，增加详情地址信息快捷方式，注册修改，个人时增加住所字段

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

@@ -23,9 +23,10 @@ public interface IJgChangeRegistrationUnitService {
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键
+     * @param selectedOrgInfo
      * @return 安装告知
      */
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo);
 
     /**
      * 更新安装告知

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

@@ -158,6 +158,7 @@ public class CommonController extends BaseController {
         } 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("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/JgChangeRegistrationUnitController.java

@@ -117,7 +117,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
     public ResponseModel<Map<String,
             Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.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/controller/JgChangeVehicleRegistrationUnitController.java

@@ -161,7 +161,7 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	@GetMapping(value = "/details")
 	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
 	public ResponseModel<Map<String, Object>> getDetails(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
-		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr));
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr, getSelectedOrgInfo()));
 	}
 
 	@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/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -163,10 +163,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
      *
      * @param sequenceNbr 主键
+     * @param selectedOrgInfo
      * @return 单位变更
      */
     @Override
-    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         // 单位变更信息
         JgChangeRegistrationUnit notice = JgChangeRegistrationUnitMapper.selectById(sequenceNbr);
         if (Objects.isNull(notice)) {
@@ -174,7 +175,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         this.doCompensate(notice);
         Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false, true);
-
+        //回填新单位地址，台套办理的使用登记证打印时 需要，用来校验必输
+        if (!ObjectUtils.isEmpty(notice.getNewUseUnitCreditCode())) {
+            TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseUnitCode, notice.getNewUseUnitCreditCode()));
+            if (useCodeResult != null) {
+                changeInfo.put("address",useCodeResult.getAddress());
+            }
+        }
         //组装下拉数据
         if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) {
             changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
@@ -192,6 +199,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         JgRegistrationHistory historyServiceOne = registrationHistoryService.getOne(
                 new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
         changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
+        changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            changeInfo.put("companyType", "person");
+        } else {
+            changeInfo.put("companyType", "company");
+        }
         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

@@ -767,7 +767,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return Boolean.TRUE;
     }
 
-    public Map<String, Object> getDetails(String sequenceNbr) {
+    public Map<String, Object> getDetails(String sequenceNbr, ReginParams selectedOrgInfo) {
         JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
         this.doCompensate(registrationUnit);
         JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME).one();
@@ -782,6 +782,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             } else {
                 object.put("newCarNumber", registrationUnit.getCarNumber());
             }
+            String companyType = selectedOrgInfo.getCompany().getCompanyType();
+            if ("个人主体".equals(companyType)) {
+                object.put("companyType", "person");
+            } else {
+                object.put("companyType", "company");
+            }
+            object.put("havingPermission", registrationUnit.getNextExecuteUserIds() != null && registrationUnit.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
             return object;
         } else {
             return new HashMap<>();