Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -336,7 +336,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.times = times;
 	}
 
-	@ExcelField(title="合同金额(元）", align=2, sort=6)
+	@ExcelField(title="合同金额(元）", align=2, sort=11)
 	public String getContractPrice() {
 		return contractPrice;
 	}
@@ -382,7 +382,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="签订日期", align=2, sort=10)
+	@ExcelField(title="签订日期", align=2, sort=6)
 	public Date getContractDate() {
 		return contractDate;
 	}
@@ -454,7 +454,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.contractSpecial = contractSpecial;
 	}
 
-	@ExcelField(title="合同状态", dictType="audit_state", align=2, sort=14)
+	@ExcelField(title="合同状态", dictType="audit_state", align=2, sort=13)
 	public String getContractState() {
 		return contractState;
 	}
@@ -591,7 +591,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.companyId = companyId;
 	}
 
-	@ExcelField(title="合同类型", mainDictType="contract_info_type", align=2, sort=7)
+	@ExcelField(title="合同类型", mainDictType="contract_info_type", align=2, sort=5)
 	public String getContractTypeDoc() {
 		return contractTypeDoc;
 	}
@@ -876,7 +876,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.signatureStatus = signatureStatus;
 	}
 
-	@ExcelField(title="归档状态", dictType="archive_state", align=2, sort=15)
+	@ExcelField(title="归档状态", dictType="archive_state", align=2, sort=14)
 	public String getContrractRecordStatus() {
 		return contrractRecordStatus;
 	}
@@ -893,7 +893,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.contrractRecordId = contrractRecordId;
 	}
 
-	@ExcelField(title="案卷号", align=2, sort=4)
+	@ExcelField(title="案卷号", align=2, sort=15)
 	public String getRecordNum() {
 		return recordNum;
 	}
@@ -950,7 +950,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.flagAdmin = flagAdmin;
 	}
 
-	@ExcelField(title="客户名称", align=2, sort=5)
+	@ExcelField(title="客户名称", align=2, sort=4)
 	public String getClientName() {
 		return clientName;
 	}
@@ -959,7 +959,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.clientName = clientName;
 	}
 
-	@ExcelField(title="创建人", align=2, sort=8)
+	@ExcelField(title="创建人", align=2, sort=7)
 	public String getCreateUser() {
 		return createUser;
 	}
@@ -976,7 +976,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.chargeCriterionList = chargeCriterionList;
 	}
 
-	@ExcelField(title="收费标准", align=2, sort=13)
+	@ExcelField(title="收费标准", align=2, sort=12)
 	public String getOtherDetails() {
 		return otherDetails;
 	}
@@ -1066,7 +1066,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.contractInformation = contractInformation;
 	}
 
-	@ExcelField(title="合同金额类别", align=2, sort=12)
+	@ExcelField(title="合同金额类别", align=2, sort=10)
 	public String getContractInformationStr() {
 		return contractInformationStr;
 	}
@@ -1109,7 +1109,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 
 	@Override
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="登记日期", align=2, sort=11)
+	@ExcelField(title="登记日期", align=2, sort=9)
 	public Date getCreateDate() {
 		return super.getCreateDate();
 	}
@@ -1119,7 +1119,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		super.setCreateDate(createDate);
 	}
 
-	@ExcelField(title="创建人部门", align=2, sort=9)
+	@ExcelField(title="创建人部门", align=2, sort=8)
 	public String getCreateUserOfficeName() {
 		return createUserOfficeName;
 	}

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1329,12 +1329,12 @@ public class WorkContractInfoController extends BaseController {
     @RequestMapping(value = "export", method = RequestMethod.POST)
     public String exportFile(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
         try {
-            String fileName = "合同管理" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+            String fileName = "合同一览表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
             User user = UserUtils.getUser();
             workContractInfo.setCurrentUser(user);
             Page<WorkContractInfo> page = workContractInfoService.findPage(new Page<WorkContractInfo>(request, response, -1), workContractInfo);
             //new ExportExcel(true,"合同管理", WorkContractInfo.class,1).setDataList(page.getList()).write(response, fileName,request.getHeader("USER-AGENT")).dispose();
-            new ExportExcel("合同管理", WorkContractInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
+            new ExportExcel("合同一览表", WorkContractInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             logger.error("Exception e:"+e);