Merge branch 'develop' of ssh://git.okayapps.com:5859/java-sunac-report/sunac_report into develop

pom.xml

@@ -615,6 +615,18 @@
         <artifactId>jfreechart</artifactId>
         <version>1.0.13</version>
       </dependency>
+    <!-- https://mvnrepository.com/artifact/com.itextpdf/itextpdf -->
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>5.5.10</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/com.itextpdf/itext-asian -->
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itext-asian</artifactId>
+      <version>5.2.0</version>
+    </dependency>
 
     <!-- 自定义jar依赖包
       <dependency>

src/main/java/com/ejweb/modules/report/dao/ReportDao.java

@@ -6,6 +6,7 @@ import com.ejweb.modules.report.entity.ReportAttachmentEntity;
 import com.ejweb.modules.report.entity.ReportEntity;
 import com.ejweb.modules.report.entity.ReportExchangeHistory;
 import com.ejweb.modules.sys.entity.Office;
+import com.ejweb.modules.sys.entity.Position;
 import com.ejweb.modules.sys.entity.User;
 import com.ejweb.modules.workbench.Bean.WorkbenchBean;
 import com.ejweb.modules.workbench.entity.ReportNotice;
@@ -85,7 +86,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
      * 查询职位列表
      * @return
      */
-    public List<User> getPositionList();
+    public List<Position> getPositionList();
 
     /**
      * 根据reportId查询消息表中是否已存在该条记录

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

@@ -9,6 +9,8 @@ import com.ejweb.modules.report.entity.ReportAttachmentEntity;
 import com.ejweb.modules.report.entity.ReportEntity;
 import com.ejweb.modules.report.entity.ReportExchangeHistory;
 import com.ejweb.modules.sys.entity.Office;
+import com.ejweb.modules.sys.entity.Position;
+import com.ejweb.modules.sys.entity.Role;
 import com.ejweb.modules.sys.entity.User;
 import com.ejweb.modules.sys.utils.UserUtils;
 import com.ejweb.modules.workbench.entity.ReportNotice;
@@ -190,6 +192,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
      * @return
      */
     public Page<User> findUserPage(Page<User> page,User user){
+        page.setFuncParam("1");//标记为用户分页
         user.setPage(page);
         page.setList(reportDao.findUser(user));
         return page;
@@ -215,7 +218,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
      * 查询职位列表
      * @return
      */
-    public List<User> getPositionList(){
+    public List<Position> getPositionList(){
         return reportDao.getPositionList();
     }
 
@@ -380,4 +383,23 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
             this.addRecord(reportEntity,"2");
         }
     }
+
+    /**
+     * 判断当前用户是否为管理员
+     * @param user
+     * @return
+     */
+    public boolean checkRole(User user) {
+        boolean isAdmin = false;
+        List<Role> roleList = UserUtils.getRoleList();
+        if (roleList != null && roleList.size() != 0){
+            for (Role role : roleList){
+                if (role.getName().equals("系统管理员")){
+                    isAdmin = true;
+                    break;
+                }
+            }
+        }
+        return isAdmin;
+    }
 }

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

 package com.ejweb.modules.report.web;
 
-import com.alibaba.fastjson.JSONObject;
 import com.ejweb.core.base.BaseController;
 import com.ejweb.core.persistence.Page;
 import com.ejweb.core.utils.DateUtils;
@@ -10,6 +9,7 @@ import com.ejweb.modules.report.entity.ReportAttachmentEntity;
 import com.ejweb.modules.report.entity.ReportEntity;
 import com.ejweb.modules.report.service.ReportService;
 import com.ejweb.modules.sys.entity.Office;
