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/mapper/JgChangeRegistrationTransferEqMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 /**
@@ -14,4 +15,7 @@ import org.apache.ibatis.annotations.Update;
 public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> {
     @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId,@Param("currentDocumentId") String currentDocumentId);
+
+    @Select("select equ_id from tzs_jg_change_registration_transfer_eq where   equip_transfer_id = #{currentDocumentId} ")
+    String getEquipIdByEquipTransferId(@Param("currentDocumentId") String currentDocumentId);
 }

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

@@ -130,8 +130,8 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/detail")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个移装变更登记登记",  notes = "根据sequenceNbr查询单个移装变更登记登记")
-	public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam String sequenceNbr,
-																	 @RequestParam String equipId) {
+	public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam(value = "sequenceNbr") String sequenceNbr,
+																	 @RequestParam(value = "equipId", required = false) String equipId) {
 	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.getTransferDetail(sequenceNbr, equipId));
 	}
 

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

@@ -456,21 +456,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     }
 
     /**
-     * 根据设备Id查询详情
+     * 根据移装变更记录sequenceNbr查询详情
      *
-     * @param equipId 设备Id
+     * @param sequenceNbr 变更记录sequenceNbr
      * @return
      */
     public Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, String equipId) {
         Map<String, Map<String, Object>> pageDataMap = new HashMap<>();
         Map<String, Object> resultDataMap = new HashMap<>();
-
-        //查询设备详情
-        if (!ValidationUtil.isEmpty(equipId)) {
-            Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-            resultDataMap.putAll(equipDetailMap);
-        }
-
         //移装变更详情
         JgChangeRegistrationTransfer transferById = this.getById(sequenceNbr);
         if (!ValidationUtil.isEmpty(transferById)) {
@@ -478,6 +471,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             resultDataMap.putAll(transferToMap);
         }
 
+        //查询设备详情
+        if (ValidationUtil.isEmpty(equipId)) {
+            equipId = jgChangeRegistrationTransferEqMapper.getEquipIdByEquipTransferId(sequenceNbr);
+        }
+
+        Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+        resultDataMap.putAll(equipDetailMap);
+
         //判断流程是否执行完成，
         // 1、未执行完成时查询历史表
         // 2、执行完成后查询使用信息表

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -105,7 +105,7 @@
     "type": "110",
     "pageType": "look",
     "name": "移装变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&formType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "110",