Compare commits

..

No commits in common. "5a19e81931a837c0ba61d5fcea9591c0a822f5ea" and "a8853781c41a2c00652cb478b4f97dfe73856660" have entirely different histories.

3 changed files with 20 additions and 25 deletions

View File

@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -105,8 +104,7 @@ public class UniCallBackController {
if(type==1){// 人员比对结果,1:比对成功 2:比对失败
String admitGuid=json.getString("admitGuid");
String cardNo=json.getString("cardNo");
long projectId=Long.parseLong(cardNo);
long projectId=Long.parseLong(json.getString("cardNo"));
String deviceNo=json.getString("deviceNo");
String filePath=json.getString("filePath");
Date showTime=new Date(json.getLong("showTime"));

View File

@ -487,7 +487,7 @@ public class UniServiceImpl implements IUniService{
userJo.put("name",puser.getUserName());
userJo.put("phone",puser.getUserPhone());
userJo.put("tag",puser.getUserName());
userJo.put("cardNo",projectId);
userJo.put("cardNo",puser.getUserId()+"00000"+projectId);
userJo.put("idCardNo",puser.getCardCode());
userJo.put("password","");
userJo.put("addition","");

View File

@ -148,26 +148,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="身份证信息" prop="identificationCard">
<el-col :span="8">
<div class="div-header">头像面</div>
<image-upload v-model="form.certificatePhoto1" :limit="1" class="identification-card-1"
@change="doImageUpload" />
</el-col>
<el-col :span="8">
<div class="div-header">国徽面</div>
<image-upload v-model="form.certificatePhoto2" :limit="1" class="identification-card-2"
@change="doImageUpload" />
</el-col>
<el-col :span="8">
<div class="div-header">人脸识别头像</div>
<image-upload v-model="form.faceImage" :limit="1" class="face-image" @change="doImageUpload" />
</el-col>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入姓名" />
@ -260,7 +240,24 @@
<el-input v-model="form.bankOffice" placeholder="请输入开户网点" />
</el-form-item></el-col>
<el-col :span="24">
<el-form-item label="身份证信息" prop="identificationCard">
<el-col :span="8">
<div class="div-header">头像面</div>
<image-upload v-model="form.certificatePhoto1" :limit="1" class="identification-card-1"
@change="doImageUpload" />
</el-col>
<el-col :span="8">
<div class="div-header">国徽面</div>
<image-upload v-model="form.certificatePhoto2" :limit="1" class="identification-card-2"
@change="doImageUpload" />
</el-col>
<el-col :span="8">
<div class="div-header">人脸识别头像</div>
<image-upload v-model="form.faceImage" :limit="1" class="face-image" @change="doImageUpload" />
</el-col>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>