转交状态

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -169,7 +169,7 @@ public class ReportController extends BaseController {
 
         String supplementType="";
         String[] supplementTypes={"营销","工程","成本","招采","人力","物业","投诉","行政","财务","商业管理","研发","投资开发"};
-        String typeNumber[]=reportEntity.getSupplementType().split(",");
+        String[] typeNumber=reportEntity.getSupplementType().split(",");
         for(int i=0;i<typeNumber.length;i++)
         {
             supplementType+=supplementTypes[Integer.valueOf(typeNumber[i])-1]+",";
@@ -420,11 +420,49 @@ public class ReportController extends BaseController {
         //判断登录人的角色
         User user = UserUtils.getUser();
         if (!reportService.checkRole(user)){
+
             reportEntity.setExchangeAfterUser(user.getId());
         }
         Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity);
         User userEntity = new User();
         Page<User> userPage = reportService.findUserPage(new Page<User>(1, 10), userEntity);
+        List<ReportEntity> reportlist = page.getList();
+        for (ReportEntity report : reportlist){
+            String typeStr="";
+            if (StringUtils.isNoneBlank(report.getSupplementType())) {
+                String[] types = report.getSupplementType().split(",");
+                for (String value : types) {
+                    if (value.equals("1")) {
+                        value = "营销";
+                    } else if (value.equals("2")) {
+                        value = "工程";
+                    } else if (value.equals("3")) {
+                        value = "成本";
+                    } else if (value.equals("4")) {
+                        value = "招采";
+                    } else if (value.equals("5")) {
+                        value = "人力";
+                    } else if (value.equals("6")) {
+                        value = "物业";
+                    } else if (value.equals("7")) {
+                        value = "投诉";
+                    } else if (value.equals("8")) {
+                        value = "行政";
+                    } else if (value.equals("9")) {
+                        value = "财务";
+                    } else if (value.equals("10")) {
+                        value = "商业管理";
+                    } else if (value.equals("11")) {
+                        value = "研发";
+                    } else if(value.equals("12")) {
+                        value ="投资开发";
+                    }
+                    typeStr =typeStr+value+",";
+                }
+                report.setSupplementType(typeStr.substring(0,typeStr.length()-1));
+            }
+        }
+        page.setList(reportlist);
         model.addAttribute("page", page);
         model.addAttribute("userPage", userPage);
         model.addAttribute("user", userEntity);