放开root的退出

.idea/artifacts/report_sunac_war_exploded.xml

@@ -46,6 +46,13 @@
           <element id="library" level="project" name="Maven: opensymphony:sitemesh:2.4.2" />
           <element id="library" level="project" name="Maven: taglibs:standard:1.1.2" />
           <element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
+          <element id="library" level="project" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" />
+          <element id="library" level="project" name="Maven: io.springfox:springfox-spring-web:2.6.1" />
+          <element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" />
+          <element id="library" level="project" name="Maven: io.springfox:springfox-spi:2.6.1" />
+          <element id="library" level="project" name="Maven: io.springfox:springfox-core:2.6.1" />
+          <element id="library" level="project" name="Maven: io.swagger:swagger-annotations:1.5.16" />
           <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" />
           <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" />
           <element id="library" level="project" name="Maven: redis.clients:jedis:2.5.1" />
@@ -142,6 +149,10 @@
           <element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:1.3" />
           <element id="library" level="project" name="Maven: org.springframework:spring-test:4.2.2.RELEASE" />
           <element id="library" level="project" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" />
+          <element id="library" level="project" name="Maven: jfree:jfreechart:1.0.13" />
+          <element id="library" level="project" name="Maven: jfree:jcommon:1.0.16" />
+          <element id="library" level="project" name="Maven: com.itextpdf:itextpdf:5.5.10" />
+          <element id="library" level="project" name="Maven: com.itextpdf:itext-asian:5.2.0" />
         </element>
       </element>
       <element id="directory" name="META-INF">

report_sunac.iml

@@ -63,7 +63,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_131/lib/jconsole.jar!/" />
+          <root url="jar://D:/Java/jdk1.8.0_144/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -72,7 +72,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_131/lib/tools.jar!/" />
+          <root url="jar://D:/Java/jdk1.8.0_144/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -256,5 +256,7 @@
     <orderEntry type="library" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
     <orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.10" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file

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

@@ -230,14 +230,13 @@ public class ReportController extends BaseController {
         List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment);
         //业务类型
         String supplementTypeStr="";
-        if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) {
-            String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
-            String typeNumber[] = reportEntity.getSupplementType().split(",");
-            for (int i = 0; i < typeNumber.length; i++) {
-                supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
-            }
-            supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1);
+        String[] supplementTypes = {"营销","工程","成本","招采","人力","物业","投诉","行政","财务","商业管理","研发","投资开发"};
+        String typeNumber[] = reportEntity.getSupplementType().split(",");
+        for(int i = 0;i < typeNumber.length;i++)
+        {
+            supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i])-1]+",";
         }
+        supplementTypeStr = supplementTypeStr.substring(0,supplementTypeStr.length()-1);
         model.addAttribute("page", page);
         model.addAttribute("user", userEntity);
         model.addAttribute("userName", user.getName());
@@ -420,11 +419,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);