ReportController:修改发送消息方法。

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。

.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/report_sunac.iml" filepath="$PROJECT_DIR$/report_sunac.iml" />
-      <module fileurl="file://E:/sunac_report/report_sunac (1).iml" filepath="E:/sunac_report/report_sunac (1).iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

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

@@ -172,6 +172,14 @@ public interface ReportDao extends CrudDao<ReportEntity> {
     public List<ReportEntity> getChooseReportList(ReportEntity reportEntity);
 
     /**
+     * 区域列表查询
+     *
+     * @param reportEntity
+     * @return
+     */
+    public List<ReportEntity> findQyList(ReportEntity reportEntity);
+
+    /**
      * 工作转交 更改转交人
      *
      * @param reportEntity
@@ -208,8 +216,10 @@ public interface ReportDao extends CrudDao<ReportEntity> {
 
     /**
      * 删除举报信息
+     *
      * @param reportEntity
      * @return
      */
     public int deleteConclusion(ReportEntity reportEntity);
+
 }

src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

@@ -3,17 +3,20 @@ package com.ejweb.modules.report.entity;
 
 import com.ejweb.core.persistence.DataEntity;
 import com.ejweb.core.utils.excel.annotation.ExcelField;
+import com.ejweb.modules.sys.entity.User;
 
 import java.util.List;
 
 /**
  * 举报Entity
+ *
  * @author lixy
  * @version 2017-09-06
  */
 public class ReportEntity extends DataEntity<ReportEntity> {
     private static final long serialVersionUID = 1L;
 
+    private User user;//用户
     private String reportProject;   //被举报项目
     private String reportCity;    //所在城市
     private String reportTime;    //举报时间
@@ -27,7 +30,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String supplementDepartment;    //被举报部门
     private String supplementInformant;    //被举报人
     private String supplementTitle;    //标题
-    private String supplementType;    //业务类型 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
+    private String supplementType;    //业务类型地产 物业 酒店 商业
+    private String transferDepartment;//移交部门 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
     private String supplementArea;    //被举报区域
     private String supplementProject;    //被举报项目
     private String supplementContent;    //
@@ -45,21 +49,37 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String reportIp;    //记录ip地址
     private String ipCity;    //ip地址对应城市
     private String isSendEmail;    //是否已经发送过邮件 0未发送 1已发送
-
     private String transferName;    //移交给
     private String dealPerson;
     private String lStatus; //关闭修改状态
-    public String getlStatus() {
-        return lStatus;
+    //是否管理员
+    private String isAdmin;
+
+    public String getIsAdmin() {
+        return isAdmin;
     }
 
-    public void setlStatus(String lStatus) {
-        this.lStatus = lStatus;
+    public void setIsAdmin(String isAdmin) {
+        this.isAdmin = isAdmin;
     }
 
 
+    public String getTransferDepartment() {
+        return transferDepartment;
+    }
+
+    public void setTransferDepartment(String transferDepartment) {
+        this.transferDepartment = transferDepartment;
+    }
 
 
+    public String getlStatus() {
+        return lStatus;
+    }
+
+    public void setlStatus(String lStatus) {
+        this.lStatus = lStatus;
+    }
 
 
     public String getOaname() {
@@ -69,7 +89,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     public void setOaname(String oaname) {
         this.oaname = oaname;
     }
-//    private String ifDone;            //是否完成
+
+    //    private String ifDone;            //是否完成
 //
 //
 //    public String getIfDone() {
@@ -83,7 +104,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
 
     private String[] types;//新业务类型
 
-    @ExcelField(title="被举报项目/部门", align=2, sort=24)
+    @ExcelField(title = "被举报项目/部门", align = 2, sort = 24)
     public String getReportProject() {
         return reportProject;
     }
@@ -100,7 +121,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportCity = reportCity;
     }
 
-    @ExcelField(title="举报时间", align=2, sort=34)
+    @ExcelField(title = "举报时间", align = 2, sort = 34)
     public String getReportTime() {
         return reportTime;
     }
@@ -108,7 +129,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     public void setReportTime(String reportTime) {
         this.reportTime = reportTime;
     }
-    @ExcelField(title = "举报内容",align = 2,sort = 44)
+
+    @ExcelField(title = "举报内容", align = 2, sort = 44)
     public String getReportContent() {
         return reportContent;
     }
@@ -117,7 +139,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportContent = reportContent;
     }
 
-    @ExcelField(title="举报人", align=2, sort=26)
+    @ExcelField(title = "举报人", align = 2, sort = 26)
     public String getReportPersonName() {
         return reportPersonName;
     }
@@ -126,7 +148,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportPersonName = reportPersonName;
     }
 
-    @ExcelField(title="举报人电话", align=2, sort=28)
+    @ExcelField(title = "举报人电话", align = 2, sort = 28)
     public String getReportPersonTel() {
         return reportPersonTel;
     }
@@ -151,7 +173,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportSource = reportSource;
     }
 
