Kaynağa Gözat

求职用户-实名认证逻辑优化,增加是否人工审核、认证时间

ZhangWenQiang 4 yıl önce
ebeveyn
işleme
8eff55725e

+ 33 - 0
happy-job-base-system/src/main/webapp/webpage/modules/sys/hpuser/authform.jsp

@@ -78,6 +78,39 @@
             }
         }
 
+        function saveConfirm() {
+            var isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+            }else{
+                var idCardFront  = $("input[name='idCardFront']").val();
+                var idCardBack = $("input[name='idCardBack']").val();
+                if(idCardFront == null || idCardFront.trim()==""){
+                    jp.alert("请上身份证正面照片");
+                    return false;
+                }
+                if(idCardBack == null || idCardBack.trim()==""){
+                    jp.alert("请上身份证反面照片");
+                    return false;
+                }
+                var pro= $("#province").find("option:selected").text();
+                var ci= $("#city").find("option:selected").text();
+                $("#nativePlace").val(pro+ci)
+                console.log( $("#nativePlace").val())
+                jp.loading();
+                jp.post("${ctx}/sys/hpMember/approve",$('#inputForm').serialize(),function(data){
+                    if(data.success){
+                        jp.getParent().refresh();
+                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(dialogIndex);
+                        jp.success("信息确认成功")
+
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+            }
+        }
 
         function save1() {
             jp.loading();

+ 30 - 3
happy-job-base-system/src/main/webapp/webpage/modules/sys/hpuser/hpUserList.js

@@ -9,6 +9,14 @@ $(document).ready(function() {
         format: "YYYY-MM-DD",
         // defaultDate: new Date(new Date(new Date().toLocaleDateString()).getTime()+24*60*60*1000-1)
     });
+    $('#beginAuthenticationTime').datetimepicker({
+        format: "YYYY-MM-DD",
+        // defaultDate: new Date(new Date(new Date().toLocaleDateString()).getTime())
+    });
+    $('#endAuthenticationTime').datetimepicker({
+        format: "YYYY-MM-DD",
+        // defaultDate: new Date(new Date(new Date().toLocaleDateString()).getTime()+24*60*60*1000-1)
+    });
 	$('#hpUserTable').bootstrapTable({
 		 
 		  //请求方法
@@ -165,6 +173,21 @@ $(document).ready(function() {
 		       
 		    }
 		    ,{
+				   field: 'authenticationTime',
+				   title: '认证时间',
+				   sortable: false,
+				   sortName: 'authenticationTime'
+              }
+			   ,{
+				   field: 'isManualCheck',
+				   title: '是否人工',
+				   sortable: false,
+				   sortName: 'isManualCheck',
+				   formatter:function(value, row , index){
+					   return jp.getDictLabel(${fns:toJson(fns:getDictList('is_manual_check'))}, value, "-");
+				   }
+			   }
+		    ,{
 			   field: 'hpUser.useFlag',
 			   title: '状态',
 			   sortable: false,
@@ -327,12 +350,16 @@ $(document).ready(function() {
 			auto:auto,
 			maxmin: true, //开启最大化最小化按钮
 			content: url ,
-			btn: ['通过', '不通过'],
+			btn: ['信息确认', '通过', '不通过'],
 			yes: function(index,layero){
 				var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象,执行窗口内iframe页的方法:iframeWin.method();
-				iframeWin.contentWindow.save();//调用保存事件,在 弹出页内,需要定义save方法。处理保存事件。
+				iframeWin.contentWindow.saveConfirm();//调用保存事件,在 弹出页内,需要定义save方法。处理保存事件。
 			},
-			btn2 : function(index,layero){
+            btn2 : function(index,layero){
+                var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象,执行窗口内iframe页的方法:iframeWin.method();
+                iframeWin.contentWindow.save();//调用保存事件,在 弹出页内,需要定义save方法。处理保存事件。
+            },
+			btn3 : function(index,layero){
 				var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象,执行窗口内iframe页的方法:iframeWin.method();
 				iframeWin.contentWindow.save1();//调用保存事件,在 弹出页内,需要定义save方法。处理保存事件。
 			},

+ 35 - 0
happy-job-base-system/src/main/webapp/webpage/modules/sys/hpuser/hpUserList.jsp

@@ -95,6 +95,41 @@
 						</form:select>
 					</div>
 
+					<div class="col-xs-12 col-sm-3 col-md-2">
+						<label class="label-item single-overflow pull-left" title="是否人工:">是否人工:</label>
+						<form:select path="isManualCheck"  class="form-control m-b input-sm">
+							<form:option value="" label="全部"/>
+							<form:options items="${fns:getDictList('is_manual_check')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div class="form-group">
+							<label class="label-item single-overflow pull-left" title="认证时间:">&nbsp;认证时间:</label>
+							<div class="col-xs-12">
+								<div class="col-xs-12 col-sm-5">
+									<div class='input-group date' id='beginAuthenticationTime' style="left: -10px;" >
+										<input type='text'  name="beginAuthenticationTime" class="form-control input-sm"  placeholder="认证开始时间之后数据" value=""/>
+										<span class="input-group-addon">
+											   <span class="glyphicon glyphicon-calendar"></span>
+										   </span>
+									</div>
+								</div>
+								<div class="col-xs-12 col-sm-1">
+									~
+								</div>
+								<div class="col-xs-12 col-sm-5">
+									<div class='input-group date' id='endAuthenticationTime' style="left: -10px;" >
+										<input type='text'  name="endAuthenticationTime" class="form-control input-sm" placeholder="认证结束时间之前数据"/>
+										<span class="input-group-addon">
+											   <span class="glyphicon glyphicon-calendar"></span>
+										   </span>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+
 				    <div class="col-xs-12 col-sm-3 col-md-2">
 						<div style="margin-top:26px;margin-left: 10px">
 						  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>

+ 2 - 0
happy-job-module-hpjob/src/main/java/com/jeeplus/modules/hpuser/service/HpResumeService.java

@@ -545,6 +545,8 @@ public class HpResumeService extends CrudService<HpResumeMapper, HpResume> {
                     }
                     //认证状态变为等待认证(3.4.5版本改成认证成功)
                     hpMember.setAuthenticationStatus(3);
+                    hpMember.setIsManualCheck(0);
+                    hpMember.setAuthenticationTime(new Date());
                     hpMemberService.save(hpMember);
                     //新手任务-实名认证
                     mpMemberTaskServiceF.saveMpMemberTaskF(hpMember, "2");

+ 287 - 250
happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/entity/HpMember.java

@@ -1,251 +1,288 @@
-/**
- * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
- */
-package com.jeeplus.modules.sys.entity;
-
-import com.jeeplus.modules.hpuser.entity.HpUserContact;
-import com.jeeplus.modules.sys.entity.User;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.jeeplus.core.persistence.DataEntity;
-import com.jeeplus.common.utils.excel.annotation.ExcelField;
-import com.jeeplus.modules.vipmanager.entity.MpMemberAccountF;
-
-/**
- * 会员表Entity
- * @author lifei
- * @version 2019-08-01
- */
-public class HpMember extends DataEntity<HpMember> {
-	
-	private static final long serialVersionUID = 1L;
-	private HpUser hpUser;		// 登录用户
-	private String phone;		// 手机号
-	private String realName;		// 真是姓名
-	private Integer gender;		// 性别(0:未知 1:男性 2:女性)
-	private Integer birthYear;		// 出生年份
-	private String idCardNumber;		// 身份证号码
-	private String idCardFront;		// 身份证正面
-	private String idCardBack;		// 身份证反面
-	private String idCardHold;		// 手持身份证
-	private Integer authenticationStatus;		// 认证状态(0:未认证 1:等待认证 2:未通过 3:已认证)
-	private String contactPerson;		// 联系人(当此字段不为null时,说明跟进模块已被该用户锁住,其他用户不可以跟进)
-	private Date contactTime;		// 联系时间
-	private Integer contactStatus;		// 联系状态(0:联系 1:再联系 2:面试 3:入职 4:离职 5:流失) 
-	private String contactContent;		// 联系内容
-	private Integer memberType;		// 会员级别(0:普通用户)
-	private String qrcode;		// 用户二维码
-	private List<HpUserContact> hpUserContactList;    //用户联系列表
-	private Integer nativePlaceProvince;   //籍贯Code(省)
-	private Integer nativePlaceCity;    //籍贯Code(市)
-    private  String nativePlace;   //籍贯
-    private Integer isMainNation;  //是否四大民族(0:不是 1:是)
-	private MpMemberAccountF mpMemberAccountF;
-
-	public HpMember() {
-		super();
-		this.setIdType(IDTYPE_AUTO);
-	}
-
-	public HpMember(String id){
-		super(id);
-	}
-
-	public HpUser getHpUser() {
-		return hpUser;
-	}
-
-	public void setHpUser(HpUser hpUser) {
-		this.hpUser = hpUser;
-	}
-
-	@ExcelField(title="手机号", align=2, sort=2)
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-	
-	@ExcelField(title="真是姓名", align=2, sort=3)
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-	
-	@ExcelField(title="性别", align=2, sort=4)
-	public Integer getGender() {
-		return gender;
-	}
-
-	public void setGender(Integer gender) {
-		this.gender = gender;
-	}
-	
-	@ExcelField(title="出生年份", align=2, sort=5)
-	public Integer getBirthYear() {
-		return birthYear;
-	}
-
-	public void setBirthYear(Integer birthYear) {
-		this.birthYear = birthYear;
-	}
-	
-	@ExcelField(title="身份证号码", align=2, sort=6)
-	public String getIdCardNumber() {
-		return idCardNumber;
-	}
-
-	public void setIdCardNumber(String idCardNumber) {
-		this.idCardNumber = idCardNumber;
-	}
-	
-	@ExcelField(title="身份证正面")
-	public String getIdCardFront() {
-		return idCardFront;
-	}
-
-	public void setIdCardFront(String idCardFront) {
-		this.idCardFront = idCardFront;
-	}
-	
-	@ExcelField(title="身份证反面")
-	public String getIdCardBack() {
-		return idCardBack;
-	}
-
-	public void setIdCardBack(String idCardBack) {
-		this.idCardBack = idCardBack;
-	}
-	
-	@ExcelField(title="手持身份证")
-	public String getIdCardHold() {
-		return idCardHold;
-	}
-
-	public void setIdCardHold(String idCardHold) {
-		this.idCardHold = idCardHold;
-	}
-	
-	@ExcelField(title="认证状态(0:未认证 1:等待认证 2:未通过 3:已认证)")
-	public Integer getAuthenticationStatus() {
-		return authenticationStatus;
-	}
-
-	public void setAuthenticationStatus(Integer authenticationStatus) {
-		this.authenticationStatus = authenticationStatus;
-	}
-	
-	@ExcelField(title="联系人(当此字段不为null时,说明跟进模块已被该用户锁住,其他用户不可以跟进)")
-	public String getContactPerson() {
-		return contactPerson;
-	}
-
-	public void setContactPerson(String contactPerson) {
-		this.contactPerson = contactPerson;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="联系时间")
-	public Date getContactTime() {
-		return contactTime;
-	}
-
-	public void setContactTime(Date contactTime) {
-		this.contactTime = contactTime;
-	}
-	
-	@ExcelField(title="联系状态(0:联系 1:再联系 2:面试 3:入职 4:离职 5:流失) ", align=2, sort=13)
-	public Integer getContactStatus() {
-		return contactStatus;
-	}
-
-	public void setContactStatus(Integer contactStatus) {
-		this.contactStatus = contactStatus;
-	}
-	
-	@ExcelField(title="联系内容")
-	public String getContactContent() {
-		return contactContent;
-	}
-
-	public void setContactContent(String contactContent) {
-		this.contactContent = contactContent;
-	}
-	
-	@NotNull(message="会员级别(0:普通用户)不能为空")
-	@ExcelField(title="会员级别(0:普通用户)")
-	public Integer getMemberType() {
-		return memberType;
-	}
-
-	public void setMemberType(Integer memberType) {
-		this.memberType = memberType;
-	}
-	
-	@ExcelField(title="用户二维码")
-	public String getQrcode() {
-		return qrcode;
-	}
-
-	public void setQrcode(String qrcode) {
-		this.qrcode = qrcode;
-	}
-
-	public List<HpUserContact> getHpUserContactList() {
-		return hpUserContactList;
-	}
-
-	public void setHpUserContactList(List<HpUserContact> hpUserContactList) {
-		this.hpUserContactList = hpUserContactList;
-	}
-
-
-	public Integer getNativePlaceProvince() {
-		return nativePlaceProvince;
-	}
-
-	public void setNativePlaceProvince(Integer nativePlaceProvince) {
-		this.nativePlaceProvince = nativePlaceProvince;
-	}
-
-	public Integer getNativePlaceCity() {
-		return nativePlaceCity;
-	}
-
-	public void setNativePlaceCity(Integer nativePlaceCity) {
-		this.nativePlaceCity = nativePlaceCity;
-	}
-
-	public String getNativePlace() {
-		return nativePlace;
-	}
-
-	public void setNativePlace(String nativePlace) {
-		this.nativePlace = nativePlace;
-	}
-
-	public Integer getIsMainNation() {
-		return isMainNation;
-	}
-
-	public void setIsMainNation(Integer isMainNation) {
-		this.isMainNation = isMainNation;
-	}
-
-	public MpMemberAccountF getMpMemberAccountF() {
-		return mpMemberAccountF;
-	}
-
-	public void setMpMemberAccountF(MpMemberAccountF mpMemberAccountF) {
-		this.mpMemberAccountF = mpMemberAccountF;
-	}
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sys.entity;
+
+import com.jeeplus.modules.hpuser.entity.HpUserContact;
+import com.jeeplus.modules.sys.entity.User;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.jeeplus.core.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.vipmanager.entity.MpMemberAccountF;
+
+/**
+ * 会员表Entity
+ * @author lifei
+ * @version 2019-08-01
+ */
+public class HpMember extends DataEntity<HpMember> {
+	
+	private static final long serialVersionUID = 1L;
+	private HpUser hpUser;		// 登录用户
+	private String phone;		// 手机号
+	private String realName;		// 真是姓名
+	private Integer gender;		// 性别(0:未知 1:男性 2:女性)
+	private Integer birthYear;		// 出生年份
+	private String idCardNumber;		// 身份证号码
+	private String idCardFront;		// 身份证正面
+	private String idCardBack;		// 身份证反面
+	private String idCardHold;		// 手持身份证
+	private Integer authenticationStatus;		// 认证状态(0:未认证 1:等待认证 2:未通过 3:已认证)
+	private String contactPerson;		// 联系人(当此字段不为null时,说明跟进模块已被该用户锁住,其他用户不可以跟进)
+	private Date contactTime;		// 联系时间
+	private Integer contactStatus;		// 联系状态(0:联系 1:再联系 2:面试 3:入职 4:离职 5:流失) 
+	private String contactContent;		// 联系内容
+	private Integer memberType;		// 会员级别(0:普通用户)
+	private String qrcode;		// 用户二维码
+	private List<HpUserContact> hpUserContactList;    //用户联系列表
+	private Integer nativePlaceProvince;   //籍贯Code(省)
+	private Integer nativePlaceCity;    //籍贯Code(市)
+    private  String nativePlace;   //籍贯
+    private Integer isMainNation;  //是否四大民族(0:不是 1:是)
+	private MpMemberAccountF mpMemberAccountF;
+	private Integer isManualCheck; //是否人工审核(0:否;1:是)
+	private Date authenticationTime;  //认证时间
+	private Date beginAuthenticationTime;        // 开始 认证时间
+	private Date endAuthenticationTime;        // 结束 认证时间
+
+	public HpMember() {
+		super();
+		this.setIdType(IDTYPE_AUTO);
+	}
+
+	public HpMember(String id){
+		super(id);
+	}
+
+	public HpUser getHpUser() {
+		return hpUser;
+	}
+
+	public void setHpUser(HpUser hpUser) {
+		this.hpUser = hpUser;
+	}
+
+	@ExcelField(title="手机号", align=2, sort=2)
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+	
+	@ExcelField(title="真是姓名", align=2, sort=3)
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+	
+	@ExcelField(title="性别", align=2, sort=4)
+	public Integer getGender() {
+		return gender;
+	}
+
+	public void setGender(Integer gender) {
+		this.gender = gender;
+	}
+	
+	@ExcelField(title="出生年份", align=2, sort=5)
+	public Integer getBirthYear() {
+		return birthYear;
+	}
+
+	public void setBirthYear(Integer birthYear) {
+		this.birthYear = birthYear;
+	}
+	
+	@ExcelField(title="身份证号码", align=2, sort=6)
+	public String getIdCardNumber() {
+		return idCardNumber;
+	}
+
+	public void setIdCardNumber(String idCardNumber) {
+		this.idCardNumber = idCardNumber;
+	}
+	
+	@ExcelField(title="身份证正面")
+	public String getIdCardFront() {
+		return idCardFront;
+	}
+
+	public void setIdCardFront(String idCardFront) {
+		this.idCardFront = idCardFront;
+	}
+	
+	@ExcelField(title="身份证反面")
+	public String getIdCardBack() {
+		return idCardBack;
+	}
+
+	public void setIdCardBack(String idCardBack) {
+		this.idCardBack = idCardBack;
+	}
+	
+	@ExcelField(title="手持身份证")
+	public String getIdCardHold() {
+		return idCardHold;
+	}
+
+	public void setIdCardHold(String idCardHold) {
+		this.idCardHold = idCardHold;
+	}
+	
+	@ExcelField(title="认证状态(0:未认证 1:等待认证 2:未通过 3:已认证)")
+	public Integer getAuthenticationStatus() {
+		return authenticationStatus;
+	}
+
+	public void setAuthenticationStatus(Integer authenticationStatus) {
+		this.authenticationStatus = authenticationStatus;
+	}
+	
+	@ExcelField(title="联系人(当此字段不为null时,说明跟进模块已被该用户锁住,其他用户不可以跟进)")
+	public String getContactPerson() {
+		return contactPerson;
+	}
+
+	public void setContactPerson(String contactPerson) {
+		this.contactPerson = contactPerson;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ExcelField(title="联系时间")
+	public Date getContactTime() {
+		return contactTime;
+	}
+
+	public void setContactTime(Date contactTime) {
+		this.contactTime = contactTime;
+	}
+	
+	@ExcelField(title="联系状态(0:联系 1:再联系 2:面试 3:入职 4:离职 5:流失) ", align=2, sort=13)
+	public Integer getContactStatus() {
+		return contactStatus;
+	}
+
+	public void setContactStatus(Integer contactStatus) {
+		this.contactStatus = contactStatus;
+	}
+	
+	@ExcelField(title="联系内容")
+	public String getContactContent() {
+		return contactContent;
+	}
+
+	public void setContactContent(String contactContent) {
+		this.contactContent = contactContent;
+	}
+	
+	@NotNull(message="会员级别(0:普通用户)不能为空")
+	@ExcelField(title="会员级别(0:普通用户)")
+	public Integer getMemberType() {
+		return memberType;
+	}
+
+	public void setMemberType(Integer memberType) {
+		this.memberType = memberType;
+	}
+	
+	@ExcelField(title="用户二维码")
+	public String getQrcode() {
+		return qrcode;
+	}
+
+	public void setQrcode(String qrcode) {
+		this.qrcode = qrcode;
+	}
+
+	public List<HpUserContact> getHpUserContactList() {
+		return hpUserContactList;
+	}
+
+	public void setHpUserContactList(List<HpUserContact> hpUserContactList) {
+		this.hpUserContactList = hpUserContactList;
+	}
+
+
+	public Integer getNativePlaceProvince() {
+		return nativePlaceProvince;
+	}
+
+	public void setNativePlaceProvince(Integer nativePlaceProvince) {
+		this.nativePlaceProvince = nativePlaceProvince;
+	}
+
+	public Integer getNativePlaceCity() {
+		return nativePlaceCity;
+	}
+
+	public void setNativePlaceCity(Integer nativePlaceCity) {
+		this.nativePlaceCity = nativePlaceCity;
+	}
+
+	public String getNativePlace() {
+		return nativePlace;
+	}
+
+	public void setNativePlace(String nativePlace) {
+		this.nativePlace = nativePlace;
+	}
+
+	public Integer getIsMainNation() {
+		return isMainNation;
+	}
+
+	public void setIsMainNation(Integer isMainNation) {
+		this.isMainNation = isMainNation;
+	}
+
+	public MpMemberAccountF getMpMemberAccountF() {
+		return mpMemberAccountF;
+	}
+
+	public void setMpMemberAccountF(MpMemberAccountF mpMemberAccountF) {
+		this.mpMemberAccountF = mpMemberAccountF;
+	}
+
+	public Integer getIsManualCheck() {
+		return isManualCheck;
+	}
+
+	public void setIsManualCheck(Integer isManualCheck) {
+		this.isManualCheck = isManualCheck;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getAuthenticationTime() {
+		return authenticationTime;
+	}
+
+	public void setAuthenticationTime(Date authenticationTime) {
+		this.authenticationTime = authenticationTime;
+	}
+
+	public Date getBeginAuthenticationTime() {
+		return beginAuthenticationTime;
+	}
+
+	public void setBeginAuthenticationTime(Date beginAuthenticationTime) {
+		this.beginAuthenticationTime = beginAuthenticationTime;
+	}
+
+	public Date getEndAuthenticationTime() {
+		return endAuthenticationTime;
+	}
+
+	public void setEndAuthenticationTime(Date endAuthenticationTime) {
+		this.endAuthenticationTime = endAuthenticationTime;
+	}
 }

+ 13 - 1
happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/mapper/xml/HpMemberMapper.xml

@@ -28,6 +28,8 @@
 		a.native_place_city as "nativePlaceCity",
         a.native_place as "nativePlace",
         a.is_main_nation as "isMainNation",
+        a.is_manual_check AS "isManualCheck",
+        a.authentication_time AS "authenticationTime",
 		su.create_by AS "hpUser.createBy.id",
 		su.create_date AS "hpUser.createDate",
 		su.update_by AS "hpUser.updateBy.id",
@@ -207,6 +209,15 @@
 				<if test="dbName == 'mssql'">'%'+#{contactPerson}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{contactPerson},'%')</if>
 			</if>
+			<if test="isManualCheck != null">
+				AND a.is_manual_check = #{isManualCheck}
+			</if>
+			<if test="beginAuthenticationTime != null and beginAuthenticationTime !=''">
+				AND a.authentication_time &gt;= #{beginAuthenticationTime}
+			</if>
+			<if test="endAuthenticationTime != null and endAuthenticationTime !=''">
+				AND DATE_SUB(a.authentication_time, INTERVAL 1 DAY) &lt; date(#{endAuthenticationTime})
+			</if>
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -353,7 +364,8 @@
 		UPDATE hp_member SET
 		    update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			authentication_status = #{authenticationStatus}
+			authentication_status = #{authenticationStatus},
+			is_manual_check = #{isManualCheck}
 		WHERE id = #{id}
 	</update>
 

+ 2 - 0
happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/web/HpMemberController.java

@@ -349,6 +349,7 @@ public class HpMemberController extends BaseController {
     public AjaxJson approve(HpMember hpMember) {
         AjaxJson j = new AjaxJson();
         hpMember.setAuthenticationStatus(3);
+        hpMember.setIsManualCheck(1);
         List<HpMember> hpMemberList=hpMemberService.getAuthMemberListByIdCard(hpMember);
         if(hpMemberList.size()>0){
             j.setMsg("已有相同身份证用户审核通过,无法再审核通过");
@@ -376,6 +377,7 @@ public class HpMemberController extends BaseController {
             return j;
         }
         hpMember.setAuthenticationStatus(2);
+        hpMember.setIsManualCheck(1);
         hpMember.preUpdate();
         hpMemberService.approve(hpMember);
         j.setMsg("用户认证未通过");