20191203

report_sunac.iml

@@ -26,8 +26,24 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: bbdtek:bbdtek-geo-split:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: bbdtek:npl-tire-split:1.0.0" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: bbdtek:bbdtek-geo-split:1.0.1">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/bbdtek-geo-split-1.0.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: bbdtek:npl-tire-split:1.0.0">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/npl-tire-split-1.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Maven: com.maxmind.geoip2:geoip2:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.19.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
@@ -60,7 +76,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_161/lib/jconsole.jar!/" />
+          <root url="jar://D:/java jdk/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -69,7 +85,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_161/lib/tools.jar!/" />
+          <root url="jar://D:/java jdk/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -250,7 +266,15 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/LTPATokenManager-1.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <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" />

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -945,10 +945,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
         List<Role> roleList = roleDao.findList(roleEntity);
         if (roleList != null && roleList.size() != 0) {
             for (Role role : roleList) {
-                if (role.getName().equals("系统管理员")) {
+                if (role.getEnname().equals("admin")) {
                     roleNum = "1";
                     break;
-                } else if (role.getName().equals("辅助管理员")) {
+                } else if (role.getEnname().equals("fuzhuadmin")) {
                     roleNum = "2";
                     break;
                 }

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

@@ -843,7 +843,7 @@ public class ReportController extends BaseController {
         }
         html.append("	</tbody>");
         html.append("</table>");
-        html.append("<span id='chooseItem'></span>");
+//        html.append("<span id='chooseItem'></span>");
         if (page.getList().size() == 0) {
             html.append("	<span style='color: #999999;margin: 20px 0 70px 20px;display: block;'>未查询到相关内容</span>");
         }

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

@@ -7,8 +7,8 @@ import com.ejweb.modules.report.entity.ReportAttachmentEntity;
 import com.ejweb.modules.report.entity.ReportEntity;
 import com.ejweb.modules.report.service.CtBbtcBusTypeService;
 import com.ejweb.modules.report.service.ReportService;
-import org.apache.poi.xwpf.usermodel.*;
 import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
+import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlException;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +20,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -52,7 +51,7 @@ public class ReportToWordController {
     }
 
     @RequestMapping(value = "toWord")
-    public void toWord(ReportEntity reportEntity, String flag, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) throws IOException, XmlException {
+    public void toWord(ReportEntity reportEntity, String flag, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes)  {
         //Blank Document
         XWPFDocument document = new XWPFDocument();
         //Write the Document in file system
@@ -63,6 +62,7 @@ public class ReportToWordController {
 //        if (reportProjectTitle.contains("\\")){
 //            reportProjectTitle = reportProjectTitle.replace("\\","|");
 //        }
+        try {
         FileOutputStream out = new FileOutputStream(GConstants.FILE_UPLOAD_DIR + "pdf/" + reportEntity.getId() + ".docx");
 //        FileOutputStream out = new FileOutputStream("D:/1.docx");
 //        FileOutputStream out = new FileOutputStream("C:/1.docx");
@@ -461,6 +461,9 @@ public class ReportToWordController {
         response.setContentType("application/json;charset=utf-8");
         printWriter.write(GConstants.FILE_PREFIX_URL + "pdf/" + reportEntity.getId() + ".docx");
         printWriter.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
     }
 

src/main/resources/LtpaToken.properties

@@ -10,4 +10,3 @@ cookie.domain=.kingdee.com
 token.expiration=30
 domino.secret=BTfa8F+HwNejYEGtuZSJTWOZ/t8\=
 
-

src/main/resources/ejweb.properties

@@ -3,7 +3,7 @@
 #============================#
 
 #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
-productName=\u76d1\u5bdf\u5ba1\u8ba1\u7ba1\u7406\u7cfb\u7edf
+productName=\u4e3e\u62a5\u7ba1\u7406\u7cfb\u7edf
 copyrightYear=2017
 version=V1.2.6
 

src/main/resources/jdbc.properties

@@ -17,12 +17,12 @@ db.table.prefix=sunac_
 #jdbc.password= sunac
 
 #正式数据库
-#jdbc.type=oracle
-#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
-#jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas1
-#jdbc.username= easdba
-#jdbc.password= Sunac_1918
-#
+jdbc.type=oracle
+jdbc.driver.class=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas1
+jdbc.username= easdba
+jdbc.password= Sunac_1918
+
 
 #本地测试库
 #jdbc.type=mysql
@@ -32,11 +32,11 @@ db.table.prefix=sunac_
 #jdbc.password=123456
 
 #测试环境
-jdbc.type=oracle
-jdbc.driver.class=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.7.16:1521:eas
-jdbc.username= easdba
-jdbc.password= easdba
+#jdbc.type=oracle
+#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@192.168.7.16:1521:eas
+#jdbc.username= easdba
+#jdbc.password= easdba
 
 
 

src/main/resources/mappings/modules/report/CtBbtcTypeAreaDao.xml

@@ -43,7 +43,7 @@
 				AND a.AREA_ID = #{area}
 			</if>
 		</where>
-		GROUP BY a.parent_id
+		GROUP BY a.id,a.parent_id,b.label,c.name,d.name
 	</select>
 
 	<select id="findList" resultType="com.ejweb.modules.report.entity.CtBbtcTypeArea">