司机用户增加身份证字段

backend/inz.basis/src/main/java/com/beecode/inz/basis/dao/DriverUserDao.java

@@ -18,4 +18,6 @@ public interface DriverUserDao extends BaseDao {
 	List<KObject> queryPositionByName(String phone);
 
 	List<KObject> userNameRepeatCheck(String username);
+
+    List<KObject> idCardRepeatCheck(String idCard);
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/dao/DriverUserDaoImpl.java

@@ -90,5 +90,13 @@ public class DriverUserDaoImpl extends AbstractBaseDao implements DriverUserDao
             return query.getResultList();
         });
 	}
+	@Override
+	public List<KObject> idCardRepeatCheck(String idCard) {
+		return template.execute(session -> {
+            Query<KObject> query = session.createQuery("from " + DriverUserConstants.ENTITY + " where (discard is null or discard = 0) and (enabled = 1) and idCard =:idCard ", KObject.class);
+            query.setParameter("username", idCard);
+            return query.getResultList();
+        });
+	}
 
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/service/DriverUserServiceImpl.java

@@ -221,6 +221,16 @@ public class DriverUserServiceImpl implements DriverUserService {
 		return flag;
 	}
 
+	@Override
+	public Boolean idCardRepeatCheck(String idCard) {
+		List<KObject> list = dao.idCardRepeatCheck(idCard);
+		Boolean flag = false;
+		if (list != null && list.size() > 0 ) {
+			flag = true;
+		}
+		return flag;
+	}
+
 
 
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/service/DriverUserService.java

@@ -67,4 +67,5 @@ public interface DriverUserService {
 
 	Boolean userNameRepeatCheck(String parameter);
 
+    Boolean idCardRepeatCheck(String idCard);
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/web/DriverUserController.java

@@ -170,6 +170,11 @@ public class DriverUserController {
 			if(userNameResult){
 				return ResponseObj.error("账号重复");
 			}
+		case "ID_CARD_CHECK":
+			Boolean idCardResult = driverUserService.idCardRepeatCheck(parameter);
+			if(idCardResult){
+				return ResponseObj.error("身份证号重复");
+			}
 		default:
 			return null;
 		}

backend/inz.basis/src/main/resources/config/Driver.hbm.xml

@@ -19,6 +19,9 @@
 		<property name="title" type="string" >
 			<column name="title" length="100"></column>
 		</property>
+		<property name="idCard" type="string" >
+			<column name="id_card" length="30"></column>
+		</property>
 		<property name="code" type="string" >
 			<column name="code" length="100" unique="true"></column>
 		</property>

backend/inz.common/src/main/java/com/beecode/inz/common/util/DateTimeUtils.java

@@ -257,6 +257,7 @@ public class DateTimeUtils {
         cal.set(Calendar.HOUR_OF_DAY, 0);
         cal.set(Calendar.SECOND, 0);
         cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
 
     }
@@ -272,6 +273,8 @@ public class DateTimeUtils {
         cal.set(Calendar.HOUR_OF_DAY, 23);
         cal.set(Calendar.SECOND, 59);
         cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.MILLISECOND, 999);
+
         return cal.getTime();
 
     }