项目、上报、归档数据导出功能修改

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

@@ -1732,7 +1732,7 @@ public class DownloadProjectRecords extends ActEntity<DownloadProjectRecords> {
 		this.createByOffice = createByOffice;
 	}
 
-	@ExcelField(title="责任人部门", align=2, sort=10)
+	//@ExcelField(title="责任人部门", align=2, sort=10)
 	public String getProjectMasterOffice() {
 		return projectMasterOffice;
 	}

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

@@ -1732,7 +1732,7 @@ public class DownloadProjectReporteds extends ActEntity<DownloadProjectReporteds
 		this.createByOffice = createByOffice;
 	}
 
-	@ExcelField(title="责任人部门", align=2, sort=10)
+	//@ExcelField(title="责任人部门", align=2, sort=10)
 	public String getProjectMasterOffice() {
 		return projectMasterOffice;
 	}

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

@@ -251,6 +251,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer projectRecordExceedStatus; //归档状态(超期、归档导出使用)
 	private Integer projectRecordDispenseStatus; //无需上报状态(超期、归档导出使用)
 	private Integer recordState; //是否超期归档状态
+	private String completionStatus; //完成状态
 
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
@@ -323,7 +324,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.projectReportStatus = projectReportStatus;
 	}
 
-	@ExcelField(title="报告号", align=2, sort=1)
+	@ExcelField(title="报告号", align=2, sort=2)
 	public String getProjectReportNumber() {
 		return projectReportNumber;
 	}
@@ -356,7 +357,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.workContractInfo = contract;
 	}
 
-	//@ExcelField(title="项目编号", align=2, sort=1)
+	@ExcelField(title="项目编号", align=2, sort=1)
 	public String getProjectId() {
 		return projectId;
 	}
@@ -365,7 +366,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.projectId = projectId;
 	}
 
-	@ExcelField(title="项目名称", align=2, sort=2)
+	@ExcelField(title="项目名称", align=2, sort=3)
 	public String getProjectName() {
 		return projectName;
 	}
@@ -589,7 +590,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setUserId(String userId) {
 		this.userId = userId;
 	}
-	@ExcelField(title="合同名称", align=2, sort=4)
+	@ExcelField(title="合同名称", align=2, sort=5)
 	public String getContractName() {
 		if (workContractInfo!=null) {
 			return workContractInfo.getName();
@@ -597,7 +598,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 			return "";
 		}
 	}
-	@ExcelField(title="合同编号", align=2, sort=3)
+	@ExcelField(title="合同编号", align=2, sort=4)
 	public String getContractNumber() {
 		if (workContractInfo!=null) {
 			return workContractInfo.getContractNum();
@@ -1750,7 +1751,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.createByOffice = createByOffice;
 	}
 
-	@ExcelField(title="责任人部门", align=2, sort=10)
+	//@ExcelField(title="责任人部门", align=2, sort=10)
 	public String getProjectMasterOffice() {
 		return projectMasterOffice;
 	}
@@ -1769,7 +1770,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="质量复核日期", align=2, sort=19)
+	//@ExcelField(title="质量复核日期", align=2, sort=19)
 	public Date getReportAuditDate() {
 		return reportAuditDate;
 	}
@@ -1779,7 +1780,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="报告签发日期", align=2, sort=20)
+	//@ExcelField(title="报告签发日期", align=2, sort=20)
 	public Date getReportTwoAuditDate() {
 		return reportTwoAuditDate;
 	}
@@ -1788,7 +1789,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.reportTwoAuditDate = reportTwoAuditDate;
 	}
 
-	@ExcelField(title="项目规模", align=2, sort=11)
+	@ExcelField(title="项目规模", align=2, sort=10)
 	public String getProjectScale() {
 		return projectScale;
 	}
@@ -1828,4 +1829,13 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setRecordState(Integer recordState) {
 		this.recordState = recordState;
 	}
+
+	@ExcelField(title="完成状态", align=2, sort=19)
+	public String getCompletionStatus() {
+		return completionStatus;
+	}
+
+	public void setCompletionStatus(String completionStatus) {
+		this.completionStatus = completionStatus;
+	}
 }

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

@@ -1537,6 +1537,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
             }
 
             ruralProjectMessageS.disposeProjectRecords(records,reported);