+import com.ejweb.modules.sys.entity.Position;
 import com.ejweb.modules.sys.entity.User;
 import com.ejweb.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -63,12 +63,9 @@ public class ReportController extends BaseController {
     public String list(ReportEntity reportEntity, String flag,HttpServletRequest request, HttpServletResponse response, Model model) {
         //判断登录人的角色
         User user = UserUtils.getUser();
-        String roleName = reportService.findRole(user);
-        if (StringUtils.isNotBlank(roleName)){
-            if (!roleName.equals("系统管理员")){
+        if (!reportService.checkRole(user)){
             reportEntity.setExchangeAfterUser(user.getId());
         }
-        }
         //判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
         if (StringUtils.isNotBlank(flag)){
             if (flag.equals("0")){
@@ -151,27 +148,23 @@ public class ReportController extends BaseController {
      */
     @RequestMapping(value = "track")
     public String track(ReportEntity reportEntity,HttpServletRequest request, HttpServletResponse response, Model model) {
+        //判断登录人的角色
         User user = UserUtils.getUser();
-        String roleName = reportService.findRole(user);
-        String transferFlag = "0";
-        if (roleName.equals("系统管理员")){
-            transferFlag = "1";
-        }
+        boolean isAdmin = reportService.checkRole(user);
         List<Office> companyList = reportService.getCompanyList();
         List<Office> officeList = reportService.getOfficeList();
-        List<User> positionList = reportService.getPositionList();
-        Page<User> page = reportService.findUserPage(new Page<User>(request, response), user);
+        List<Position> positionList = reportService.getPositionList();
         User userEntity = new User();
-        Page<User> userPage = reportService.findUserPage(new Page<User>(request, response), userEntity);
+        Page<User> page = reportService.findUserPage(new Page<User>(request, response), userEntity);
         model.addAttribute("page", page);
         model.addAttribute("user", userEntity);
+        model.addAttribute("userName", user.getName());
         model.addAttribute("currentUser", user.getName());
-        model.addAttribute("transferFlag", transferFlag);
         model.addAttribute("report", reportEntity);
         model.addAttribute("companyList", companyList);
         model.addAttribute("officeList", officeList);
         model.addAttribute("positionList", positionList);
-        model.addAttribute("userPage", userPage);
+        model.addAttribute("isAdmin", isAdmin);
         return "modules/report/reportTrack";
     }
 
@@ -189,7 +182,7 @@ public class ReportController extends BaseController {
         }
         reportService.saveTrack(reportEntity);
         if (StringUtils.isNotBlank(reportEntity.getExchangeAfterUser())){
-            reportService.addNotice(reportEntity,"transger");
+            reportService.addNotice(reportEntity,"transfer");
             reportService.addRecord(reportEntity,"1");
         }
         if (StringUtils.isNotBlank(reportEntity.getDealResult())){
@@ -247,7 +240,11 @@ public class ReportController extends BaseController {
                     html.append("				<td>" + (userEntity.getMobile() == null ? "" : userEntity.getMobile()) + "</td>");
                     html.append("				<td>" + (userEntity.getCompany() == null ? "" : userEntity.getCompany().getName()) + "</td>");
                     html.append("				<td>" + (userEntity.getOffice() == null ? "" : userEntity.getOffice().getName()) + "</td>");
-                    html.append("				<td>" + (userEntity.getPositionName() == null ? "" : userEntity.getPositionName()) + "</td>");
+                    if (userEntity.getPosition() != null){
+                        html.append("				<td>" + (userEntity.getPosition().getName() == null ? "" : userEntity.getPosition().getName()) + "</td>");
+                    }else {
+                        html.append("				<td></td>");
+                    }
                 }else if (flag.equals("2")){
                     html.append("				<td><input type='radio' value='" + userEntity.getId() + "' onclick='chooseRen(this);'></td>");
                     html.append("				<td>" + i + "</td>");
@@ -302,12 +299,9 @@ public class ReportController extends BaseController {
     public String deliverList(ReportEntity reportEntity, HttpServletRequest request, HttpServletResponse response, Model model) {
         //判断登录人的角色
         User user = UserUtils.getUser();
-        String roleName = reportService.findRole(user);
-        if (StringUtils.isNotBlank(roleName)){
-            if (!roleName.equals("系统管理员")){
+        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>(request, response), userEntity);
@@ -336,4 +330,5 @@ public class ReportController extends BaseController {
         out.write(result);
         out.close();
     }
+
 }

src/main/java/com/ejweb/modules/sys/entity/Position.java

+package com.ejweb.modules.sys.entity;
+
+import com.ejweb.core.persistence.DataEntity;
+
+public class Position extends DataEntity<Position> {
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

src/main/java/com/ejweb/modules/sys/entity/User.java

@@ -53,7 +53,7 @@ public class User extends DataEntity<User> {
     private List<Role> roleList = Lists.newArrayList(); // 拥有角色列表
 
 
-    private String positionName;    //职位
+    private Position position;    //职位
 
     public User() {
         super();
@@ -311,12 +311,12 @@ public class User extends DataEntity<User> {
         }
     }
 
-    public String getPositionName() {
-        return positionName;
+    public Position getPosition() {
+        return position;
     }
 
-    public void setPositionName(String positionName) {
-        this.positionName = positionName;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
     /**

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

@@ -221,7 +221,7 @@
         su.mobile AS "mobile",
         so1.`name` AS "company.name",
         so2.`name` AS "office.name",
-        sp.position_name AS "positionName",
+        sp.position_name AS "position.name",
         sr.`name` AS "role.name"
         FROM
         sys_user su
@@ -257,8 +257,8 @@
             <if test="office != null and office.id != null and office.id != ''">
                 AND so2.id  = #{office.id}
             </if>
-            <if test="positionName != null and positionName != ''">
-                AND sp.position_name  = #{positionName}
+            <if test="position != null and position.name != null and position.name != ''">
+                AND sp.position_name  = #{position.name}
             </if>
             <if test="loginName != null and loginName != ''">
                 AND su.login_name LIKE
@@ -286,8 +286,9 @@
         WHERE so.type = '1'
     </select>
 
-    <select id="getPositionList" resultType="User">
+    <select id="getPositionList" resultType="Position">
         SELECT
+        position_code AS "id",
         position_name AS "positionName"
         FROM sys_position
     </select>

src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp

@@ -12,7 +12,7 @@
                 window.location.href = "${ctx}/report/track?id=${report.id}";
             });
             $("#btnDocument").click(function () {
-                $("#inputForm").attr("action", "${ctx}/report/document");
+                $("#inputForm").attr("action", "${ctx}/report/document?id=${report.id}");
                 $("#inputForm").submit();
             });
         });

src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp

@@ -9,20 +9,13 @@
         $(document).ready(function () {
             $("#inputForm").validate({
                 submitHandler: function (form) {
-                    if ($("#nameFile").val().length == 0) {
-                        $("#checkFile").show();
-                    } else if ($("#reportContent").val() == ""){
-                        top.$.jBox.tip('请填写内容', 'warning');
-                    }else {
                     submitCount += 1;
                     if(submitCount == 1){
-                            $("#checkFile").hide();
                         loading('正在提交，请稍等...');
                         form.submit();
                     }else{
                         return false;
                     }
-                    }
                 },
                 errorContainer: "#messageBox",
                 errorPlacement: function (error, element) {
@@ -69,7 +62,6 @@
         <label class="control-label">内容:</label>
             <div class="controls">
                 <form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="4" maxlength="500" class="input-xxlarge"/>
-                <span class="help-inline"><font color="red">*</font> </span>
             </div>
         </div>
     </div>
@@ -80,7 +72,6 @@
                          maxlength="255" class="input-xlarge"/>
             <sys:ckfinder input="nameFile" type="files" uploadPath="/file"
                           selectMultiple="true" maxWidth="100" maxHeight="100"/>
-            <label id="checkFile" class="error" style="display: none;">必填信息</label>
         </div>
     </div>
     <span class="title">举报人信息</span>

src/main/webapp/WEB-INF/views/modules/report/reportList.jsp

@@ -5,11 +5,12 @@
     <title>举报管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
+        var requestFlag = true;
         $(document).ready(function() {
             $("#btnExport").click(function(){
                 top.$.jBox.confirm("确认要导出数据吗？","系统提示",function(v,h,f){
                     if(v=="ok"){
-                        $("#searchForm").attr("action","${ctx}/report/export?");
+                        $("#searchForm").attr("action","${ctx}/report/export");
                         $("#searchForm").submit();
                     }
                 },{buttonsFocus:1});
@@ -37,6 +38,30 @@
         function resetPageNo() {
             $("#pageNo").val(0);
         }
+        function openDownloadDialog(){
+            if (requestFlag == true){
+                $.ajax({
+                    url: "${ctx}/report/document?id=${report.id}",
+                    dataType: "text",
+                    traditional: true,//这里设置为true
+                    cache: false,
+                    beforeSend: function () {
+                        requestFlag = false;
+                    },
+                    success: function(url) { //登录成功后返回的数据
+                        window.location.href = url;
+                    },
+                    error:function(){
+                        alert("数据错误！");
+                    },
+                    complete: function () {
+                        requestFlag = true;
+                    }
+                });
+            }else{
+                top.$.jBox.tip('正在加载，请稍等', 'warning');
+            }
+        }
     </script>
 </head>
 <body>
@@ -136,7 +161,7 @@
                     <td>
                         <a href="${ctx}/report/view?id=${report.id}">查看</a>
                         <c:if test="${report.reportStatus ne '2'}"><a href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if>
-                        <a href="${ctx}/report/document?id=${report.id}">转为文档</a>
+                        <a href="#" onclick="openDownloadDialog()">转为文档</a>
                     </td>
                 </tr>
             </c:forEach>