表格修改：变更外包施工单位》归口部门，增加工作状态（是否关闭）完成

显示修改：有存在第二次领退料，信息标红 完成

src/main/java/com/jeeplus/modules/sg/information/entity/Information.java

@@ -58,18 +58,48 @@ public class Information extends DataEntity<Information>  {
 	private String secondFinish;
 	//完成甲供物资领退料的日期（第2次）
 	private Date secondFinishDate;
-	//完成甲供物资领退料的时间
-	private String finishDate;
 	//是否超期
 	private String overdue;
 	//是否决算送审
 	private String trial;
 	//施工单位
 	private String construction;
-	//外包施工单位
+	//工作状态（是否关闭）
 	private String outConstruction;
 	//结算单位
 	private String settlement;
+	//是否完成甲供物资领退料
+	private String complete;
+	//完成甲供物资领退料时间
+	private String finishDate;
+	//未完成甲供物资领退料时间
+	private String noFinishDate;
+	//归口部门
+	private String underCentralized;
+
+	public String getComplete() {
+		return complete;
+	}
+
+	public void setComplete(String complete) {
+		this.complete = complete;
+	}
+
+	public String getNoFinishDate() {
+		return noFinishDate;
+	}
+
+	public void setNoFinishDate(String noFinishDate) {
+		this.noFinishDate = noFinishDate;
+	}
+
+	public String getUnderCentralized() {
+		return underCentralized;
+	}
+
+	public void setUnderCentralized(String underCentralized) {
+		this.underCentralized = underCentralized;
+	}
 
 	public Information(){
 		super();
@@ -314,7 +344,7 @@ public class Information extends DataEntity<Information>  {
 		this.construction = construction;
 	}
 
-	@ExcelField(title="外包施工单位", align=2, sort=26)
+	@ExcelField(title="工作状态（是否关闭）", align=2, sort=26)
 	public String getOutConstruction() {
 		return outConstruction;
 	}

src/main/java/com/jeeplus/modules/sg/information/entity/append.java

@@ -11,10 +11,12 @@ public class append {
     private String trial;
     //施工单位
     private String construction;
-    //外包施工单位
+    //工作状态（是否关闭）
     private String outConstruction;
     //结算单位
     private String settlement;
+    //归口部门
+    private String underCentralized;
 
 
     @ExcelField(title = "项目定义号", align = 2, sort = 1)
@@ -44,7 +46,7 @@ public class append {
         this.construction = construction;
     }
 
-    @ExcelField(title = "外包施工单位", align = 2, sort = 4)
+    @ExcelField(title = "工作状态（是否关闭）", align = 2, sort = 4)
     public String getOutConstruction() {
         return outConstruction;
     }
@@ -61,4 +63,13 @@ public class append {
     public void setSettlement(String settlement) {
         this.settlement = settlement;
     }
+
+    @ExcelField(title = "归口部门", align = 2, sort = 6)
+    public String getUnderCentralized() {
+        return underCentralized;
+    }
+
+    public void setUnderCentralized(String underCentralized) {
+        this.underCentralized = underCentralized;
+    }
 }

src/main/java/com/jeeplus/modules/sg/information/mapper/xml/InformationMapper.xml

@@ -233,7 +233,7 @@
 
     <select id="findList" resultType="Information">
         SELECT
-		<include refid="newInformationColumns"/>,b.trial,b.construction,b.outConstruction,b.settlement
+		<include refid="newInformationColumns"/>,b.trial,b.construction,b.outConstruction,b.settlement,b.underCentralized
         FROM project_information as a
 		left JOIN project_append as b on a.project_id = b.project_id
         <where>
@@ -259,6 +259,14 @@
         	<if test="projectType !=null and projectType != ''">
 				and a.project_type = #{projectType}
 			</if>
+			<if test="firstFinish!=null and firstFinish!=''">
+				<if test="firstFinish == '是'.toString()">
+					and a.firstFinish='是' and (a.secondFinish != '否' or a.secondFinish is null)
+				</if>
+				<if test="firstFinish == '否'.toString()">
+					and (a.firstFinish='否' or a.secondFinish = '否')
+				</if>
+			</if>
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -380,7 +388,8 @@
 			trial,
 			construction,
 			outConstruction,
-			settlement
+			settlement,
+			underCentralized
 		)
 		VALUES
 		<foreach collection="list" item="item" separator="," >
@@ -389,7 +398,8 @@
 			#{item.trial},
 			#{item.construction},
 			#{item.outConstruction},
-			#{item.settlement}
+			#{item.settlement},
+			#{item.underCentralized}
 			)
 		</foreach>
 	</insert>
@@ -453,7 +463,7 @@
 	
 	<select id="export" resultType="com.jeeplus.modules.sg.information.entity.Information">
 		SELECT
-		a.*,b.trial,b.construction,b.outConstruction,b.settlement
+		a.*,b.trial,b.construction,b.outConstruction,b.settlement,b.underCentralized
 		FROM project_information as a
 		left JOIN project_append as b on a.project_id = b.project_id
 		where 1=1

src/main/java/com/jeeplus/modules/sg/information/service/InformationService.java

@@ -52,34 +52,51 @@ public class InformationService extends CrudService<InformationMapper, Informati
 		Calendar cal = Calendar.getInstance();
 		long between_days = 0;
 		for (Information in : list) {
-			if (in.getApprovalDate() != null) {
-				cal.setTime(in.getApprovalDate());
-				long appDay = cal.getTimeInMillis();
-				if (in.getFirstFinishDate() != null && in.getSecondFinishDate() != null) {
-					if (in.getSecondFinishDate() != null) {
-						cal.setTime(in.getSecondFinishDate());
-						long secondDate = cal.getTimeInMillis();
-						between_days=(secondDate-appDay)/(1000*3600*24);
-						in.setFinishDate(String.valueOf(between_days)+"天");
-							if (between_days>14) {
-								in.setOverdue("是");
-							} else{
-								in.setOverdue("否");
+			//判断审定日期是否为空
+//			if (in.getApprovalDate() != null) {
+				//格式化审定日期
+
+				if ("否".equals(in.getFirstFinish()) || "否".equals(in.getSecondFinish())) {
+					in.setComplete("否");
+					if (in.getApprovalDate() != null) {
+						cal.setTime(in.getApprovalDate());
+						long appDay = cal.getTimeInMillis();
+						cal.setTime(new Date());
+						long nowDate = cal.getTimeInMillis();
+						between_days = (nowDate - appDay) / (1000 * 3600 * 24);
+						in.setNoFinishDate(String.valueOf(between_days) + "天");
+					}
+				} else {
+					in.setComplete("是");
+					if (in.getApprovalDate() != null) {
+						cal.setTime(in.getApprovalDate());
+						long appDay = cal.getTimeInMillis();
+						if (in.getFirstFinishDate() != null || in.getSecondFinishDate() != null) {
+							if (in.getSecondFinishDate() != null) {
+								cal.setTime(in.getSecondFinishDate());
+								long secondDate = cal.getTimeInMillis();
+								between_days = (secondDate - appDay) / (1000 * 3600 * 24);
+								in.setFinishDate(String.valueOf(between_days) + "天");
+								if (between_days > 14) {
+									in.setOverdue("是");
+								} else {
+									in.setOverdue("否");
+								}
+							} else {
+								cal.setTime(in.getFirstFinishDate());
+								long firstDate = cal.getTimeInMillis();
+								between_days = (firstDate - appDay) / (1000 * 3600 * 24);
+								in.setFinishDate(String.valueOf(between_days) + "天");
+								if (between_days > 14) {
+									in.setOverdue("是");
+								} else {
+									in.setOverdue("否");
+								}
 							}
 						}
-						else {
-							cal.setTime(in.getFirstFinishDate());
-							long firstDate = cal.getTimeInMillis();
-							between_days=(firstDate-appDay)/(1000*3600*24);
-							in.setFinishDate(String.valueOf(between_days)+"天");
-						}
-				} else {
-					cal.setTime(new Date());
-					long nowDate = cal.getTimeInMillis();
-					between_days=(nowDate-appDay)/(1000*3600*24);
-					in.setFinishDate(String.valueOf(between_days)+"天");
+					}
 				}
-			}
+//			}
 		}
 
 		return page1;
@@ -149,32 +166,44 @@ public class InformationService extends CrudService<InformationMapper, Informati
 		Calendar cal = Calendar.getInstance();
 		long between_days = 0;
 		for (Information in : informationList) {
-			if (in.getApprovalDate() != null) {
-				cal.setTime(in.getApprovalDate());
-				long appDay = cal.getTimeInMillis();
-				if (in.getFirstFinishDate() != null && in.getSecondFinishDate() != null) {
-					if (in.getSecondFinishDate() != null) {
-						cal.setTime(in.getSecondFinishDate());
-						long secondDate = cal.getTimeInMillis();
-						between_days=(secondDate-appDay)/(1000*3600*24);
-						in.setFinishDate(String.valueOf(between_days)+"天");
-						if (between_days>14) {
-							in.setOverdue("是");
-						} else{
-							in.setOverdue("否");
-						}
-					}
-					else {
-						cal.setTime(in.getFirstFinishDate());
-						long firstDate = cal.getTimeInMillis();
-						between_days=(firstDate-appDay)/(1000*3600*24);
-						in.setFinishDate(String.valueOf(between_days)+"天");
-					}
-				} else {
+			if ("否".equals(in.getFirstFinish()) || "否".equals(in.getSecondFinish())) {
+				in.setComplete("否");
+				if (in.getApprovalDate() != null) {
+					cal.setTime(in.getApprovalDate());
+					long appDay = cal.getTimeInMillis();
 					cal.setTime(new Date());
 					long nowDate = cal.getTimeInMillis();
-					between_days=(nowDate-appDay)/(1000*3600*24);
-					in.setFinishDate(String.valueOf(between_days)+"天");
+					between_days = (nowDate - appDay) / (1000 * 3600 * 24);
+					in.setNoFinishDate(String.valueOf(between_days) + "天");
+				}
+			} else {
+				in.setComplete("是");
+				if (in.getApprovalDate() != null) {
+					cal.setTime(in.getApprovalDate());
+					long appDay = cal.getTimeInMillis();
+					if (in.getFirstFinishDate() != null || in.getSecondFinishDate() != null) {
+						if (in.getSecondFinishDate() != null) {
+							cal.setTime(in.getSecondFinishDate());
+							long secondDate = cal.getTimeInMillis();
+							between_days = (secondDate - appDay) / (1000 * 3600 * 24);
+							in.setFinishDate(String.valueOf(between_days) + "天");
+							if (between_days > 14) {
+								in.setOverdue("是");
+							} else {
+								in.setOverdue("否");
+							}
+						} else {
+							cal.setTime(in.getFirstFinishDate());
+							long firstDate = cal.getTimeInMillis();
+							between_days = (firstDate - appDay) / (1000 * 3600 * 24);
+							in.setFinishDate(String.valueOf(between_days) + "天");
+							if (between_days > 14) {
+								in.setOverdue("是");
+							} else {
+								in.setOverdue("否");
+							}
+						}
+					}
 				}
 			}
 		}
@@ -186,32 +215,44 @@ public class InformationService extends CrudService<InformationMapper, Informati
 		Calendar cal = Calendar.getInstance();
 		long between_days = 0;
 		for (Information in : export) {
-			if (in.getApprovalDate() != null) {
-				cal.setTime(in.getApprovalDate());
-				long appDay = cal.getTimeInMillis();
-				if (in.getFirstFinishDate() != null && in.getSecondFinishDate() != null) {
-					if (in.getSecondFinishDate() != null) {
-						cal.setTime(in.getSecondFinishDate());
-						long secondDate = cal.getTimeInMillis();
-						between_days=(secondDate-appDay)/(1000*3600*24);
-						in.setFinishDate(String.valueOf(between_days)+"天");
-						if (between_days>14) {
-							in.setOverdue("是");
-						} else{
-							in.setOverdue("否");
-						}
-					}
-					else {
-						cal.setTime(in.getFirstFinishDate());
-						long firstDate = cal.getTimeInMillis();
-						between_days=(firstDate-appDay)/(1000*3600*24);
-						in.setFinishDate(String.valueOf(between_days)+"天");
-					}
-				} else {
+			if ("否".equals(in.getFirstFinish()) || "否".equals(in.getSecondFinish())) {
+				in.setComplete("否");
+				if (in.getApprovalDate() != null) {
+					cal.setTime(in.getApprovalDate());
+					long appDay = cal.getTimeInMillis();
 					cal.setTime(new Date());
 					long nowDate = cal.getTimeInMillis();
-					between_days=(nowDate-appDay)/(1000*3600*24);
-					in.setFinishDate(String.valueOf(between_days)+"天");
+					between_days = (nowDate - appDay) / (1000 * 3600 * 24);
+					in.setNoFinishDate(String.valueOf(between_days) + "天");
+				}
+			} else {
+				in.setComplete("是");
+				if (in.getApprovalDate() != null) {
+					cal.setTime(in.getApprovalDate());
+					long appDay = cal.getTimeInMillis();
+					if (in.getFirstFinishDate() != null || in.getSecondFinishDate() != null) {
+						if (in.getSecondFinishDate() != null) {
+							cal.setTime(in.getSecondFinishDate());
+							long secondDate = cal.getTimeInMillis();
+							between_days = (secondDate - appDay) / (1000 * 3600 * 24);
+							in.setFinishDate(String.valueOf(between_days) + "天");
+							if (between_days > 14) {
+								in.setOverdue("是");
+							} else {
+								in.setOverdue("否");
+							}
+						} else {
+							cal.setTime(in.getFirstFinishDate());
+							long firstDate = cal.getTimeInMillis();
+							between_days = (firstDate - appDay) / (1000 * 3600 * 24);
+							in.setFinishDate(String.valueOf(between_days) + "天");
+							if (between_days > 14) {
+								in.setOverdue("是");
+							} else {
+								in.setOverdue("否");
+							}
+						}
+					}
 				}
 			}
 		}

src/main/java/com/jeeplus/modules/sg/information/utils/ImportInformation.java

@@ -320,6 +320,7 @@ public  class ImportInformation {
     public static Map<String,Object> btnInReason(ImportExcel ei,int lastDataRowNum) {
         HashMap<String,Object> hashMap = new HashMap<String,Object>();
         List<Material> materialList = new ArrayList<>();
+        List<Material> noChange = new ArrayList<>();
         List error = new ArrayList();
         int successNum = 0;
         int failureNum = 0;
@@ -349,7 +350,19 @@ public  class ImportInformation {
                 if (status.equals("") || status == null) {
                     continue;
                 }else if(myProIn.getStatus()!=null){
-
+                    material.setProjectId(projectId.toString());
+                    material.setInforId(inforId.toString());
+                    material.setStatus(status.toString());
+                    if (info == null || info.equals("")) {
+                        infoW =" ";
+                    } else {
+                        infoW = info.toString();
+                    }
+                    material.setInfo(infoW);
+                    material.setIsBackNo(0);
+                    Double outboundNumber1 = myProIn.getOutboundNumber();
+                    material.setAfterNumber(outboundNumber1);
+                    noChange.add(material);
                 } else {
                     material.setProjectId(projectId.toString());
                     material.setInforId(inforId.toString());
@@ -387,6 +400,10 @@ public  class ImportInformation {
                     }
                     materialList.clear();
                 }
+                if (noChange.size() == 1000) {
+                    materialService.updateStatus(noChange);
+                    noChange.clear();
+                }
             } catch (Exception e) {
                 failureNum++;
             }
@@ -402,9 +419,7 @@ public  class ImportInformation {
                         upInfor.setProjectId(needInfor.getProjectId());
                         upInfor.setFirstFinish("是");
                         upInfor.setFirstFinishDate(new Date());
-                    } else if (("是").equals(needInfor.getFirstFinish())) {
-
-                    } else {
+                    }  else {
                         upInfor.setProjectId(needInfor.getProjectId());
                         upInfor.setSecondFinish("是");
                         upInfor.setSecondFinishDate(new Date());
@@ -413,6 +428,11 @@ public  class ImportInformation {
                     materialService.updateNeed(upInfor);
                 }
             }
+            if (noChange.size() != 0) {
+                materialService.updateStatus(noChange);
+                noChange.clear();
+            }
+
         } catch (Exception e) {
             failureNum++;
             e.printStackTrace();
@@ -433,17 +453,26 @@ public  class ImportInformation {
             try {
                 append append = new append();
                 Row row = ei.getRow(i);
+                //项目定义号
                 Object projectId = ei.getCellValue(row, 0);
+                //是否决算颂声
                 Object trial = ei.getCellValue(row, 1);
+                //施工单位
                 Object construction = ei.getCellValue(row, 2);
+                //工作状态
                 Object outConstruction = ei.getCellValue(row, 3);
+                //结算单位
                 Object settlement = ei.getCellValue(row, 4);
+                //归口部门
+                Object underCentralized = ei.getCellValue(row, 5);
+
 
                 append.setProjectId(projectId.toString());
                 append.setTrial(trial.toString());
                 append.setConstruction(construction.toString());
                 append.setOutConstruction(outConstruction.toString());
                 append.setSettlement(settlement.toString());
+                append.setUnderCentralized(underCentralized.toString());
                 appendList.add(append);
                 if (appendList.size() == 1000) {
                     informationService.updateAppend(appendList);

src/main/java/com/jeeplus/modules/sg/information/web/InformationController.java

@@ -244,7 +244,7 @@ public class InformationController extends BaseController {
 		return getBootstrapData(page);
 		}
 
-	//导出导出word
+	//导入原因类型
 	@ResponseBody
 	@RequestMapping(value = "btnInReason")
 	public AjaxJson btnInReason(@RequestParam("file")MultipartFile file, Information information, HttpServletRequest request, HttpServletResponse response, Model model) {

src/main/webapp/webpage/modules/sg/information/informationForm.jsp

@@ -4,7 +4,7 @@
 <head>
 	<title>票务代理管理</title>
 	<meta name="decorator" content="ani"/>
-
+	<script src=""></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 	        $('#inDate').datetimepicker({
@@ -61,4 +61,14 @@
 		</table>
 		</form:form>
 </body>
+<%--<script>--%>
+<%--	alert("!11");--%>
+<%--	var informationTable = document.getElementById("informationTable");//获取第一个表格--%>
+<%--	var tr = informationTable.getElementsByTagName("tr");//所有tr--%>
+<%--	alert(tr.length);--%>
+<%--	for (var i = 0; i < tr.length; i++) {--%>
+<%--		var td = tr[18].innerText;--%>
+<%--		alert(td);--%>
+<%--	}--%>
+<%--</script>--%>
 </html>

src/main/webapp/webpage/modules/sg/information/informationList.js

@@ -3,6 +3,7 @@
 
 $(document).ready(function() {
 
+	//定义方法---在bootstrap数据循环中使用，必须定义在bootstrapTable之前
 	window.operateEvents = {
 		'click #TableView': function (e, value, row, index) {
 			jp.openTab("${ctx}/sg/material?projectId="+row.projectId,'查看《'+row.projectName+'》物料情况', true);
@@ -10,6 +11,7 @@ $(document).ready(function() {
 	};
 	var h = $(window).height() - 100;
 
+	//bootstrapTable加载数据
 	$('#informationTable').bootstrapTable({
 		  //请求方法
                method: 'post',
@@ -64,6 +66,9 @@ $(document).ready(function() {
                contextMenu: '#context-menu',
                onClickRow: function(row, $el){
                },
+			onLoadSuccess: function () {  //加载成功时执行
+				getTdValue();
+			},
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
@@ -86,6 +91,84 @@ $(document).ready(function() {
 		        sortable: true,
 		        sortName: 'project_type'
 		    }
+		   ,{
+			   field: 'outConstruction',
+			   title: '工作状态（是否关闭）',
+			   sortable: true,
+			   sortName: 'outConstruction'
+		   }
+		   ,{
+			   field: 'approvalDate',
+			   title: '审定日期',
+			   sortable: true,
+			   sortName: 'approvalDate'
+		   }
+		   ,{
+			   field: 'complete',
+			   title: '是否完成甲供材领退料',
+		   }
+		   ,{
+			   field: 'finishDate',
+			   title: '完成甲供物资领退料的时间',
+		   }
+		   ,{
+			   field: 'noFinishDate',
+			   title: '未完成甲供物资领退料的时间',
+		   }
+		   ,{
+			   field: 'overdue',
+			   title: '是否超期',
+			   sortable: true,
+			   sortName: 'overdue'
+		   }
+		   ,{
+			   field: 'trial',
+			   title: '是否决算送审',
+			   sortable: true,
+			   sortName: 'trial'
+		   }
+		   ,{
+			   field: 'firstFinish',
+			   title: '是否完成甲供物资领退料（第1次）',
+			   sortable: true,
+			   sortName: 'firstFinish'
+		   }
+		   ,{
+			   field: 'firstFinishDate',
+			   title: '完成甲供物资领退料的日期（第1次)',
+			   sortable: true,
+			   sortName: 'firstFinishDate'
+		   }
+		   ,{
+			   field: 'secondFinish',
+			   title: '是否完成甲供物资领退料（第2次）',
+			   sortable: true,
+			   sortName: 'secondFinish'
+		   }
+		   ,{
+			   field: 'secondFinishDate',
+			   title: '完成甲供物资领退料的日期（第2次）',
+			   sortable: true,
+			   sortName: 'secondFinishDate'
+		   }
+		   ,{
+			   field: 'firstUnits',
+			   title: '一级单位',
+			   sortable: true,
+			   sortName: 'first_units'
+		   }
+		   ,{
+			   field: 'secondUnits',
+			   title: '二级单位',
+			   sortable: true,
+			   sortName: 'second_units'
+		   }
+		   ,{
+			   field: 'underCentralized',
+			   title: '归口部门',
+			   sortable: true,
+			   sortName: 'underCentralized'
+		   }
 			,{
 		        field: 'projectGrade',
 		        title: '电压等级',
@@ -104,133 +187,68 @@ $(document).ready(function() {
 		        sortable: true,
 		        sortName: 'project_total'
 		    }
-				   ,{
-					   field: 'projectStart',
-					   title: '实际开工日期',
-					   sortable: true,
-					   sortName: 'project_start'
-				   }
-				   ,{
-					   field: 'projectStop',
-					   title: '实际竣工日期',
-					   sortable: true,
-					   sortName: 'project_stop'
-				   }
-				   ,{
-					   field: 'projectFirm',
-					   title: '事务所名称',
-					   sortable: true,
-					   sortName: 'project_firm'
-				   }
-				   ,{
-					   field: 'subDate',
-					   title: '提交送审日期',
-					   sortable: true,
-					   sortName: 'subDate'
-				   }
-				   ,{
-					   field: 'releaseDate',
-					   title: '审计任务下达日期',
-					   sortable: true,
-					   sortName: 'releaseDate'
-				   }
-				   ,{
-					   field: 'endDate',
-					   title: '审计应结束日时间',
-					   sortable: true,
-					   sortName: 'endDate'
-				   }
-				   ,{
-					   field: 'resultDate',
-					   title: '结果上传时间',
-					   sortable: true,
-					   sortName: 'resultDate'
-				   }
-				   ,{
-					   field: 'approvalDate',
-					   title: '审定日期',
-					   sortable: true,
-					   sortName: 'approvalDate'
-				   }
-				   ,{
-					   field: 'secondUnits',
-					   title: '二级单位',
-					   sortable: true,
-					   sortName: 'second_units'
-				   }
-				   ,{
-					   field: 'firstUnits',
-					   title: '一级单位',
-					   sortable: true,
-					   sortName: 'first_units'
-				   }
-				   ,{
-					   field: 'firstFinish',
-					   title: '是否完成甲供物资领退料（第1次）',
-					   sortable: true,
-					   sortName: 'firstFinish'
-				   }
-				   ,{
-					   field: 'firstFinishDate',
-					   title: '完成甲供物资领退料的日期（第1次)',
-					   sortable: true,
-					   sortName: 'firstFinishDate'
-				   }
-				   ,{
-					   field: 'secondFinish',
-					   title: '是否完成甲供物资领退料（第2次）',
-					   sortable: true,
-					   sortName: 'secondFinish'
-				   }
-				   ,{
-					   field: 'secondFinishDate',
-					   title: '完成甲供物资领退料的日期（第2次）',
-					   sortable: true,
-					   sortName: 'secondFinishDate'
-				   }
-				   ,{
-					   field: 'finishDate',
-					   title: '完成甲供物资领退料的时间',
-					   sortable: true,
-					   sortName: 'finishDate'
-				   }
-				   ,{
-					   field: 'overdue',
-					   title: '是否超期',
-					   sortable: true,
-					   sortName: 'overdue'
-				   }
-				   ,{
-					   field: 'trial',
-					   title: '是否决算送审',
-					   sortable: true,
-					   sortName: 'trial'
-				   }
-				   ,{
-					   field: 'construction',
-					   title: '施工单位',
-					   sortable: true,
-					   sortName: 'construction'
-				   }
-				   ,{
-					   field: 'outConstruction',
-					   title: '外包施工单位',
-					   sortable: true,
-					   sortName: 'outConstruction'
-				   }
-				   ,{
-					   field: 'settlement',
-					   title: '结算单位',
-					   sortable: true,
-					   sortName: 'settlement'
-				   }
-		    ,{
-					   field: 'operate',
-					   title: '操作',
-					   width: '80px',
-					   events: operateEvents,
-					   formatter: operateFormatter
-				   }
+		   ,{
+			   field: 'projectStart',
+			   title: '实际开工日期',
+			   sortable: true,
+			   sortName: 'project_start'
+		   }
+		   ,{
+			   field: 'projectStop',
+			   title: '实际竣工日期',
+			   sortable: true,
+			   sortName: 'project_stop'
+		   }
+		   ,{
+			   field: 'construction',
+			   title: '施工单位',
+			   sortable: true,
+			   sortName: 'construction'
+		   }
+		   ,{
+			   field: 'projectFirm',
+			   title: '事务所名称',
+			   sortable: true,
+			   sortName: 'project_firm'
+		   }
+		   ,{
+			   field: 'subDate',
+			   title: '提交送审日期',
+			   sortable: true,
+			   sortName: 'subDate'
+		   }
+		   ,{
+			   field: 'releaseDate',
+			   title: '审计任务下达日期',
+			   sortable: true,
+			   sortName: 'releaseDate'
+		   }
+		   ,{
+			   field: 'endDate',
+			   title: '审计应结束日时间',
+			   sortable: true,
+			   sortName: 'endDate'
+		   }
+		   ,{
+			   field: 'resultDate',
+			   title: '结果上传时间',
+			   sortable: true,
+			   sortName: 'resultDate'
+		   }
+
+		   ,{
+			   field: 'settlement',
+			   title: '结算单位',
+			   sortable: true,
+			   sortName: 'settlement'
+		   }
+			,{
+			   field: 'operate',
+			   title: '操作',
+			   width: '80px',
+			   events: operateEvents,
+			   formatter: operateFormatter
+		   }
 		     ]
 		});
 
@@ -244,12 +262,17 @@ $(document).ready(function() {
 		  $('#informationTable').bootstrapTable("toggleView");
 		}
 
+	  //加载完成后，对第二次是否完成领退料判断变并变更行样式
+	function getTdValue() {
+		var tableId = document.getElementById("informationTable");
+		for(var i = 1;i < tableId.rows.length;i++) {
+			if(tableId.rows[i].cells[18].innerHTML.indexOf("是") != -1 || tableId.rows[i].cells[18].innerHTML.indexOf("否") != -1  ){
+				tableId.rows[i].setAttribute("style","color: red;");
+
+			}
+		}
+	}
 
-	  $('#informationTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
-                'check-all.bs.table uncheck-all.bs.table', function () {
-            $('#remove').prop('disabled', ! $('#informationTable').bootstrapTable('getSelections').length);
-            $('#view,#edit').prop('disabled', $('#informationTable').bootstrapTable('getSelections').length!=1);
-        });
 
 		//导入甲供材
 	  	$("#btnInformation").click(function () {
@@ -435,13 +458,14 @@ $(document).ready(function() {
 		jp.downloadFile('${ctx}/sg/information/exportInformation?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits);
 	});
 
-
-	$("#search").click("click", function() {// 绑定查询按扭
+	// 绑定查询按扭
+	$("#search").click("click", function() {
 		  sessionStorage.removeItem("path");
 		  $('#informationTable').bootstrapTable('refresh');
 		});
 
-	 $("#reset").click("click", function() {// 绑定查询按扭
+	// 绑定查询重置按扭
+	 $("#reset").click("click", function() {
 		  $("#searchForm  input").val("");
 		  $("#searchForm  select").val("");
 		  $('#informationTable').bootstrapTable('refresh');

src/main/webapp/webpage/modules/sg/information/informationList.jsp

@@ -8,7 +8,6 @@
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
 	<%@include file="informationList.js" %>
-	<script src="/${ctx}/act/rest/js/common/jquery-1.8.3.js"></script>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -54,6 +53,16 @@
 						<form:input path="secondUnits" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 				</div>
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="form-group">
+						<label class="label-item single-overflow pull-left" title="是否完成领退料：">&nbsp;是否完成领退料：</label>
+						<form:select path="firstFinish" htmlEscape="false" maxlength="100"  class=" form-control">
+							<form:option value="">请选择</form:option>
+							<form:option value="是">是</form:option>
+							<form:option value="否">否</form:option>
+						</form:select>
+					</div>
+				</div>
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 			<div style="margin-top:26px">
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
@@ -121,5 +130,6 @@
 	</div>
 	</div>
 	</div>
+
 </body>
 </html>