Merge remote-tracking branch 'origin/master'

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -78,7 +78,7 @@ public class SysUserController {
 
         int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone));
         if (countUserPhone >0)
-            return new Result(10001,"身份证已存在",false);
+            return new Result(10001,"手机号已存在",false);
         if (ObjectUtil.isNotEmpty(sysUser.getBirthday())){
             sysUser.setAge(DateUtil.ageOfNow(sysUser.getBirthday()));
         }
@@ -96,24 +96,28 @@ public class SysUserController {
     public Result update(@RequestBody SysUser sysUser) {
         String cardType = sysUser.getCardType();
         String cardNum = sysUser.getCardNum();
-        if ("身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum))
-            return new Result(10001,"身份证格式不正确",false);
 
-        String userPhone = sysUser.getUserPhone();
-        if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
-            return new Result(10001,"手机号格式不正确",false);
 
-        int count = sysUserService.count(new QueryWrapper<SysUser>().eq("card_type", cardType).eq("card_num", cardNum));
-        if (count >1)
-            return new Result(10001,"身份证已存在",false);
+        String userPhone = sysUser.getUserPhone();
+        if(StringUtils.isNotBlank(userPhone)){
+            if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
+                return new Result(10001,"手机号格式不正确",false);
+            int count = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone)) ;
+            if (count >1)
+                return new Result(10001,"手机号已存在",false);
+        }
+        if(StringUtils.isNotBlank(cardNum)){
+            if (StringUtils.isNotBlank(cardNum) && "身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum))
+                return new Result(10001,"身份证格式不正确",false);
+            int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("card_type", cardType).eq("card_num", cardNum));
+            if (countUserPhone >1)
+                return new Result(10001,"身份证已存在",false);
+        }
 
-        int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone));
-        if (countUserPhone >1)
-            return new Result(10001,"身份证已存在",false);
         if (ObjectUtil.isNotEmpty(sysUser.getBirthday())){
             sysUser.setAge(DateUtil.ageOfNow(sysUser.getBirthday()));
         }
-        sysUserService.save(sysUser);
+        sysUserService.updateById(sysUser);
         return new Result(10000,"保存成功",true);
     }
 

huimv-receive/src/main/java/com/huimv/receive/entity/SysUser.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -52,11 +53,6 @@ public class SysUser implements Serializable {
     private String nation;
 
     /**
-     * 国籍
-     */
-    private String nationality;
-
-    /**
      * 籍贯
      */
     private String nativePlace;
@@ -64,7 +60,8 @@ public class SysUser implements Serializable {
     /**
      * 出生日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
     /**
@@ -120,7 +117,8 @@ public class SysUser implements Serializable {
     /**
      * 入职时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryTime;
 
     /**

huimv-receive/src/main/java/com/huimv/receive/entity/vo/BaseProcessByLocationVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class BaseProcessByLocationVo {
@@ -38,6 +39,7 @@ public class BaseProcessByLocationVo {
     private Date isolateRealEndDate;
     private String  imgUrl;
     private String imgStatus;
+    private List<String> imgUrls;
 
 
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java

@@ -3,6 +3,7 @@ package com.huimv.receive.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.utils.Result;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -59,6 +61,13 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
         String locationId = map.get("locationId");
         String processId = map.get("processId");
         List<BaseProcessByLocationVo> baseProcessByLocationVos =  baseProcessMapper.pageByLocationId(locationId,processId);
+        for (BaseProcessByLocationVo baseProcessByLocationVo : baseProcessByLocationVos) {
+            String imgUrl = baseProcessByLocationVo.getImgUrl();
+            if (StringUtils.isNotBlank(imgUrl)){
+                List<String> list = Arrays.asList(imgUrl.split(","));
+                baseProcessByLocationVo.setImgUrls(list);
+            }
+        }
         return new Result(ResultCode.SUCCESS,baseProcessByLocationVos);
     }
 }

huimv-receive/src/main/resources/mapper/SysUserMapper.xml

@@ -9,7 +9,6 @@
         <result column="user_name" property="userName" />
         <result column="male" property="male" />
         <result column="nation" property="nation" />
-        <result column="nationality" property="nationality" />
         <result column="native_place" property="nativePlace" />
         <result column="birthday" property="birthday" />
         <result column="politics_pace" property="politicsPace" />