Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordReportDao.java

@@ -20,14 +20,14 @@ public interface RuralProjectRecordReportDao extends CrudDao<RuralProjectRecordR
      * @param ruralProjectRecordReportInfo
      * @return
      */
-    List<String> getYear(RuralProjectRecordReportInfo ruralProjectRecordReportInfo);
+    List<Integer> getYear(RuralProjectRecordReportInfo ruralProjectRecordReportInfo);
 
     /**
      * 获取项目月份信息
      * @param ruralProjectRecordReportInfo
      * @return
      */
-    List<String> getMonth(RuralProjectRecordReportInfo ruralProjectRecordReportInfo);
+    List<Integer> getMonth(RuralProjectRecordReportInfo ruralProjectRecordReportInfo);
 
     /**
      * 获取项目部门信息

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecordReportInfo.java

@@ -25,6 +25,19 @@ public class RuralProjectRecordReportInfo extends DataEntity<RuralProjectRecordR
     private String projectType;   //类型
     private Integer endingCount;   //结束天数
     private List<String> typeList;
+    private String reportedState;   //上报状态
+    private String reportedProcessInstanceId;   //上报流程号
+    private Integer projectReportRecordStatus; //归档状态
+    private String filingProjectStatus; //批量归档状态
+    private String filingBatch ;//档次批号id
+    private String boxNum; //盒号
+    private String reBoxNum;//确认盒号
+    //归档批次信息
+    private String filingBatchId; //归档批次Id
+    private String filingProcessinstanceId;// 审批流程id
+    private Integer filingStatus;//归档审批状态
+    private String checkStatus; //选查状态
+    private String checkProcessInstanceId;//选查审批流程
 
     @ExcelField(title="年份", align=2, sort=2)
     public String getYear() {
@@ -80,16 +93,44 @@ public class RuralProjectRecordReportInfo extends DataEntity<RuralProjectRecordR
         this.officeName = officeName;
     }
 
-    @ExcelField(title="归档状态", align=2, sort=8)
-    public String getRecordStatus() {
-        return recordStatus;
+    @ExcelField(title="电子归档", dictType = "archive_state", align=2, sort=8)
+    public Integer getProjectReportRecordStatus() {
+        return projectReportRecordStatus;
     }
 
-    public void setRecordStatus(String recordStatus) {
-        this.recordStatus = recordStatus;
+    public void setProjectReportRecordStatus(Integer projectReportRecordStatus) {
+        this.projectReportRecordStatus = projectReportRecordStatus;
+    }
+
+    @ExcelField(title="批量归档", dictType = "archive_state", align=2, sort=9)
+    public String getFilingProjectStatus() {
+        return filingProjectStatus;
+    }
+
+    public void setFilingProjectStatus(String filingProjectStatus) {
+        this.filingProjectStatus = filingProjectStatus;
+    }
+
+
+
+    @ExcelField(title="上报状态",dictType = "reported_state", align=2, sort=10)
+    public String getReportedState() {
+        return reportedState;
+    }
+
+    public void setReportedState(String reportedState) {
+        this.reportedState = reportedState;
+    }
+
+    @ExcelField(title="选查", dictType = "check_status", align=2, sort=11)
+    public String getCheckStatus() {
+        return checkStatus;
+    }
+
+    public void setCheckStatus(String checkStatus) {
+        this.checkStatus = checkStatus;
     }
 
-    @ExcelField(title="上报状态", align=2, sort=9)
     public String getReportedStatus() {
         return reportedStatus;
     }
@@ -98,6 +139,14 @@ public class RuralProjectRecordReportInfo extends DataEntity<RuralProjectRecordR
         this.reportedStatus = reportedStatus;
     }
 
+    public String getRecordStatus() {
+        return recordStatus;
+    }
+
+    public void setRecordStatus(String recordStatus) {
+        this.recordStatus = recordStatus;
+    }
+
     public String getProjectType() {
         return projectType;
     }
@@ -129,4 +178,70 @@ public class RuralProjectRecordReportInfo extends DataEntity<RuralProjectRecordR
     public void setTypeList(List<String> typeList) {
         this.typeList = typeList;
     }
+
+
+    public String getReportedProcessInstanceId() {
+        return reportedProcessInstanceId;
+    }
+
+    public void setReportedProcessInstanceId(String reportedProcessInstanceId) {
+        this.reportedProcessInstanceId = reportedProcessInstanceId;
+    }
+
+    public String getFilingBatch() {
+        return filingBatch;
+    }
+
+    public void setFilingBatch(String filingBatch) {
+        this.filingBatch = filingBatch;
+    }
+
+    public String getBoxNum() {
+        return boxNum;
+    }
+
+    public void setBoxNum(String boxNum) {
+        this.boxNum = boxNum;
+    }
+
+    public String getReBoxNum() {
+        return reBoxNum;
+    }
+
+    public void setReBoxNum(String reBoxNum) {
+        this.reBoxNum = reBoxNum;
+    }
+
+    public String getFilingBatchId() {
+        return filingBatchId;
+    }
+
+    public void setFilingBatchId(String filingBatchId) {
+        this.filingBatchId = filingBatchId;
+    }
+
+    public String getFilingProcessinstanceId() {
+        return filingProcessinstanceId;
+    }
+
+    public void setFilingProcessinstanceId(String filingProcessinstanceId) {
+        this.filingProcessinstanceId = filingProcessinstanceId;
+    }
+
+    public Integer getFilingStatus() {
+        return filingStatus;
+    }
+
+    public void setFilingStatus(Integer filingStatus) {
+        this.filingStatus = filingStatus;
+    }
+
+
+    public String getCheckProcessInstanceId() {
+        return checkProcessInstanceId;
+    }
+
+    public void setCheckProcessInstanceId(String checkProcessInstanceId) {
+        this.checkProcessInstanceId = checkProcessInstanceId;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordReportService.java

@@ -5,6 +5,10 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.common.utils.MenuStatusEnum;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordReportDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordReportInfo;
@@ -13,6 +17,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +34,10 @@ public class RuralProjectRecordReportService extends CrudService<RuralProjectRec
 
     @Autowired
     private RuralWorkProjectUserDao workProjectUserDao;
+    @Autowired
+    private ProjectFilingbatchRelationDao filingbatchRelationDao;
+    @Autowired
+    private ProjectFilingBatchDao projectFilingBatchDao;
 
     public Page<RuralProjectRecordReportInfo> findPage(Page<RuralProjectRecordReportInfo> page, RuralProjectRecordReportInfo ruralProjectRecordReportInfo) {
         //设置数据权限
@@ -56,6 +65,24 @@ public class RuralProjectRecordReportService extends CrudService<RuralProjectRec
                 records.setOfficeName(user.getOffice().getName());
                 records.setOfficeId(user.getOffice().getId());
             }
+
+            //项目归档批次
+            ProjectFilingbatchRelation relation=filingbatchRelationDao.getProjectId(records.getId());
+            if(relation!=null && StringUtils.isNotBlank(relation.getId())){
+                records.setFilingBatch(relation.getFilingBatch());
+                records.setFilingProjectStatus(relation.getStatus().toString());
+                records.setBoxNum(relation.getBoxNum());
+                records.setReBoxNum(relation.getReBoxNum());
+                ProjectFilingBatch filingBatch=projectFilingBatchDao.findByFilingBatchOnProject(relation.getFilingBatch());
+                if(null != filingBatch){
+                    records.setFilingBatchId(filingBatch.getId());
+                    records.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
+                    records.setFilingStatus(filingBatch.getFilingStatus());
+                }
+            }else{
+                records.setFilingStatus(0);
+                records.setFilingProjectStatus("0");
+            }
         }
         page.setList(list);
         return page;
@@ -66,7 +93,7 @@ public class RuralProjectRecordReportService extends CrudService<RuralProjectRec
      * @param ruralProjectRecordReportInfo
      * @return
      */
