fix(jg)：维保合同 维护 “维保负责人身份证号码”字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractDto.java

@@ -90,6 +90,8 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "维保负责人一联系方式")
     private String maintenanceManagerOnePhone;
 
+    @ApiModelProperty(value = "维保负责人一身份证号码")
+    private String maintenanceManagerOneIdNum;
 
     @ApiModelProperty(value = "维保负责人二id")
     private String maintenanceManagerTwoId;
@@ -100,6 +102,9 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "维保负责人二联系方式")
     private String maintenanceManagerTwoPhone;
 
+    @ApiModelProperty(value = "维保负责人二身份证号码")
+    private String maintenanceManagerTwoIdNum;
+
 
     @ApiModelProperty(value = "紧急救援电话")
     private String emergencyCall;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContract.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -140,6 +140,12 @@ public class JgMaintenanceContract extends BaseEntity {
     private String maintenanceManagerOnePhone;
 
     /**
+     * 维保负责人一身份证号码
+     */
+    @TableField("maintenance_manager_one_id_num")
+    private String maintenanceManagerOneIdNum;
+
+    /**
      * 维保负责人二id
      */
     @TableField("maintenance_manager_two_id")
@@ -158,6 +164,12 @@ public class JgMaintenanceContract extends BaseEntity {
     @TableField("maintenance_manager_two_phone")
     private String maintenanceManagerTwoPhone;
 
+    /**
+     * 维保负责人二身份证号码
+     */
+    @TableField("maintenance_manager_two_id_num")
+    private String maintenanceManagerTwoIdNum;
+
 
     /**
      * 紧急救援电话

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

@@ -73,6 +73,9 @@ import java.util.Map;
     @TableField("维保负责人一手机号")
     private String maintenanceManagerOnePhone;
 
+    @TableField("维保负责人一身份证号码")
+    private String maintenanceManagerOneIdNum;
+
     @TableField("维保负责人二id")
     private String maintenanceManagerTwoId;
 
@@ -82,6 +85,9 @@ import java.util.Map;
     @TableField("维保负责人二手机号")
     private String maintenanceManagerTwoPhone;
 
+    @TableField("维保负责人二身份证号码")
+    private String maintenanceManagerTwoIdNum;
+
     @TableField("紧急救援电话")
     private String emergencyCall;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -27,7 +27,8 @@
     </select>
     <select id="getUserInfo" resultType="java.util.Map">
         SELECT
-            phone
+            phone,
+            certificate_num as certificateNum
         FROM
             "tzs_user_info"
         WHERE

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

@@ -128,8 +128,8 @@ public class CommonController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/getUserPhone")
-    @ApiOperation(httpMethod = "GET", value = "查询用户对应联系方式", notes = "查询用户对应联系方式")
+    @GetMapping(value = "/getUserInfo")
+    @ApiOperation(httpMethod = "GET", value = "查询用户对应联系方式，证件编号", notes = "查询用户对应联系方式，证件编号")
     public ResponseModel<Map<String, Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
     }

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -23,7 +22,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.*;
+import java.util.Map;
 
 /**
  * 维保合同备案
@@ -144,12 +143,14 @@ public class JgMaintenanceContractController extends BaseController {
                 result.setMaintenanceManagerOneId(maintenanceManagerOneInfo[0]);
                 result.setMaintenanceManagerOneName(maintenanceManagerOneInfo[1]);
                 result.setMaintenanceManagerOnePhone(dto.getMaintenanceManagerOnePhone());
+                result.setMaintenanceManagerOneIdNum(dto.getMaintenanceManagerOneIdNum());
 
                 //维保人员二
                 String[] maintenanceManagerTwoInfo = dto.getMaintenanceManagerTwoId().split("_");
                 result.setMaintenanceManagerTwoId(maintenanceManagerTwoInfo[0]);
                 result.setMaintenanceManagerTwoName(maintenanceManagerTwoInfo[1]);
                 result.setMaintenanceManagerTwoPhone(dto.getMaintenanceManagerTwoPhone());
+                result.setMaintenanceManagerTwoIdNum(dto.getMaintenanceManagerTwoIdNum());
                 result.setPromoter(reginParams.getUserModel().getUserId());
             }
             jgMaintenanceContractServiceImpl.getBaseMapper().updateById(result);