查询用户

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -3,7 +3,10 @@ package com.huimv.farm.damsubsidy.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
@@ -25,6 +28,7 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -265,4 +269,15 @@ public class SysUserController {
         Long userId = TokenSign.getMemberIdByJwtToken(request);
         return iSysUserService.remove(sysUser,userId);
     }
+
+    @PostMapping("/getUser")
+    public Result getUser(@RequestBody Map<String,String> paramsMap){
+        String userName = paramsMap.get("userName");
+        List<SysUser> sysUsers = iSysUserService.list(new QueryWrapper<SysUser>().in("user_type", 2, 3).like("user_name", userName));
+        if (ObjectUtil.isEmpty(sysUsers)){
+            return new Result(ResultCode.SUCCESS,null);
+        }else {
+            return new Result(ResultCode.SUCCESS,sysUsers);
+        }
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -52,4 +52,5 @@ public interface ISysUserService extends IService<SysUser> {
     Result addXiang(SysUser sysUser, Long userId);
 
     Result remove(SysUser sysUser, Long userId);
+
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -71,7 +71,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         calendar.setTime(startTime);
         calendar.add(Calendar.DATE, Integer.valueOf(dayIsolated));
         Date endTime = calendar.getTime();
-        String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum)).getCreateUser();
+        String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum)).getCargoOwner();
         billIsolated.setInspectionName(userName+"的隔离信息");
         billIsolated.setInspectionNum(inspectionNum);
         billIsolated.setIsolatedPosition(isolatedPosition);
@@ -80,7 +80,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         billIsolated.setEndIsolated(endTime);
         billIsolated.setCreateTime(DateTime.now());
         billIsolated.setCreateUser(TokenSign.getUserName(httpServletRequest));
-        this.save(billIsolated);
+
 
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
         String eartags = billLandingInspection.getEartags();
@@ -180,8 +180,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());
         landingInspectionMapper.updateById(billLandingInspection);
-
-
+        this.save(billIsolated);
         return Result.SUCCESS();