来函信息页面添加专项任务，修改页面显示，修改翻译配置文件

src/main/java/com/nis/domain/configuration/RequestInfo.java

@@ -1,11 +1,14 @@
 package com.nis.domain.configuration;
 
 import java.util.Date;
+import java.util.List;
 
 import com.nis.domain.BaseEntity;
 
 public class RequestInfo extends BaseEntity<RequestInfo>{
 	
+	private Long taskId;
+	
     private String requestNumber;
 
     private String requestOrg;
@@ -39,8 +42,18 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
     private Date beginDate;//开始时间
     private Date endDate;//结束时间
     private String timeType;//时间类型
+    private String taskName;//专项任务
     
-    public String getRequestNumber() {
+
+	public Long getTaskId() {
+		return taskId;
+	}
+
+	public void setTaskId(Long taskId) {
+		this.taskId = taskId;
+	}
+
+	public String getRequestNumber() {
         return requestNumber;
     }
 
@@ -191,5 +204,13 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
 	public void setTimeType(String timeType) {
 		this.timeType = timeType;
 	}
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
     
 }

src/main/java/com/nis/domain/configuration/TaskInfo.java

@@ -0,0 +1,131 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.domain.BaseEntity;
+
+public class TaskInfo extends BaseEntity<TaskInfo> {
+	private static final long serialVersionUID = 1L;
+
+	private String taskName;
+
+	private String taskOrg;
+
+	private Date taskTime;
+
+	private String taskDesc;
+
+	private Integer isValid;
+
+	private Integer isAudit;
+
+	private Integer creatorId;
+
+	private Date createTime;
+
+	private Integer editorId;
+
+	private Date editTime;
+
+	private Integer auditorId;
+
+	private Date auditTime;
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getTaskOrg() {
+		return taskOrg;
+	}
+
+	public void setTaskOrg(String taskOrg) {
+		this.taskOrg = taskOrg;
+	}
+
+	public Date getTaskTime() {
+		return taskTime;
+	}
+
+	public void setTaskTime(Date taskTime) {
+		this.taskTime = taskTime;
+	}
+
+	public String getTaskDesc() {
+		return taskDesc;
+	}
+
+	public void setTaskDesc(String taskDesc) {
+		this.taskDesc = taskDesc;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getEditorId() {
+		return editorId;
+	}
+
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+
+	public Date getEditTime() {
+		return editTime;
+	}
+
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+
+	public Integer getAuditorId() {
+		return auditorId;
+	}
+
+	public void setAuditorId(Integer auditorId) {
+		this.auditorId = auditorId;
+	}
+
+	public Date getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+
+	
+}

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -1,5 +1,7 @@
 package com.nis.web.controller.configuration;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,15 +14,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.util.Constants;
+import com.nis.domain.configuration.TaskInfo;
-import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.configuration.RequestInfoService;
 
-/**
- * 测试类
- *
- */
 @Controller
 @RequestMapping("${adminPath}/cfg/request")
 public class RequestInfoController extends BaseController{
@@ -43,11 +40,15 @@ public class RequestInfoController extends BaseController{
 	 */
 	@RequestMapping(value={"form"})
 	public String form(RequestInfo requestInfo, Model model) {
+		TaskInfo taskInfo = new TaskInfo();
+		taskInfo.setId(requestInfo.getTaskId());
+		showTask(taskInfo,model);
 		if(requestInfo.getId()!=null){
 			requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
 			model.addAttribute("requestInfo", requestInfo);
+		}else{
+			model.addAttribute("requestInfo", requestInfo);
 		}
-		model.addAttribute("requestInfo", requestInfo);
 		return "/cfg/requestForm";
 	}
 
@@ -133,4 +134,13 @@ public class RequestInfoController extends BaseController{
 		
 	}
 
+	/**
+	 * 查询专项任务
+	 * @param taskInfo
+	 * @param model
+	 */
+	public void showTask(TaskInfo taskInfo ,Model model){
+		List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
+		model.addAttribute("taskInfos", taskInfos);
+	}
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -20,14 +21,8 @@ public interface RequestInfoDao  extends CrudDao {
 	
     int deleteByPrimaryKey(Long id);
 
+	List<TaskInfo> showTask(TaskInfo taskInfo);
 
-    int insertSelective(RequestInfo requestInfo);
-
-    RequestInfo selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(RequestInfo requestInfo);
-
-    int updateByPrimaryKey(RequestInfo requestInfo);
 
 
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -16,6 +16,7 @@
     <result column="edit_time" jdbcType="DATE" property="editTime" />
     <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
     <result column="audit_time" jdbcType="DATE" property="auditTime" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
   </resultMap>
   <sql id="Base_Column_List">
     id, request_number, request_org, request_time, request_title, request_content, is_valid, 
@@ -25,6 +26,7 @@
   <select id="findRequestInfo" resultMap="BaseResultMap">
 	select
 		r.id AS id,
+		r.task_id AS taskId,
 		r.request_number AS requestNumber,
 		r.request_org AS requestOrg,
 		r.request_time AS requestTime,
@@ -37,11 +39,13 @@
 		u.name AS editorName,
 		r.edit_time AS editTime,
 		e.name AS currentName,
-		r.audit_time AS auditTime
+		r.audit_time AS auditTime,
+		t.task_name AS taskName
 	from request_info r
 	left join sys_user s on r.creator_id=s.id
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
+	left join task_info t on r.task_id=t.id
 	where r.is_valid=1 and r.is_audit !=3
 	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
@@ -159,159 +163,4 @@
     where id = #{id,jdbcType=BIGINT} and is_audit !=1
   </update>
   
-  
-  
-  <insert id="insertSelective" parameterType="com.nis.domain.configuration.RequestInfo">
-    insert into request_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="requestNumber != null">
-        request_number,
-      </if>
-      <if test="requestOrg != null">
-        request_org,
-      </if>
-      <if test="requestTime != null">
-        request_time,
-      </if>
-      <if test="requestTitle != null">
-        request_title,
-      </if>
-      <if test="requestContent != null">
-        request_content,
-      </if>
-      <if test="isValid != null">
-        is_valid,
-      </if>
-      <if test="isAudit != null">
-        is_audit,
-      </if>
-      <if test="creatorId != null">
-        creator_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="editorId != null">
-        editor_id,
-      </if>
-      <if test="editTime != null">
-        edit_time,
-      </if>
-      <if test="auditorId != null">
-        auditor_id,
-      </if>
-      <if test="auditTime != null">
-        audit_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="requestNumber != null">
-        #{requestNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="requestOrg != null">
-        #{requestOrg,jdbcType=VARCHAR},
-      </if>
-      <if test="requestTime != null">
-        #{requestTime,jdbcType=DATE},
-      </if>
-      <if test="requestTitle != null">
-        #{requestTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="requestContent != null">
-        #{requestContent,jdbcType=VARCHAR},
-      </if>
-      <if test="isValid != null">
-        #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null">
-        #{isAudit,jdbcType=INTEGER},
-      </if>
-      <if test="creatorId != null">
-        #{creatorId,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=DATE},
-      </if>
-      <if test="editorId != null">
-        #{editorId,jdbcType=INTEGER},
-      </if>
-      <if test="editTime != null">
-        #{editTime,jdbcType=DATE},
-      </if>
-      <if test="auditorId != null">
-        #{auditorId,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null">
-        #{auditTime,jdbcType=DATE},
-      </if>
-    </trim>
-  </insert>
- 
-  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.RequestInfo">
-    update request_info
-    set request_number = #{requestNumber,jdbcType=VARCHAR},
-      request_org = #{requestOrg,jdbcType=VARCHAR},
-      request_time = #{requestTime,jdbcType=DATE},
-      request_title = #{requestTitle,jdbcType=VARCHAR},
-      request_content = #{requestContent,jdbcType=VARCHAR},
-      is_valid = #{isValid,jdbcType=INTEGER},
-      is_audit = #{isAudit,jdbcType=INTEGER},
-      creator_id = #{creatorId,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=DATE},
-      editor_id = #{editorId,jdbcType=INTEGER},
-      edit_time = #{editTime,jdbcType=DATE},
-      auditor_id = #{auditorId,jdbcType=INTEGER},
-      audit_time = #{auditTime,jdbcType=DATE}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="findAllList" resultMap="BaseResultMap">
-	select
-		r.id AS id,
-		r.request_number AS requestNumber,
-		r.request_org AS requestOrg,
-		r.request_time AS requestTime,
-		r.request_title AS requestTitle,
-		r.request_content AS requestContent,
-		r.is_valid AS isValid,
-		r.is_audit AS isAudit,
-		s.name AS creatorName,
-		r.create_time AS createTime,
-		u.name AS editorName,
-		r.edit_time AS editTime,
-		e.name AS currentName,
-		r.audit_time AS auditTime
-	from request_info r
-	left join sys_user s on r.creator_id=s.id
-	left join sys_user u on r.editor_id=u.id
-	left join sys_user e on r.auditor_id=e.id
-	<trim prefix="where" prefixOverrides="AND|OR">
-		<if test="requestTitle != null and requestTitle != ''">
-				AND r.request_title like 
-					<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
-		</if>
-		<if test="requestContent != null and requestContent != ''">
-				AND r.request_content like 
-					<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
-		</if>
-		<if test="requestNumber != null and requestNumber != ''">
-				AND r.request_number=#{requestNumber}
-		</if>
-		<if test="isAudit != null">
-				AND r.is_audit=${isAudit}
-		</if>
-		<if test=" timeType = 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND r.request_time between #{beginDate} and #{endDate}
-	 	</if>
-		<if test="timeType = 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
-		</if> 
-	</trim>
-	order by r.request_time desc
-  </select>
 </mapper>

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java

@@ -0,0 +1,8 @@
+package com.nis.web.dao.configuration;
+
+import com.nis.domain.configuration.TaskInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+@MyBatisDao
+public interface TaskInfoDao extends CrudDao<TaskInfo>{
+}

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nis.web.dao.configuration.TaskInfoDao">
+  <resultMap id="BaseResultMap" type="com.nis.domain.configuration.TaskInfo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="task_name" jdbcType="VARCHAR" property="taskName" />
+    <result column="task_org" jdbcType="VARCHAR" property="taskOrg" />
+    <result column="task_time" jdbcType="DATE" property="taskTime" />
+    <result column="task_desc" jdbcType="VARCHAR" property="taskDesc" />
+    <result column="is_valid" jdbcType="INTEGER" property="isValid" />
+    <result column="is_audit" jdbcType="INTEGER" property="isAudit" />
+    <result column="creator_id" jdbcType="INTEGER" property="creatorId" />
+    <result column="create_time" jdbcType="DATE" property="createTime" />
+    <result column="editor_id" jdbcType="INTEGER" property="editorId" />
+    <result column="edit_time" jdbcType="DATE" property="editTime" />
+    <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
+    <result column="audit_time" jdbcType="DATE" property="auditTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time, 
+    editor_id, edit_time, auditor_id, audit_time
+  </sql>
+  
+  <select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from task_info
+    <if test="id!=null">
+   	where id = #{id,jdbcType=BIGINT}
+    </if>
+  </select>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from task_info
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.nis.domain.configuration.TaskInfo">
+    insert into task_info (id, task_name, task_org, 
+      task_time, task_desc, is_valid, 
+      is_audit, creator_id, create_time, 
+      editor_id, edit_time, auditor_id, 
+      audit_time)
+    values (#{id,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{taskOrg,jdbcType=VARCHAR}, 
+      #{taskTime,jdbcType=DATE}, #{taskDesc,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, 
+      #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=DATE}, 
+      #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, #{auditorId,jdbcType=INTEGER}, 
+      #{auditTime,jdbcType=DATE})
+  </insert>
+  <insert id="insertSelective" parameterType="com.nis.domain.configuration.TaskInfo">
+    insert into task_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="taskName != null">
+        task_name,
+      </if>
+      <if test="taskOrg != null">
+        task_org,
+      </if>
+      <if test="taskTime != null">
+        task_time,
+      </if>
+      <if test="taskDesc != null">
+        task_desc,
+      </if>
+      <if test="isValid != null">
+        is_valid,
+      </if>
+      <if test="isAudit != null">
+        is_audit,
+      </if>
+      <if test="creatorId != null">
+        creator_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="editorId != null">
+        editor_id,
+      </if>
+      <if test="editTime != null">
+        edit_time,
+      </if>
+      <if test="auditorId != null">
+        auditor_id,
+      </if>
+      <if test="auditTime != null">
+        audit_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="taskName != null">
+        #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskOrg != null">
+        #{taskOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTime != null">
+        #{taskTime,jdbcType=DATE},
+      </if>
+      <if test="taskDesc != null">
+        #{taskDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isValid != null">
+        #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null">
+        #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=DATE},
+      </if>
+      <if test="editorId != null">
+        #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null">
+        #{editTime,jdbcType=DATE},
+      </if>
+      <if test="auditorId != null">
+        #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null">
+        #{auditTime,jdbcType=DATE},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.nis.domain.configuration.TaskInfo">
+    update task_info
+    <set>
+      <if test="taskName != null">
+        task_name = #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskOrg != null">
+        task_org = #{taskOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTime != null">
+        task_time = #{taskTime,jdbcType=DATE},
+      </if>
+      <if test="taskDesc != null">
+        task_desc = #{taskDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isValid != null">
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null">
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=DATE},
+      </if>
+      <if test="editorId != null">
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null">
+        edit_time = #{editTime,jdbcType=DATE},
+      </if>
+      <if test="auditorId != null">
+        auditor_id = #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null">
+        audit_time = #{auditTime,jdbcType=DATE},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.TaskInfo">
+    update task_info
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      task_org = #{taskOrg,jdbcType=VARCHAR},
+      task_time = #{taskTime,jdbcType=DATE},
+      task_desc = #{taskDesc,jdbcType=VARCHAR},
+      is_valid = #{isValid,jdbcType=INTEGER},
+      is_audit = #{isAudit,jdbcType=INTEGER},
+      creator_id = #{creatorId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=DATE},
+      editor_id = #{editorId,jdbcType=INTEGER},
+      edit_time = #{editTime,jdbcType=DATE},
+      auditor_id = #{auditorId,jdbcType=INTEGER},
+      audit_time = #{auditTime,jdbcType=DATE}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -11,9 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.RequestInfoDao;
+import com.nis.web.dao.configuration.TaskInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -23,6 +25,8 @@ public class RequestInfoService extends BaseService{
 
 	@Autowired
 	private RequestInfoDao requestInfoDao;
+	@Autowired
+	private TaskInfoDao taskInfoDao;
 	
 	public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
 		// 设置分页参数
@@ -81,4 +85,8 @@ public class RequestInfoService extends BaseService{
 		RequestInfo requestInfo=new RequestInfo();
 		return requestInfoDao.findAllList(requestInfo);
 	}
+
+	public List<TaskInfo> showTask(TaskInfo taskInfo) {
+		return taskInfoDao.findList(taskInfo);
+	}
 }

src/main/resources/generatorConfig.xml

@@ -5,35 +5,35 @@
    "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
   
  <generatorConfiguration>
-   <classPathEntry location="C:\Users\chenghui\.m2\repository\mysql\mysql-connector-java\5.1.36\mysql-connector-java-5.1.36.jar" />
+   <classPathEntry location="C:\Users\Administrator\.m2\repository\mysql\mysql-connector-java\5.1.36\mysql-connector-java-5.1.36.jar" />
  <context id="mysqlTables" targetRuntime="MyBatis3">
    <commentGenerator>
      <property name="suppressAllComments" value="true"/>
    </commentGenerator>
    <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-         connectionURL="jdbc:mysql://192.168.10.2:3306/bjbusxf?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull"
+         connectionURL="jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull"
-         userId="root" password="ictsoft">
+         userId="dfh" password="111111">
     </jdbcConnection>
    <javaTypeResolver>
       <property name="forceBigDecimals" value="false"/>
    </javaTypeResolver>
    
-   <javaModelGenerator targetPackage="com.nis.domain" targetProject="bjbusxf/src/main/java">
+   <javaModelGenerator targetPackage="com.nis.domain.configuration" targetProject="gwall/src/main/java">
        <property name="enableSubPackages" value="true"/>
        <property name="trimStrings" value="true"/>
    </javaModelGenerator>
     
-   <sqlMapGenerator targetPackage="com.nis.web.dao" targetProject="bjbusxf/src/main/java">
+   <sqlMapGenerator targetPackage="com.nis.web.dao.configuration" targetProject="gwall/src/main/java">
         <property name="enableSubPackages" value="true"/>
    </sqlMapGenerator>
     
-  <javaClientGenerator type="XMLMAPPER" targetPackage="com.nis.web.dao" targetProject="bjbusxf/src/main/java">
+  <javaClientGenerator type="XMLMAPPER" targetPackage="com.nis.web.dao.configuration" targetProject="gwall/src/main/java">
      <property name="enableSubPackages" value="true"/>
    </javaClientGenerator>
   
    
-    <table  tableName="reg_attach_info" 
+    <table  tableName="task_info" 
-   		domainObjectName="regAttachInfo" 
+   		domainObjectName="TaskInfo" 
    		enableCountByExample="false" 
    		enableSelectByExample="false" 
    		enableUpdateByExample="false" 

src/main/resources/messages/message_en.properties

@@ -108,14 +108,14 @@ edit_time=edittime
 
 #============laihan begin======================
 refresh=refresh
-add_request=add request
+add=add
 request_number=request number
 state=state
 created=created
+examine=examine
 unapproved=unapproved
 approved=approved
 title=title
-task=task
 request_time=request time
 operate_time=operate time
 search=search
@@ -123,16 +123,20 @@ request_organization=request organization
 operator=operator
 content=content
 remarks=remarks
-update_request=update request
 operation=operation
 submit=submit
 cancel=cancel
 begin_date=begin date
 end_date=end date
 delete=delete
+special_task=special task
 #============laihan end======================
 
 
 #==========message begin=====================
 required=This field is required\uff01
+select=Please select
+date_list=Date List
+confirm_message=Are you sure?
+
 #==========message end=====================

src/main/resources/messages/message_ru.properties

@@ -108,14 +108,14 @@ edit_time=edittime
 
 #============laihan begin======================
 refresh=refresh
-add_request=add request
+add=add
 request_number=request number
 state=state
 created=created
+examine=examine
 unapproved=unapproved
 approved=approved
 title=title
-task=task
 request_time=request time
 operate_time=operate time
 search=search
@@ -123,15 +123,20 @@ request_organization=request organization
 operator=operator
 content=content
 remarks=remarks
-update_request=update request
 operation=operation
 submit=submit
 cancel=cancel
 begin_date=begin date
 end_date=end date
 delete=delete
+special_task=special task
 #============laihan end======================
 
+
 #==========message begin=====================
 required=This field is required！
+select=Please select
+date_list=Date List
+confirm_message=Are you sure?
+
 #==========message end=====================

src/main/resources/messages/message_zh_CN.properties

@@ -107,14 +107,14 @@ edit_time=\u4fee\u6539\u65f6\u95f4
 
 #==========laihan begin=====================
 refresh=\u5237\u65b0
-add_request=\u65b0\u589e\u6765\u51fd
+add=\u65b0\u589e
 request_number=\u6765\u51fd\u51fd\u53f7
 state=\u72b6\u6001
 created=\u672a\u5ba1\u6838
+examine=\u5ba1\u6838
 unapproved=\u672a\u901a\u8fc7
-approved=\u5ba1\u6838\u901a\u8fc7
+approved=\u5df2\u901a\u8fc7
 title=\u6807\u9898
-task=\u4efb\u52a1
 request_time=\u6765\u51fd\u65f6\u95f4
 operate_time=\u64cd\u4f5c\u65f6\u95f4
 search=\u641c\u7d22
@@ -122,15 +122,19 @@ request_organization=\u6765\u51fd\u5355\u4f4d
 operator=\u64cd\u4f5c\u5458
 content=\u5185\u5bb9
 remarks=\u5907\u6ce8
-update_request=\u4fee\u6539\u6765\u51fd
 operation=\u64cd\u4f5c
 submit=\u63d0\u4ea4
 cancel=\u53d6\u6d88
 begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
+special_task=\u4e13\u9879\u4efb\u52a1
 #==========yewu zidian end=====================
 
 #==========message begin=====================
 required=\u4e0d\u80fd\u4e3a\u7a7a!
+select=--\u8bf7\u9009\u62e9--
+date_list=\u6570\u636e\u5217\u8868
+confirm_message=\u786e\u5b9a\u5417\uff1f
+
 #==========message end=====================

src/main/webapp/WEB-INF/include/header.jsp

@@ -60,4 +60,6 @@
 <script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script>
 <!-- END THEME LAYOUT SCRIPTS -->
 
+<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
+<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
 

src/main/webapp/WEB-INF/views/cfg/requestForm.jsp

@@ -7,18 +7,18 @@
 </head>
 <body>
 
-<div class="content">
+<div class="page-content">
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="update_request"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add_request"/></c:if></div>
+						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add"/></c:if></div>
 				</div>
 				
 				<div class="portlet-body form">
 					<!-- BEGIN FORM-->
-					<form:form action="${ctx}/cfg/request/saveOrUpdate" class="form-horizontal" id="inputForm" method="post" >
+					<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
 					<sys:message content="${message}"/>
 					<input type="hidden"  name="id" value="${requestInfo.id}"/>
 						<div class="form-body">
@@ -47,12 +47,23 @@
 									<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
 								</div>
 							</div>
-							<div class="form-group last">
+							<div class="form-group">
-								<label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label>
+								<label class="col-md-3 control-label"><spring:message code="content"></spring:message>:</label>
 								<div class="col-md-4">
 									<input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}">
 								</div>
 							</div>
+							<div class="form-group last">
+								<label class="col-md-3 control-label"><th><spring:message code="special_task"/>:</label>
+								<div class="col-md-4">
+									<form:select path="taskId" class="selectpicker select2">
+										<form:option value=""><spring:message code="select"/></form:option>
+										<c:forEach items="${taskInfos}" var="taskInfo">
+											<form:option value="${taskInfo.id}">${taskInfo.taskName}</form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+							</div>
 						</div>
 						<div class="form-actions">
 							<div class="row">

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -8,15 +8,15 @@
 
 <body>
 
-<div class="content">
+<div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add"></spring:message></button>
 	</div>
 	
 	<h3 class="page-title">
-		来函管理 
+		<spring:message code="requestInfo"></spring:message>
 	</h3>
 	
 	<div class="row">
@@ -24,7 +24,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 					</div>
 				</div>
 				<div class="portlet-body">
@@ -35,19 +35,20 @@
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<div class="col-md-12">
 							<spring:message code="state"/> : <form:select path="isAudit" class="select2">
-								<form:option value=""></form:option>
+								<form:option value=""><spring:message code="select"></spring:message></form:option>
 								<form:option value="0"><spring:message code="created"></spring:message></form:option>
 								<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 							</form:select> 
 							
 							<select id="seltype">
+								<option value=""><spring:message code="select"></spring:message></option>
 								<option value="requestTitle"><spring:message code="title"></spring:message></option>
 								<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
-								<option value="requestContent"><spring:message code="task"></spring:message></option>
+								<option value="requestContent"><spring:message code="content"></spring:message></option>
 							</select> <input id="intype">
 							 
-							<form:select id="timeType" name="timeType" path="timeType">
+							<form:select path="timeType">
-<%-- 								<form:option value=""></form:option> --%>
+							<form:option value=""><spring:message code="select"></spring:message></form:option>
 								<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
 								<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
 							</form:select> 
@@ -79,6 +80,7 @@
 									<th><spring:message code="operate_time"></spring:message></th>
 									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
+									<th><spring:message code="special_task"></spring:message></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -110,6 +112,7 @@
 									</td>
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
+									<td>${requestInfo.taskName }</td>
 									<td>
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
@@ -117,12 +120,12 @@
 								      <!-- 审核未通过可修改 -->
 								        	<c:choose>
 									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="cancel"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="approved"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="update_request"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="delete"></spring:message></a></li>
+								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:otherwise>
 								        	</c:choose>
 									      </ul>