wwh 1 éve
szülő
commit
96ea0b7ce9

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/config/InterceptorConfig.java

@@ -30,7 +30,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/secureApi/bill-isolate/printIsolate"
                         ,"/secureApi/bill-luggage/printLuggage"
                         ,"/secureApi/admin/user/printUser"
-                        ,"/secureApi/admin/accountMultilevel/printAccount"
+                        ,"/secureApi/accountMultilevel/printAccount"
                         ,"/secureApi/base-device/printDevice"
                         ,"/secureApi/bill-personnel-admission/listDoor"
 

+ 55 - 0
huimv-receive/src/main/java/com/huimv/receive/controller/SysAccountMultilevelController1.java

@@ -0,0 +1,55 @@
+package com.huimv.receive.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.PdfUtil;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.common.utils.UploadImage;
+import com.huimv.receive.entity.AccountGroup;
+import com.huimv.receive.entity.SysAccountMultilevel;
+import com.huimv.receive.service.IAccountGroupService;
+import com.huimv.receive.service.ISysAccountMultilevelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/accountMultilevel")
+public class SysAccountMultilevelController1 {
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @Autowired
+    private IAccountGroupService accountGroupService;
+    @Autowired
+    private UploadImage uploadImage;
+
+    @GetMapping("/printAccount")
+    public void printAccount(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        accountMultilevelService.printAccount(response, map);
+        String path = "/opt/huatong/account.xls";
+        PdfUtil.returnPdfStream3(response, path, "账号列表");
+    }
+}

+ 21 - 9
huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -192,7 +192,7 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         List<AccountVo> list = new ArrayList<>();
         for (String s : split) {
             QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("id", s);
+            queryWrapper.eq("user_id", s);
             SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectOne(queryWrapper);
             QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("id", sysAccountMultilevel.getUserId());
@@ -203,15 +203,27 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
             accountVo.setUserName(user.getUserName());
             accountVo.setWorkLocation(user.getWorkLocation());
             accountVo.setUserNum(user.getUserId());
-            if (user.getJob().equals("1")) {
-                accountVo.setWorkName("场长");
-            } else if (user.getJob().equals("3")) {
-                accountVo.setWorkName("生物安全负责人");
-            } else if (user.getJob().equals("4")) {
-                accountVo.setWorkName("pcr检测人员");
-            } else if (user.getJob().equals("5")) {
-                accountVo.setWorkName("洗消点工作人员");
+            String job = user.getJob();
+            String[] strings = job.split(",");
+            String jobName = "";
+            for (String string : strings) {
+                if ("1".equals(string)) {
+                    jobName = jobName + " 场长";
+                } else if ("2".equals(string)) {
+                    jobName = jobName + " 紧急入场审核员";
+                }else if ("3".equals(string)) {
+                    jobName = jobName + " 生物安全负责人";
+                }else if ("4".equals(string)) {
+                    jobName = jobName + " pcr检测人员";
+                }else if ("5".equals(string)) {
+                    jobName = jobName + " 洗消站点工作人员";
+                }else if ("8".equals(string)) {
+                    jobName = jobName + " 采样人员";
+                }else if ("9".equals(string)) {
+                    jobName = jobName + " 洗澡前拍照人员";
+                }
             }
+            accountVo.setWorkName(jobName);
             list.add(accountVo);
         }
         Print.printAccount(list);