-    @ExcelField(title="状态", align=2, sort=36)
+    @ExcelField(title = "状态", align = 2, sort = 36)
     public String getReportStatus() {
         return reportStatus;
     }
@@ -176,7 +198,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementDepartment = supplementDepartment;
     }
 
-    @ExcelField(title="被举报人", align=2, sort=32)
+    @ExcelField(title = "被举报人", align = 2, sort = 32)
     public String getSupplementInformant() {
         return supplementInformant;
     }
@@ -185,7 +207,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementInformant = supplementInformant;
     }
 
-    @ExcelField(title="标题", align=2, sort=20)
+    @ExcelField(title = "标题", align = 2, sort = 20)
     public String getSupplementTitle() {
         return supplementTitle;
     }
@@ -194,7 +216,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementTitle = supplementTitle;
     }
 
-    @ExcelField(title="业务类型", align=2, sort=22)
+    @ExcelField(title = "业务类型", align = 2, sort = 22)
     public String getSupplementType() {
         return supplementType;
     }
@@ -203,7 +225,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementType = supplementType;
     }
 
-    @ExcelField(title="区域", align=2, sort=30)
+    @ExcelField(title = "区域", align = 2, sort = 30)
     public String getSupplementArea() {
         return supplementArea;
     }
@@ -219,7 +241,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     public void setSupplementProject(String supplementProject) {
         this.supplementProject = supplementProject;
     }
-    @ExcelField(title = "举报信息补充内容",align = 2,sort = 46)
+
+    @ExcelField(title = "举报信息补充内容", align = 2, sort = 46)
     public String getSupplementContent() {
         return supplementContent;
     }
@@ -228,7 +251,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementContent = supplementContent;
     }
 
-    @ExcelField(title="处理人", align=2, sort=40)
+    @ExcelField(title = "处理人", align = 2, sort = 40)
     public String getDealPersonName() {
         return dealPersonName;
     }
@@ -237,7 +260,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.dealPersonName = dealPersonName;
     }
 
-    @ExcelField(title="处理结论", align=2, sort=38)
+    @ExcelField(title = "处理结论", align = 2, sort = 38)
     public String getDealResult() {
         return dealResult;
     }
@@ -326,7 +349,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.types = types;
     }
 
-    @ExcelField(title="移交给", align=2, sort=42)
+    @ExcelField(title = "移交给", align = 2, sort = 42)
     public String getTransferName() {
         return transferName;
     }
@@ -335,7 +358,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.transferName = transferName;
     }
 
-    @ExcelField(title="IP来源", align=2, sort=48)
+    @ExcelField(title = "IP来源", align = 2, sort = 48)
     public String getReportIp() {
         return reportIp;
     }
@@ -344,7 +367,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportIp = reportIp;
     }
 
-    @ExcelField(title="IP所属城市", align=2, sort=50)
+    @ExcelField(title = "IP所属城市", align = 2, sort = 50)
     public String getIpCity() {
         return ipCity;
     }
@@ -353,7 +376,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.ipCity = ipCity;
     }
 
-    @ExcelField(title="邮件发送", align=2, sort=48)
+    @ExcelField(title = "邮件发送", align = 2, sort = 48)
     public String getIsSendEmail() {
         return isSendEmail;
     }
@@ -369,4 +392,13 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     public void setDealPerson(String dealPerson) {
         this.dealPerson = dealPerson;
     }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
 }

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

@@ -573,4 +573,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
 
         return reportDao.deleteConclusion(reportEntity);
     }
+
+    public Page<ReportEntity> findQyList(Page<ReportEntity> page, ReportEntity reportEntity) {
+        reportEntity.setPage(page);
+        page.setList(reportDao.findQyList(reportEntity));
+        return page;
+    }
 }

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

@@ -21,6 +21,7 @@ import java.util.List;
 
 /**
  * 用户Entity
+ *
  * @author ThinkGem
  * @version 2013-12-05
  */
