移装变更登记字段及页面字段调整

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

@@ -36,4 +36,5 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
     void revocation(String instanceId);
 
     void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response);
+    Map<String, Object> getDetailFieldCamelCase(String record);
 }

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

@@ -5,6 +5,7 @@ import com.netflix.ribbon.proxy.annotation.Http;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -162,5 +163,10 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
 		jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr, response);
 	}
-
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping (value = "/detailFieldCamelCase")
+	@ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情，返回字段驼峰命名", notes = "根据record查询设备注册信息详情，返回字段驼峰命名")
+	public ResponseModel<Map<String, Object>> getDetailFieldCamelCase(@RequestParam String record) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.getDetailFieldCamelCase(record));
+	}
 }

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

@@ -122,9 +122,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 安全管理员
         if (map.containsKey("safetyManagerName")) {
             map.put("safetyManager", map.get("safetyManagerName"));
+            map.put("safetyManagerId", map.get("safetyManagerId"));
         }
+
         IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
         BeanUtil.copyProperties(map, useInfo);
+        if(map.containsKey("isXixian")){
+            useInfo.setIsNotXiXian(map.get("isXixian").toString());
+        }
         // 城市
         if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
             city.forEach(item -> {
@@ -231,6 +236,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 安全管理员
         if (map.containsKey("safetyManager")) {
             String[] data = String.valueOf(map.getString("safetyManager")).split("_");
+            map.put("safetyManagerId",data[0]);
             map.put("safetyManagerName", data[1]);
         }
         // 使用单位提交

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -221,6 +221,14 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
     @TableField("\"IS_NOT_XIXIAN\"")
     private String isNotXiXian;
 
+
     @TableField("\"STREET_NAME\"")
     private String streetName;
+
+    /**
+     *
+     */
+    @TableField("\"SAFETY_MANAGER_ID\"")
+    private String safetyManagerId;
+
 }