+            //将质量复核的咨询收入添加到上报中
+            reported.setZiXunShouRu(projectReportData.getZiXunShouRu());
         }
         //根据上报id查询上报咨询员的信息
         List<RuralReportConsultant> reportedConsultants=ruralProjectMessageS.getReportedConsultantsList(reported.getId());

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

@@ -41,6 +41,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -510,9 +511,15 @@ public class RuralProjectMessageAllController extends BaseController {
     @RequestMapping(value = "recordDownload", method= RequestMethod.POST)
     public String recordDownload(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
         try {
-            String fileName = "项目"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            String fileName = "归档项目"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<DownloadProjectRecords> page = ruralProjectMessageAllService.findPageRecordDownload(new Page<DownloadProjectRecords>(request, response, -1), projectRecords);
-            new ExportExcel("项目", DownloadProjectRecords.class).setDataList(page.getList()).write(response, fileName).dispose();
+            if(null != projectRecords.getBeginDate() && null != projectRecords.getEndDate()){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                new ExportExcel(sdf.format(projectRecords.getBeginDate()) + " 至 " + sdf.format(projectRecords.getEndDate()) + "归档一览表", DownloadProjectRecords.class).setDataList(page.getList()).write(response, fileName).dispose();
+            }else{
+                new ExportExcel("归档一览表", DownloadProjectRecords.class).setDataList(page.getList()).write(response, fileName).dispose();
+            }
+
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出项目记录失败！失败信息："+e.getMessage());
@@ -538,9 +545,15 @@ public class RuralProjectMessageAllController extends BaseController {
     @RequestMapping(value = "reportedDownload", method= RequestMethod.POST)
     public String reportedDownload(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
         try {
-            String fileName = "项目"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            String fileName = "上报项目"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<DownloadProjectReporteds> page = ruralProjectMessageAllService.findPageReportedDownload(new Page<DownloadProjectReporteds>(request, response, -1), projectRecords);
-            new ExportExcel("项目", DownloadProjectReporteds.class).setDataList(page.getList()).write(response, fileName).dispose();
+            if(null != projectRecords.getBeginDate() && null != projectRecords.getEndDate()){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                new ExportExcel(sdf.format(projectRecords.getBeginDate()) + " 至 " + sdf.format(projectRecords.getEndDate()) + "上报一览表", DownloadProjectReporteds.class).setDataList(page.getList()).write(response, fileName).dispose();
+            }else{
+                new ExportExcel("上报一览表", DownloadProjectReporteds.class).setDataList(page.getList()).write(response, fileName).dispose();
+            }
+
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出项目记录失败！失败信息："+e.getMessage());
@@ -565,7 +578,7 @@ public class RuralProjectMessageAllController extends BaseController {
             projectRecords.setTypeList(typeList);
             String fileName = "项目"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<RuralProjectRecords> page = ruralProjectMessageAllService.findPageByExport(new Page<RuralProjectRecords>(request, response, -1), projectRecords);
-            new ExportExcel("项目", RuralProjectRecords.class).setDataList(page.getList()).write(response, fileName).dispose();
+            new ExportExcel("项目一览表", RuralProjectRecords.class).setDataList(page.getList()).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出项目记录失败！失败信息："+e.getMessage());

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

@@ -103,12 +103,13 @@
 		,sub.name as "projectMasterName"
 		,sob.name as "projectMasterOffice"
 		,a.submit_money as "submitMoney"
-		,(CASE
+		/*,(CASE
 		WHEN a.submit_money = '1' THEN
 		 (CASE WHEN emergency_project ='1' THEN 'B级紧急' ELSE 'B级非紧急' END)
 		WHEN a.submit_money = '2' THEN
 	'A级' ELSE ''
-END) as projectScale
+END) as projectScale*/
+		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
 		,a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
@@ -210,6 +211,12 @@ END) as projectScale
 		,a.record_state as "recordState"
 		,a.submit_money as "submitMoney"
 		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
+		,(case
+		when a.submit_money = '1' and prd.status = '5' then
+		'已完成'
+		when a.submit_money = '2' and prdt.status = '5' then
+		'已完成' else '未完成'
+		end) as completionStatus
 		,a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
 		wci.contract_num as "workContractInfo.contractNum",

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/downloadRecordForm.jsp

@@ -24,6 +24,16 @@
 					return;
 				}
 			}
+			if((beginDateTime != null && beginDateTime != undefined && beginDateTime != '')
+					&&(endDateTime == null || endDateTime == undefined || endDateTime == '')){
+				parent.layer.msg("请选择创建结束时间!", {icon: 5});
+				return;
+			}
+			if((endDateTime != null && endDateTime != undefined && endDateTime != '')
+					&&(beginDateTime == null || beginDateTime == undefined || beginDateTime == '')){
+				parent.layer.msg("请选择创建开始时间!", {icon: 5});
+				return;
+			}
 
 		   var recordTypeStr=$("#recordTypeStr").val();
 		   if(recordTypeStr==null||recordTypeStr==""){
@@ -110,6 +120,28 @@
 					xmSelect.render({
 						el: '#recordType',
 						language: 'zn',
+						toolbar:{
+							show: true,
+						},
+						autoRow: true,
+						on: function(data){
+							//arr:  当前多选已选中的数据
+							var arr = data.arr;
+							console.log(arr)
+							//change, 此次选择变化的数据,数组
+							var change = data.change;
+							//isAdd, 此次操作是新增还是删除
+							var isAdd = data.isAdd;
+
+							console.log('已有: '+arr.length+' 变化: '+change.length+', 状态: ' + isAdd)
+
+							var list = [];
+							//遍历当前选择的数据
+							for (var i in arr){
+								list.push(arr[i].value);
+							}
+							$("#recordTypeStr").val(list);
+						},
 						data:data
 					})
 				}
@@ -119,13 +151,17 @@
 
 	var recordType = xmSelect.render({
 		el: '#recordType',
+		toolbar:{
+			show: true,
+		},
+		autoRow: true,
 		language: 'zn',
 		data: [
 		]
 	})
 
 
-	document.getElementById('recordType').onblur=function(){
+	/*document.getElementById('recordType').onblur=function(){
 		var list = [];
 		//获取当前多选选中的值
 		var selectArr = recordType.getValue();
@@ -133,7 +169,7 @@
 			list.push(selectArr[i].value);
 		}
 		$("#recordTypeStr").val(list);
-	}
+	}*/
 </script>
 </body>
 </html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/downloadReportedForm.jsp

@@ -24,6 +24,16 @@
 					return;
 				}
 			}
+			if((beginDateTime != null && beginDateTime != undefined && beginDateTime != '')
+					&&(endDateTime == null || endDateTime == undefined || endDateTime == '')){
+				parent.layer.msg("请选择创建结束时间!", {icon: 5});
+				return;
+			}
+			if((endDateTime != null && endDateTime != undefined && endDateTime != '')
+					&&(beginDateTime == null || beginDateTime == undefined || beginDateTime == '')){
+				parent.layer.msg("请选择创建开始时间!", {icon: 5});
+				return;
+			}
 
 		   var reportedTypeStr=$("#reportedTypeStr").val();
 		   if(reportedTypeStr==null||reportedTypeStr==""){
@@ -106,10 +116,29 @@
 			success:function(data){
 				if(data.success) {
 					var data = data.body.list;
-					$("#reportedTypeStr").val(data);
+					$("#recordType").val(data);
 					xmSelect.render({
 						el: '#recordType',
 						language: 'zn',
+						toolbar:{
+							show: true,
+						},
+						autoRow: true,
+						on: function(data){
+							//arr:  当前多选已选中的数据
+							var arr = data.arr;
+							//change, 此次选择变化的数据,数组
+							var change = data.change;
+							//isAdd, 此次操作是新增还是删除
+							var isAdd = data.isAdd;
+
+							var list = [];
+							//遍历当前选择的数据
+							for (var i in arr){
+								list.push(arr[i].value);
+							}
+							$("#reportedTypeStr").val(list);
+						},
 						data:data
 					})
 				}
@@ -120,12 +149,16 @@
 	var recordType = xmSelect.render({
 		el: '#recordType',
 		language: 'zn',
+		toolbar:{
+			show: true,
+		},
+		autoRow: true,
 		data: [
 		]
 	})
 
 
-	document.getElementById('recordType').onblur=function(){
+	/*document.getElementById('recordType').onblur=function(){
 		var list = [];
 		//获取当前多选选中的值
 		var selectArr = recordType.getValue();
@@ -133,7 +166,7 @@
 			list.push(selectArr[i].value);
 		}
 		$("#reportedTypeStr").val(list);
-	}
+	}*/
 </script>
 </body>
 </html>