@@ -44,7 +45,7 @@ public class User extends DataEntity<User> {
     private String officeName;    // 部门长名称
     private String oldLoginName;// 原登录名
     private String newPassword;    // 新密码
-    
+    private String area;//所属区域
     private String oldLoginIp;    // 上次登陆IP
     private Date oldLoginDate;    // 上次登陆日期
     private String roleId;
@@ -56,21 +57,29 @@ public class User extends DataEntity<User> {
     private Position position;    //职位
     private String devision;    //组织
 
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
     public User() {
         super();
         this.loginFlag = GConstants.YES;
     }
 
-    public User(String id){
+    public User(String id) {
         super(id);
     }
 
-    public User(String id, String loginName){
+    public User(String id, String loginName) {
         super(id);
         this.loginName = loginName;
     }
 
-    public User(Role role){
+    public User(Role role) {
         super();
         this.role = role;
     }
@@ -91,15 +100,15 @@ public class User extends DataEntity<User> {
         this.loginFlag = loginFlag;
     }
 
-    @SupCol(isUnique="true", isHide="true")
-    @ExcelField(title="ID", type=1, align=2, sort=1)
+    @SupCol(isUnique = "true", isHide = "true")
+    @ExcelField(title = "ID", type = 1, align = 2, sort = 1)
     public String getId() {
         return id;
     }
 
     @JsonIgnore
-    @NotNull(message="归属公司不能为空")
-    @ExcelField(title="归属公司", align=2, sort=20)
+    @NotNull(message = "归属公司不能为空")
+    @ExcelField(title = "归属公司", align = 2, sort = 20)
     public Office getCompany() {
         return company;
     }
@@ -109,8 +118,8 @@ public class User extends DataEntity<User> {
     }
 
     @JsonIgnore
-    @NotNull(message="归属部门不能为空")
-    @ExcelField(title="归属部门", align=2, sort=25)
+    @NotNull(message = "归属部门不能为空")
+    @ExcelField(title = "归属部门", align = 2, sort = 25)
     public Office getOffice() {
         return office;
     }
@@ -119,8 +128,8 @@ public class User extends DataEntity<User> {
         this.office = office;
     }
 
-    @Length(min=1, max=100, message="登录名长度必须介于 1 和 100 之间")
-    @ExcelField(title="登录名", align=2, sort=30)
+    @Length(min = 1, max = 100, message = "登录名长度必须介于 1 和 100 之间")
+    @ExcelField(title = "登录名", align = 2, sort = 30)
     public String getLoginName() {
         return loginName;
     }
@@ -130,7 +139,7 @@ public class User extends DataEntity<User> {
     }
 
     @JsonIgnore
-    @Length(min=1, max=100, message="密码长度必须介于 1 和 100 之间")
+    @Length(min = 1, max = 100, message = "密码长度必须介于 1 和 100 之间")
     public String getPassword() {
         return password;
     }
@@ -139,14 +148,14 @@ public class User extends DataEntity<User> {
         this.password = password;
     }
 
-    @Length(min=1, max=100, message="姓名长度必须介于 1 和 100 之间")
-    @ExcelField(title="姓名", align=2, sort=40)
+    @Length(min = 1, max = 100, message = "姓名长度必须介于 1 和 100 之间")
+    @ExcelField(title = "姓名", align = 2, sort = 40)
     public String getName() {
         return name;
     }
 
-    @Length(min=1, max=100, message="工号长度必须介于 1 和 100 之间")
-    @ExcelField(title="工号", align=2, sort=45)
+    @Length(min = 1, max = 100, message = "工号长度必须介于 1 和 100 之间")
+    @ExcelField(title = "工号", align = 2, sort = 45)
     public String getNo() {
         return no;
     }
@@ -159,9 +168,9 @@ public class User extends DataEntity<User> {
         this.name = name;
     }
 
-    @Email(message="邮箱格式不正确")
-    @Length(min=0, max=200, message="邮箱长度必须介于 1 和 200 之间")
-    @ExcelField(title="邮箱", align=1, sort=50)
+    @Email(message = "邮箱格式不正确")
+    @Length(min = 0, max = 200, message = "邮箱长度必须介于 1 和 200 之间")
+    @ExcelField(title = "邮箱", align = 1, sort = 50)
     public String getEmail() {
         return email;
     }
@@ -170,8 +179,8 @@ public class User extends DataEntity<User> {
         this.email = email;
     }
 
-    @Length(min=0, max=200, message="电话长度必须介于 1 和 200 之间")
-    @ExcelField(title="电话", align=2, sort=60)
+    @Length(min = 0, max = 200, message = "电话长度必须介于 1 和 200 之间")
+    @ExcelField(title = "电话", align = 2, sort = 60)
     public String getPhone() {
         return phone;
     }
@@ -180,8 +189,8 @@ public class User extends DataEntity<User> {
         this.phone = phone;
     }
 
-    @Length(min=0, max=200, message="手机长度必须介于 1 和 200 之间")
-    @ExcelField(title="手机", align=2, sort=70)
+    @Length(min = 0, max = 200, message = "手机长度必须介于 1 和 200 之间")
+    @ExcelField(title = "手机", align = 2, sort = 70)
     public String getMobile() {
         return mobile;
     }
@@ -190,13 +199,13 @@ public class User extends DataEntity<User> {
         this.mobile = mobile;
     }
 
-    @ExcelField(title="备注", align=1, sort=900)
+    @ExcelField(title = "备注", align = 1, sort = 900)
     public String getRemarks() {
         return remarks;
     }
 
-    @Length(min=0, max=100, message="用户类型长度必须介于 1 和 100 之间")
-    @ExcelField(title="用户类型", align=2, sort=80, dictType="sys_user_type")
+    @Length(min = 0, max = 100, message = "用户类型长度必须介于 1 和 100 之间")
+    @ExcelField(title = "用户类型", align = 2, sort = 80, dictType = "sys_user_type")
     public String getUserType() {
         return userType;
     }
@@ -205,12 +214,12 @@ public class User extends DataEntity<User> {
         this.userType = userType;
     }
 
-    @ExcelField(title="创建时间", type=0, align=1, sort=90)
+    @ExcelField(title = "创建时间", type = 0, align = 1, sort = 90)
     public Date getCreateDate() {
         return createDate;
     }
 
-    @ExcelField(title="最后登录IP", type=1, align=1, sort=100)
+    @ExcelField(title = "最后登录IP", type = 1, align = 1, sort = 100)
     public String getLoginIp() {
         return loginIp;
     }
@@ -220,7 +229,7 @@ public class User extends DataEntity<User> {
     }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelField(title="最后登录日期", type=1, align=1, sort=110)
+    @ExcelField(title = "最后登录日期", type = 1, align = 1, sort = 110)
     public Date getLoginDate() {
         return loginDate;
     }
@@ -246,7 +255,7 @@ public class User extends DataEntity<User> {
     }
 
     public String getOldLoginIp() {
-        if (oldLoginIp == null){
+        if (oldLoginIp == null) {
             return loginIp;
         }
         return oldLoginIp;
@@ -258,7 +267,7 @@ public class User extends DataEntity<User> {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date getOldLoginDate() {
-        if (oldLoginDate == null){
+        if (oldLoginDate == null) {
             return loginDate;
         }
         return oldLoginDate;
@@ -285,7 +294,7 @@ public class User extends DataEntity<User> {
     }
 
     @JsonIgnore
-    @ExcelField(title="拥有角色", align=1, sort=800, fieldType=RoleListType.class)
+    @ExcelField(title = "拥有角色", align = 1, sort = 800, fieldType = RoleListType.class)
     public List<Role> getRoleList() {
         return roleList;
     }
@@ -311,6 +320,7 @@ public class User extends DataEntity<User> {
             roleList.add(role);
         }
     }
+
     /**
      * 获取数据库名称
      */
@@ -318,6 +328,7 @@ public class User extends DataEntity<User> {
     public String getDbName() {
         return GConstants.getValue("jdbc.type", "mysql");
     }
+
     public Position getPosition() {
         return position;
     }
@@ -341,11 +352,11 @@ public class User extends DataEntity<User> {
         return Collections3.extractToString(roleList, "name", ",");
     }
 
-    public boolean isAdmin(){
+    public boolean isAdmin() {
         return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(String id){
+    public static boolean isAdmin(String id) {
         return id != null && "1".equals(id);
     }
 

src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java

@@ -33,6 +33,8 @@ public class WorkbenchBean {
     private int confirmed = 0;
     private int verified = 0;
     private int unsettled = 0;
+    private int unreaListic = 0;
+    private int transfer = 0;
 
     //总体
     private int total = 0;
@@ -59,6 +61,29 @@ public class WorkbenchBean {
     private int businessManagement = 0;
     private int rAndD = 0;
     private int iAndD = 0;
+    private int propertyManagement = 0;
+    private int hotelManagement = 0;
+    private int development = 0;
+    private int Other = 0;
+    private int land = 0;
+
+    public int getLand() {
+        return land;
+    }
+
+    public void setLand(int land) {
+        this.land = land;
+    }
+
+    public int getForensic() {
+        return forensic;
+    }
+
+    public void setForensic(int forensic) {
+        this.forensic = forensic;
+    }
+
+    private int forensic = 0;
 
     public WorkbenchBean() {
     }
@@ -374,4 +399,53 @@ public class WorkbenchBean {
     public void setUnsettled(int unsettled) {
         this.unsettled = unsettled;
     }
+
+    public int getUnreaListic() {
+        return unreaListic;
+    }
+
+    public void setUnreaListic(int unreaListic) {
+        this.unreaListic = unreaListic;
+    }
+
+    public int getTransfer() {
+        return transfer;
+    }
+
+    public void setTransfer(int transfer) {
+        this.transfer = transfer;
+    }
+
+    public int getPropertyManagement() {
+        return propertyManagement;
+    }
+
+    public void setPropertyManagement(int propertyManagement) {
+        this.propertyManagement = propertyManagement;
+    }
+
+    public int getHotelManagement() {
+        return hotelManagement;
+    }
+
+    public void setHotelManagement(int hotelManagement) {
+        this.hotelManagement = hotelManagement;
+    }
+
+    public int getDevelopment() {
+        return development;
+    }
+
+    public void setDevelopment(int development) {
+        this.development = development;
+    }
+
+
+    public int getOther() {
+        return Other;
+    }
+
+    public void setOther(int other) {
+        Other = other;
+    }
 }

src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java

@@ -34,20 +34,20 @@ public class WorkbenchController extends BaseController {
     private ReportService reportService;
 
     @RequiresPermissions("workbench:view")
-    @RequestMapping(value={"list",""})
-    public String getWorkbench(Model model,WorkbenchBean bean){
+    @RequestMapping(value = {"list", ""})
+    public String getWorkbench(Model model, WorkbenchBean bean) {
         WorkbenchBean workbench;
         try {
             User user = UserUtils.getUser();
             bean = getWorkbenchByUser(user, bean);
-            if(StringUtils.isBlank(bean.getProcessStatus()) || "0".equals(bean.getProcessStatus())){
+            if (StringUtils.isBlank(bean.getProcessStatus()) || "0".equals(bean.getProcessStatus())) {
                 bean.setProcessStatus("0");
-            }else if("1".equals(bean.getProcessStatus())){
+            } else if ("1".equals(bean.getProcessStatus())) {
                 bean.setProcessStatus("1");
             }
             List<ReportEntity> repList = workbenchService.getRepList(bean);
-            model.addAttribute("workbench",bean);
-            model.addAttribute("repList",repList);
+            model.addAttribute("workbench", bean);
+            model.addAttribute("repList", repList);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -56,41 +56,45 @@ public class WorkbenchController extends BaseController {
 
     @RequestMapping("/getHighcharts")
     @ResponseBody
-    public void getHighcharts(WorkbenchBean bean,HttpServletResponse response){
+    public void getHighcharts(WorkbenchBean bean, HttpServletResponse response) {
         JSONObject res = new JSONObject();
         try {
             User user = UserUtils.getUser();
             bean = getWorkbenchByUser(user, bean);
-            res.put("bench",bean);
+            res.put("bench", bean);
             //举报状态
-            res.put("unProcess",bean.getUnProcess());
-            res.put("processing",bean.getProcessing());
-            res.put("processed",bean.getProcessed());
-            res.put("closed",bean.getClosed());
+            res.put("unProcess", bean.getUnProcess());
+            res.put("processing", bean.getProcessing());
+            res.put("processed", bean.getProcessed());
+            res.put("closed", bean.getClosed());
             //举报结果
-            res.put("unsettled",bean.getUnsettled());
-            res.put("invalid",bean.getInvalid());
-            res.put("complainNum",bean.getComplainNum());
-            res.put("verified",bean.getVerified());
-            res.put("confirmed",bean.getConfirmed());
-            res.put("startDate",bean.getStartDate());
-            res.put("endDate",bean.getEndDate());
+            res.put("unsettled", bean.getUnsettled());
+            res.put("invalid", bean.getInvalid());
+            res.put("complainNum", bean.getComplainNum());
+            res.put("verified", bean.getVerified());
+            res.put("confirmed", bean.getConfirmed());
+            res.put("unreaListic", bean.getConfirmed());
+            res.put("transfer", bean.getConfirmed());
+            res.put("startDate", bean.getStartDate());
+            res.put("endDate", bean.getEndDate());
             //举报类型
-            res.put("sale",bean.getSale());
-            res.put("project",bean.getProject());
-            res.put("cost",bean.getCost());
-            res.put("forMining",bean.getForMining());
-            res.put("manpower",bean.getManpower());
-            res.put("tenement",bean.getTenement());
-            res.put("complain",bean.getComplain());
-            res.put("administration",bean.getAdministration());
-            res.put("finance",bean.getFinance());
-            res.put("businessManagement",bean.getBusinessManagement());
-            res.put("rAndD",bean.getrAndD());
-            res.put("iAndD",bean.getiAndD());
-
-            res.put("startDate",bean.getStartDate());
-            res.put("endDate",bean.getEndDate());
+            res.put("land", bean.getLand());
+//            res.put("project", bean.getProject());
+//            res.put("cost", bean.getCost());
+//            res.put("forMining", bean.getForMining());
+//            res.put("finance", bean.getFinance());
+//            res.put("forensic", bean.getForensic());
+//            res.put("administration", bean.getAdministration());
+//            res.put("manpower", bean.getManpower());
+//            res.put("development", bean.getDevelopment());
+//            res.put("rAndD", bean.getrAndD());
+//            res.put("iAndD", bean.getiAndD());
+//            res.put("Other", bean.getOther());
+            res.put("propertyManagement", bean.getPropertyManagement());
+            res.put("hotelManagement", bean.getHotelManagement());
+            res.put("businessManagement", bean.getBusinessManagement());
+            res.put("startDate", bean.getStartDate());
+            res.put("endDate", bean.getEndDate());
             String jsonStr = res.toJSONString();
             PrintWriter out = response.getWriter();
             response.setContentType("application/json;charset=utf-8");
@@ -101,8 +105,8 @@ public class WorkbenchController extends BaseController {
         }
     }
 
-    public WorkbenchBean getWorkbenchByUser(User user,WorkbenchBean bean){
-        if(user != null) {
+    public WorkbenchBean getWorkbenchByUser(User user, WorkbenchBean bean) {
+        if (user != null) {
             try {
                 //判断登录人的角色
                 String roleName = reportService.findRole(user);

src/main/resources/jdbc.properties

@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
 jdbc.username=eas7531
 jdbc.password=sunac
 
+##融创测试数据库
+#jdbc.type=oracle
+#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
+#jdbc.username= easdba
+#jdbc.password= oracle
+
 #正式数据库
 #jdbc.type=oracle
 #jdbc.driver.class=oracle.jdbc.driver.OracleDriver

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -234,6 +234,7 @@
             password,
             no,
             name,
+            area,
             email,
             phone,
             mobile,
@@ -254,6 +255,7 @@
             #{password},
             #{no},
             #{name},
+            #{area},
             #{email},
             #{phone},
             #{mobile},
@@ -288,6 +290,7 @@
             password = #{password},
             no = #{no},
             name = #{name},
+            area=#{area},
             email = #{email},
             phone = #{phone},
             mobile = #{mobile},

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

@@ -191,7 +191,6 @@
         <form:input id="supplementType"
                     path="supplementType"
                     htmlEscape="false" maxlength="200" class="input-xlarge required"/>
-
     </div>
 </div>
 <div class="control-group">

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

@@ -219,13 +219,13 @@
         /*t_r_content和cl_freeze高度相差20px， 高度为外观显示高度，可根据情况调整*/
         .t_r_content {
             width: 100%;
-            height: 358px;
+            height: 410px;
             background: #fff;
             overflow: auto;
         }
 
         .cl_freeze {
-            height: 341px;
+            height: 410px;
             overflow: hidden;
             width: 101%;
         }
@@ -268,7 +268,9 @@
 <ul class="nav nav-tabs">
     <li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">跟踪中举报列表</a></li>
     <li <c:if test="${flag eq '0'}">class="active"</c:if>><a href="${ctx}/report/list?flag=0">未处理举报列表</a></li>
+    <li <c:if test="${flag eq '2'}">class="active"</c:if>><a href="${ctx}/report/list?flag=2">已处理举报列表</a></li>
     <li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">举报列表</a></li>
+
     <%--<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="report" action="${ctx}/report/list" method="post"
@@ -300,7 +302,7 @@
                                          maxlength="50" class="input-small"/></li>
     <li><label>业务类型：</label><form:select onchange="resetPageNo();" path="supplementType" class="input-small">
         <form:option value=" ">请选择</form:option>
-        <form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
+        <form:options items="${fns:getDictList('business_type')}" itemLabel="label" itemValue="value"
                       htmlEscape="false"/></form:select></li>
     <li><label>状态：</label><form:select onchange="resetPageNo();" path="reportStatus" class="input-small">
         <form:option value=" ">请选择</form:option>
@@ -334,7 +336,7 @@
                 <thead>
                 <tr>
                     <th style="width:5%">ID</th>
-                    <th style="width:15%">标题</th>
+                    <th style="width:15%" align="center">标题</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -342,7 +344,7 @@
                 <c:forEach items="${page.list}" var="report" varStatus="vs">
                 <tr class="reportList">
                     <td style="width:5%"></td>
-                    <td style="width:15%">${report.supplementTitle}</td>
+                    <td style="width:15%" align="left">${report.supplementTitle}</td>
                     </c:forEach>
                     </c:if>
                 </tr>
@@ -369,6 +371,7 @@
                             <th>举报时间</th>
                             <th>状态</th>
                             <th>处理结论</th>
+                            <th>移交部门</th>
                             <th>处理人</th>
                             <c:if test="${isAdmin eq true}">
                                 <th>移交给</th>
@@ -430,7 +433,10 @@
                                         <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
                                         <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
                                         <c:if test="${report.dealResult eq '4'}">举报属实</c:if>
+                                        <c:if test="${report.dealResult eq '5'}">举报不实</c:if>
+                                        <c:if test="${report.dealResult eq '6'}">移交其他部门</c:if>
                                     </td>
+                                    <td>${report.transferDepartment}</td>
                                     <td><c:if test="${report.dealPersonName eq null}">--</c:if>
                                         <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
                                     </td>

src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp

 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
     <title>用户管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
-        $(document).ready(function() {
+        $(document).ready(function () {
             $("#no").focus();
             $("#inputForm").validate({
                 rules: {
@@ -15,14 +15,14 @@
                     loginName: {remote: "用户登录名已存在"},
                     confirmNewPassword: {equalTo: "输入与上面相同的密码"}
                 },
-                submitHandler: function(form){
+                submitHandler: function (form) {
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
                 errorContainer: "#messageBox",
-                errorPlacement: function(error, element) {
+                errorPlacement: function (error, element) {
                     $("#messageBox").text("输入有误，请先更正。");
-                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
                         error.appendTo(element.parent().parent());
                     } else {
                         error.insertAfter(element);
@@ -33,11 +33,14 @@
     </script>
 </head>
 <body>
-    <ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="${ctx}/sys/user/list">用户列表</a></li>
-        <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
-    </ul><br/>
-    <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
+    <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
+            name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
+            name="sys:user:edit">查看</shiro:lacksPermission></a></li>
+</ul>
+<br/>
+<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
     <form:hidden path="id"/>
     <sys:message content="${message}"/>
     <%--<div class="control-group">
@@ -83,6 +86,16 @@
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">所属区域:</label>
+        <div class="controls">
+            <form:select id="supplementArea" path="area" class="input-small required">
+                <form:option value=" "></form:option>
+                <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/></form:select>
+            <span class="help-inline"><font color="red">*</font> </span>
+        </div>
+    </div>
     <%--<div class="control-group">
         <label class="control-label">密码:</label>
         <div class="controls">
@@ -137,7 +150,8 @@
     <div class="control-group">
         <label class="control-label">用户角色:</label>
         <div class="controls">
-                <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
+            <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
+                             class="required"/>
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
@@ -162,9 +176,10 @@
         </div>
     </c:if>--%>
     <div class="form-actions">
-            <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+        <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
+                                                         value="保 存"/>&nbsp;</shiro:hasPermission>
         <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
     </div>
-    </form:form>
+</form:form>
 </body>
 </html>
\ No newline at end of file

target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp

 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
     <title>用户管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
-        $(document).ready(function() {
+        $(document).ready(function () {
             $("#no").focus();
             $("#inputForm").validate({
                 rules: {
@@ -15,14 +15,14 @@
                     loginName: {remote: "用户登录名已存在"},
                     confirmNewPassword: {equalTo: "输入与上面相同的密码"}
                 },
-                submitHandler: function(form){
+                submitHandler: function (form) {
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
                 errorContainer: "#messageBox",
-                errorPlacement: function(error, element) {
+                errorPlacement: function (error, element) {
                     $("#messageBox").text("输入有误，请先更正。");
-                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
                         error.appendTo(element.parent().parent());
                     } else {
                         error.insertAfter(element);
@@ -33,11 +33,14 @@
     </script>
 </head>
 <body>
-    <ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="${ctx}/sys/user/list">用户列表</a></li>
-        <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
-    </ul><br/>
-    <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
+    <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
+            name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
+            name="sys:user:edit">查看</shiro:lacksPermission></a></li>
+</ul>
+<br/>
+<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
     <form:hidden path="id"/>
     <sys:message content="${message}"/>
     <%--<div class="control-group">
@@ -83,6 +86,16 @@
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">所属区域:</label>
+        <div class="controls">
+            <form:select id="supplementArea" path="area" class="input-small required">
+                <form:option value=" "></form:option>
+                <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/></form:select>
+            <span class="help-inline"><font color="red">*</font> </span>
+        </div>
+    </div>
     <%--<div class="control-group">
         <label class="control-label">密码:</label>
         <div class="controls">
@@ -137,7 +150,8 @@
     <div class="control-group">
         <label class="control-label">用户角色:</label>
         <div class="controls">
-                <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
+            <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
+                             class="required"/>
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
@@ -162,9 +176,10 @@
         </div>
     </c:if>--%>
     <div class="form-actions">
-            <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+        <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
+                                                         value="保 存"/>&nbsp;</shiro:hasPermission>
         <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
     </div>
-    </form:form>
+</form:form>
 </body>
 </html>
\ No newline at end of file

target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties

@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
 jdbc.username=eas7531
 jdbc.password=sunac
 
+##融创测试数据库
+#jdbc.type=oracle
+#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
+#jdbc.username= easdba
+#jdbc.password= oracle
+
 #正式数据库
 #jdbc.type=oracle
 #jdbc.driver.class=oracle.jdbc.driver.OracleDriver

target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml

@@ -234,6 +234,7 @@
             password,
             no,
             name,
+            area,
             email,
             phone,
             mobile,
@@ -254,6 +255,7 @@
             #{password},
             #{no},
             #{name},
+            #{area},
             #{email},
             #{phone},
             #{mobile},
@@ -288,6 +290,7 @@
             password = #{password},
             no = #{no},
             name = #{name},
+            area=#{area},
             email = #{email},
             phone = #{phone},
             mobile = #{mobile},

target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp

 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
     <title>用户管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
-        $(document).ready(function() {
+        $(document).ready(function () {
             $("#no").focus();
             $("#inputForm").validate({
                 rules: {
@@ -15,14 +15,14 @@
                     loginName: {remote: "用户登录名已存在"},
                     confirmNewPassword: {equalTo: "输入与上面相同的密码"}
                 },
-                submitHandler: function(form){
+                submitHandler: function (form) {
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
                 errorContainer: "#messageBox",
-                errorPlacement: function(error, element) {
+                errorPlacement: function (error, element) {
                     $("#messageBox").text("输入有误，请先更正。");
-                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
                         error.appendTo(element.parent().parent());
                     } else {
                         error.insertAfter(element);
@@ -33,11 +33,14 @@
     </script>
 </head>
 <body>
-    <ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="${ctx}/sys/user/list">用户列表</a></li>
-        <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
-    </ul><br/>
-    <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
+    <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
+            name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
+            name="sys:user:edit">查看</shiro:lacksPermission></a></li>
+</ul>
+<br/>
+<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
     <form:hidden path="id"/>
     <sys:message content="${message}"/>
     <%--<div class="control-group">
@@ -83,6 +86,16 @@
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">所属区域:</label>
+        <div class="controls">
+            <form:select id="supplementArea" path="area" class="input-small required">
+                <form:option value=" "></form:option>
+                <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/></form:select>
+            <span class="help-inline"><font color="red">*</font> </span>
+        </div>
+    </div>
     <%--<div class="control-group">
         <label class="control-label">密码:</label>
         <div class="controls">
@@ -137,7 +150,8 @@
     <div class="control-group">
         <label class="control-label">用户角色:</label>
         <div class="controls">
-                <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
+            <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
+                             class="required"/>
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
@@ -162,9 +176,10 @@
         </div>
     </c:if>--%>
     <div class="form-actions">
-            <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+        <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
+                                                         value="保 存"/>&nbsp;</shiro:hasPermission>
         <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
     </div>
-    </form:form>
+</form:form>
 </body>
 </html>
\ No newline at end of file

target/report_sunac/WEB-INF/classes/jdbc.properties

@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
 jdbc.username=eas7531
 jdbc.password=sunac
 
+##融创测试数据库
+#jdbc.type=oracle
+#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
+#jdbc.username= easdba
+#jdbc.password= oracle
+
 #正式数据库
 #jdbc.type=oracle
 #jdbc.driver.class=oracle.jdbc.driver.OracleDriver

target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml

@@ -234,6 +234,7 @@
             password,
             no,
             name,
+            area,
             email,
             phone,
             mobile,
@@ -254,6 +255,7 @@
             #{password},
             #{no},
             #{name},
+            #{area},
             #{email},
             #{phone},
             #{mobile},
@@ -288,6 +290,7 @@
             password = #{password},
             no = #{no},
             name = #{name},
+            area=#{area},
             email = #{email},
             phone = #{phone},
             mobile = #{mobile},

target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp

 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
     <title>用户管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
-        $(document).ready(function() {
+        $(document).ready(function () {
             $("#no").focus();
             $("#inputForm").validate({
                 rules: {
@@ -15,14 +15,14 @@
                     loginName: {remote: "用户登录名已存在"},
                     confirmNewPassword: {equalTo: "输入与上面相同的密码"}
                 },
-                submitHandler: function(form){
+                submitHandler: function (form) {
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
                 errorContainer: "#messageBox",
-                errorPlacement: function(error, element) {
+                errorPlacement: function (error, element) {
                     $("#messageBox").text("输入有误，请先更正。");
-                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
                         error.appendTo(element.parent().parent());
                     } else {
                         error.insertAfter(element);
@@ -33,11 +33,14 @@
     </script>
 </head>
 <body>
-    <ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="${ctx}/sys/user/list">用户列表</a></li>
-        <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
-    </ul><br/>
-    <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
+    <li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
+            name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
+            name="sys:user:edit">查看</shiro:lacksPermission></a></li>
+</ul>
+<br/>
+<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
     <form:hidden path="id"/>
     <sys:message content="${message}"/>
     <%--<div class="control-group">
@@ -83,6 +86,16 @@
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">所属区域:</label>
+        <div class="controls">
+            <form:select id="supplementArea" path="area" class="input-small required">
+                <form:option value=" "></form:option>
+                <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/></form:select>
+            <span class="help-inline"><font color="red">*</font> </span>
+        </div>
+    </div>
     <%--<div class="control-group">
         <label class="control-label">密码:</label>
         <div class="controls">
@@ -137,7 +150,8 @@
     <div class="control-group">
         <label class="control-label">用户角色:</label>
         <div class="controls">
-                <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
+            <form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
+                             class="required"/>
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
@@ -162,9 +176,10 @@
         </div>
     </c:if>--%>
     <div class="form-actions">
-            <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+        <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
+                                                         value="保 存"/>&nbsp;</shiro:hasPermission>
         <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
     </div>
-    </form:form>
+</form:form>
 </body>
 </html>
\ No newline at end of file