-    public List<String> getYear(RuralProjectRecordReportInfo ruralProjectRecordReportInfo){
+    public List<Integer> getYear(RuralProjectRecordReportInfo ruralProjectRecordReportInfo){
         return dao.getYear(ruralProjectRecordReportInfo);
     }
 
@@ -75,7 +102,7 @@ public class RuralProjectRecordReportService extends CrudService<RuralProjectRec
      * @param ruralProjectRecordReportInfo
      * @return
      */
-    public List<String> getMonth(RuralProjectRecordReportInfo ruralProjectRecordReportInfo){
+    public List<Integer> getMonth(RuralProjectRecordReportInfo ruralProjectRecordReportInfo){
         return dao.getMonth(ruralProjectRecordReportInfo);
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectCostRecordReportController.java

@@ -20,6 +20,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -43,9 +44,11 @@ public class RuralProjectCostRecordReportController extends BaseController {
         ruralProjectRecordReportInfo.setProjectType("2");
         Page<RuralProjectRecordReportInfo> page = ruralProjectRecordReportService.findPage(new Page<RuralProjectRecordReportInfo>(request, response), ruralProjectRecordReportInfo);
         //获取合同年份信息
-        List<String> yearList = ruralProjectRecordReportService.getYear(ruralProjectRecordReportInfo);
+        List<Integer> yearList = ruralProjectRecordReportService.getYear(ruralProjectRecordReportInfo);
+        Collections.sort(yearList,Collections.reverseOrder());
         //获取合同月份信息
-        List<String> monthList = ruralProjectRecordReportService.getMonth(ruralProjectRecordReportInfo);
+        List<Integer> monthList = ruralProjectRecordReportService.getMonth(ruralProjectRecordReportInfo);
+        Collections.sort(monthList);
         model.addAttribute("yearList", yearList);
         model.addAttribute("monthList", monthList);
         model.addAttribute("page", page);
@@ -62,14 +65,14 @@ public class RuralProjectCostRecordReportController extends BaseController {
         try {
             //添加查询类型(工程咨询)
             ruralProjectRecordReportInfo.setProjectType("2");
-            String fileName = "年度造价审核绩效一览表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+            String fileName = "造价审核项目考核一览表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
             User user = UserUtils.getUser();
             ruralProjectRecordReportInfo.setCurrentUser(user);
             Page<RuralProjectRecordReportInfo> page = ruralProjectRecordReportService.findPage(new Page<RuralProjectRecordReportInfo>(request, response, -1), ruralProjectRecordReportInfo);
-            new ExportExcel("年度造价审核绩效一览表", RuralProjectRecordReportInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
+            new ExportExcel("造价审核项目考核一览表", RuralProjectRecordReportInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
-            addMessage(redirectAttributes, "导出年度造价审核项目一览表记录失败！失败信息：" + e.getMessage());
+            addMessage(redirectAttributes, "导出造价审核项目考核一览表记录失败！失败信息：" + e.getMessage());
         }
         return "redirect:" + Global.getAdminPath() + "/projectCostRecordReport/projectCostRecordReport/?repage";
     }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordReportController.java

@@ -5,6 +5,7 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordReportInfo;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordReportService;
 import com.jeeplus.modules.sys.entity.Office;
@@ -20,6 +21,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -43,9 +45,11 @@ public class RuralProjectRecordReportController extends BaseController {
         ruralProjectRecordReportInfo.setProjectType("1");
         Page<RuralProjectRecordReportInfo> page = ruralProjectRecordReportService.findPage(new Page<RuralProjectRecordReportInfo>(request, response), ruralProjectRecordReportInfo);
         //获取合同年份信息
-        List<String> yearList = ruralProjectRecordReportService.getYear(ruralProjectRecordReportInfo);
+        List<Integer> yearList = ruralProjectRecordReportService.getYear(ruralProjectRecordReportInfo);
+        Collections.sort(yearList,Collections.reverseOrder());
         //获取合同月份信息
-        List<String> monthList = ruralProjectRecordReportService.getMonth(ruralProjectRecordReportInfo);
+        List<Integer> monthList = ruralProjectRecordReportService.getMonth(ruralProjectRecordReportInfo);
+        Collections.sort(monthList);
         model.addAttribute("yearList", yearList);
         model.addAttribute("monthList", monthList);
         model.addAttribute("page", page);
@@ -62,14 +66,14 @@ public class RuralProjectRecordReportController extends BaseController {
         try {
             //添加查询类型(工程咨询)
             ruralProjectRecordReportInfo.setProjectType("1");
-            String fileName = "年度工程咨询项目一览表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+            String fileName = "工程咨询项目考核一览表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
             User user = UserUtils.getUser();
             ruralProjectRecordReportInfo.setCurrentUser(user);
             Page<RuralProjectRecordReportInfo> page = ruralProjectRecordReportService.findPage(new Page<RuralProjectRecordReportInfo>(request, response, -1), ruralProjectRecordReportInfo);
-            new ExportExcel("年度工程咨询项目一览表", RuralProjectRecordReportInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
+            new ExportExcel("工程咨询项目考核一览表", RuralProjectRecordReportInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
-            addMessage(redirectAttributes, "导出年度工程咨询项目一览表记录失败！失败信息：" + e.getMessage());
+            addMessage(redirectAttributes, "导出工程咨询项目考核一览表记录失败！失败信息：" + e.getMessage());
         }
         return "redirect:" + Global.getAdminPath() + "/projectRecordReport/projectRecordReport/?repage";
     }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordReportDao.xml

@@ -47,7 +47,7 @@
 		WHERE a.id = #{id}
 	</select>
 
-	<select id="getYear" resultType="java.lang.String">
+	<select id="getYear" resultType="java.lang.Integer">
 		SELECT
 			distinct(year(a.create_date)) as "year"
 		FROM rural_project_records a
@@ -60,7 +60,7 @@
 		</where>
 	</select>
 
-	<select id="getMonth" resultType="java.lang.String">
+	<select id="getMonth" resultType="java.lang.Integer">
 		SELECT
 			distinct(month(a.create_date)) as "month"
 		FROM rural_project_records a
@@ -87,8 +87,14 @@
 	<select id="findList" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordReportInfo" >
 		SELECT
 			<include refid="ruralProjectInfoColumns"/>
+		,ifnull(rprr.report_status,0) as "reportedState"
+		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		,ifnull(a.check_status ,0) as "checkStatus"
+		,a.check_process_instance_id AS "checkProcessInstanceId"
 		FROM rural_project_records a
 		<include refid="ruralProjectInfoJoins"/>
+		left join rural_project_records_reported rprr on rprr.id = a.id
 		<where>
 			a.del_flag = 0 and project_type = #{projectType} and a.status = 5 and prd.status = 5
 			<if test="year != null and year != ''">
@@ -122,9 +128,10 @@
 
 
 	<select id="queryCount" resultType="int" >
-		SELECT count(1)
+		SELECT count(distinct a.id)
 		FROM rural_project_records a
 		<include refid="ruralProjectInfoJoins"/>
+		left join rural_project_records_reported rprr on rprr.id = a.id
 		<where>
 			a.del_flag = 0 and project_type = #{projectType} and a.status = 5 and prd.status = 5
 			<if test="year != null and year != ''">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralProjectCostRecordReportList.jsp

@@ -72,7 +72,7 @@
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-				<div class="commonQuery lw7">
+				<%--<div class="commonQuery lw7">
 					<div class="layui-item query athird">
 						<label class="layui-form-label">年份：</label>
 						<div class="layui-input-block with-icon">
@@ -124,7 +124,7 @@
 											title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				</form:form>
 			</div>
 		</div>
@@ -168,9 +168,39 @@
 				,{field:'reportNum',align:'center',minWidth:150, title: '报告号'}
 				,{field:'principalUser',align:'center', title: '项目负责人'}
 				,{field:'officeName',align:'center', title: '所属部门'}
-				,{field:'recordStatus',align:'center', title: '归档状态'}
-				,{field:'reportedStatus',align:'center', title: '上报状态'}
+				,{align:'center', title: '电子归档',  width:90,templet:function(d){
+						var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
+				,{align:'center', title: '批量归档',  width:90,templet:function(d){
+						var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcess?filingProcessinstanceId=" + d.filingProcessinstanceId+"&id="+d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
 
+				,{align:'center', title: '上报',  width:90,templet:function(d){
+						var st = getReportedState(""+d.reportedState);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
+				,{align:'center', title: '选查',  width:90,templet:function(d){
+						var st = getCheckProjectState(d.checkStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/recordChooseCheck/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
 
             ]]
             ,data: [
@@ -191,6 +221,11 @@
 					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 					,"showView":1
 					</shiro:hasPermission>
+					,"projectReportRecordStatus":"${workContractInfo.projectReportRecordStatus}"
+					,"filingProjectStatus":"${workContractInfo.filingProjectStatus}"
+					,"reportedState":"${workContractInfo.reportedState}"
+					,"checkStatus":"${workContractInfo.checkStatus}"
+					,"checkProcessInstanceId":"${workContractInfo.checkProcessInstanceId}"
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/ruralProjectRecordReportList.jsp

@@ -72,7 +72,7 @@
 				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-				<div class="commonQuery lw7">
+				<%--<div class="commonQuery lw7">
 					<div class="layui-item query athird">
 						<label class="layui-form-label">年份：</label>
 						<div class="layui-input-block with-icon">
@@ -124,7 +124,7 @@
 											title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				</form:form>
 			</div>
 		</div>
@@ -159,13 +159,48 @@
                 ,{field:'year',align:'center', sort:true,title: '年份'}
                 ,{field:'month',align:'center', sort:true,title: '月份'}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.projectName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projectName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+						}else{
+							return "<span title='"+ d.projectName +"'>" +d.projectName+ "</span>";
+						}
                     }}
 				,{field:'reportNum',align:'center',minWidth:150, title: '报告号'}
 				,{field:'principalUser',align:'center', title: '项目负责人'}
 				,{field:'officeName',align:'center', title: '所属部门'}
-				,{field:'recordStatus',align:'center', title: '归档状态'}
-				,{field:'reportedStatus',align:'center', title: '上报状态'}
+				,{align:'center', title: '电子归档',  width:90,templet:function(d){
+						var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
+				,{align:'center', title: '批量归档',  width:90,templet:function(d){
+						var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcess?filingProcessinstanceId=" + d.filingProcessinstanceId+"&id="+d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
+
+				,{align:'center', title: '上报',  width:90,templet:function(d){
+						var st = getReportedState(""+d.reportedState);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
+				,{align:'center', title: '选查',  width:90,templet:function(d){
+						var st = getCheckProjectState(d.checkStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/recordChooseCheck/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
 
 
             ]]
@@ -184,6 +219,14 @@
 					,"officeName":"${workContractInfo.officeName}"
 					,"recordStatus":"${workContractInfo.recordStatus}"
 					,"reportedStatus":"${workContractInfo.reportedStatus}"
+					,"projectReportRecordStatus":"${workContractInfo.projectReportRecordStatus}"
+					,"filingProjectStatus":"${workContractInfo.filingProjectStatus}"
+					,"reportedState":"${workContractInfo.reportedState}"
+					,"checkStatus":"${workContractInfo.checkStatus}"
+					,"checkProcessInstanceId":"${workContractInfo.checkProcessInstanceId}"
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
+					,"showView":1
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>