Merge branch 'branch-nt-2022-12-27' of https://git.flowbb.cn/RK-Dev/fqgz-server into branch-nt-2022-12-27

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -124,7 +124,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
     public AppBaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
         AppBaseResponse<List<NotaryOrderQueryRsp>> response = new AppBaseResponse<>();
         IPage<ContractOrderEntity> page = new Page<>(req.getIndex(), req.getSize());
-        QueryWrapper<ContractOrderEntity> qw = new QueryWrapper<>();
+        QueryWrapper<ContractOrderEntity> qw = getQueryWrapper(req);
         if (qw == null) {
             response.fail(ResultCode.PERMISSION_UNAUTHENTICATED);
             return response;
@@ -174,6 +174,11 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         QueryWrapper<ContractOrderEntity> qw = QueryWrapperUtil.convertQuery(order, json);
         SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
         String maxRole = userDomain.getUserMaxRole();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getIssuedStartDate())){
+            qw.ge("issued_time",req.getIssuedStartDate());
+        }else if(org.apache.commons.lang3.StringUtils.isNotBlank(req.getIssuedEndDate())){
+            qw.le("issued_time",req.getIssuedEndDate());
+        }
         if ("超级管理员".equals(maxRole)) {
         } else if ("公证处管理员".equals(maxRole) || "公证书签发".equals(maxRole)) {
             qw.eq("notary_office_id", user.getOrgId().split("_")[1]);
@@ -186,11 +191,6 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         } else {
             return null;
         }
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getIssuedStartDate())){
-            qw.ge("issued_time",req.getIssuedStartDate());
-        }else if(org.apache.commons.lang3.StringUtils.isNotBlank(req.getIssuedEndDate())){
-            qw.le("issued_time",req.getIssuedEndDate());
-        }
 
         return qw;
     }
@@ -403,7 +403,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
             qw.like("id_card",idCard);
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(name)){
-            qw.like("party_name",name);
+            qw.like( "name",name);
         }
         String format = DateFormatUtils.format(new Date());
         qw.between("create_time",format+" 00:00:00",format+" 23:59:59");

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankNotarizeServiceImpl.java

@@ -170,7 +170,7 @@ public class BankNotarizeServiceImpl implements BankNotarizeService {
 	}
 
 	/**
-	 * 客户经理的照片比对
+	 * 当事人的人脸核身
 	 * @param compareImageDto
 	 * @return
 	 */

eladmin-system/src/main/java/me/zhengjie/domain/notary/NotaryDomain.java

@@ -11,4 +11,5 @@ import javax.xml.transform.Result;
 
 public interface NotaryDomain {
     ResultCode compareFace(CompareImageDomain compareImageDomain);
+    ResultCode appCompareFace(CompareImageDomain compareImageDomain);
 }

eladmin-system/src/main/java/me/zhengjie/domain/notary/impl/NotaryDomainImpl.java

@@ -114,8 +114,7 @@ public class NotaryDomainImpl implements NotaryDomain {
         fileInfoMapper.insert(fileInfo);
         thirdPartyInterfaceEntity.setFileId(fileInfo.getId()+"");
         thirdPartyInterfaceEntity.setBusinessNo(compareImageDomain.getBusinessNo());
-        if (StringUtils.isNotBlank(thirdPartyInterfaceEntity.getMessage())){
-            //没有message说明人脸核身成功
+        if (thirdPartyInterfaceEntity.getResult()==1){
             UserAXQInfoEntity userAxq = new UserAXQInfoEntity();
             userAxq.setId(userAXQInfoEntity.getId());
             userAxq.setCompareImgId(fileInfo.getId());