|
|
@@ -829,11 +829,11 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
|
|
|
- public Result exportComposite(String contractId,
|
|
|
+ public Result exportComposite(@RequestParam(name = "contractId", required = false) String contractId,
|
|
|
@RequestParam(name = "serialNumber", required = false) String serialNumber, String patentNumber,
|
|
|
- String office, Integer locationProvince, String unitName, String uid,
|
|
|
- @RequestParam(name = "patentCatagory", required = false) String patentCatagory, String patentName,
|
|
|
- @RequestParam(name = "patentState", required = false) String patentState,
|
|
|
+ String office, @RequestParam(name = "locationProvince", required = false) Integer locationProvince,
|
|
|
+ String unitName, String uid, @RequestParam(name = "patentCatagory", required = false) String patentCatagory,
|
|
|
+ String patentName, @RequestParam(name = "patentState", required = false) String patentState,
|
|
|
@RequestParam(name = "createTime[]", required = false) String[] createTime,
|
|
|
@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
|
|
|
String author, HttpServletResponse response) throws ParseException {
|
|
|
@@ -1017,8 +1017,8 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
|
|
|
private void exportComosites(HttpServletResponse response, List<PatentManageListBo> composites) {
|
|
|
String sheetName = "专利综合管理报表";
|
|
|
- HSSFWorkbook workbook = createWorkbook(sheetName,
|
|
|
- new String[] { "编号", "申请号/专利号", "事务所", "省份", "公司名称", "专利名称", "专利状态", "派单日", "申请日", "授权日", "资料撰写人" });
|
|
|
+ HSSFWorkbook workbook = createWorkbook(sheetName, new String[] { "编号", "申请号/专利号", "合同编号", "事务所", "省份", "公司名称",
|
|
|
+ "专利名称", "专利状态", "派单日", "申请日", "授权日", "资料撰写人" });
|
|
|
HSSFSheet sheet = workbook.getSheet(sheetName);
|
|
|
|
|
|
// 将查询出的数据设置到sheet对应的单元格中
|
|
|
@@ -1028,16 +1028,17 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
|
|
|
row.createCell(0).setCellValue(null == obj.getSerialNumber() ? "" : obj.getSerialNumber().toString());
|
|
|
row.createCell(1).setCellValue(obj.getPatentNumber());
|
|
|
- row.createCell(2).setCellValue(obj.getOffice());
|
|
|
+ row.createCell(2).setCellValue(obj.getContractNumber());
|
|
|
+ row.createCell(3).setCellValue(obj.getOffice());
|
|
|
Integer locationProvince = obj.getLocationProvince();
|
|
|
- row.createCell(3).setCellValue(null == locationProvince ? "" : getProvince(districtMap, locationProvince));
|
|
|
- row.createCell(4).setCellValue(obj.getUnitName());
|
|
|
- row.createCell(5).setCellValue(obj.getPatentName());
|
|
|
- row.createCell(6).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
|
|
|
- row.createCell(7).setCellValue(obj.getCreateTimeFormattedDate());
|
|
|
- row.createCell(8).setCellValue(obj.getPatentApplicationFormattedDate());
|
|
|
+ row.createCell(4).setCellValue(null == locationProvince ? "" : getProvince(districtMap, locationProvince));
|
|
|
+ row.createCell(5).setCellValue(obj.getUnitName());
|
|
|
+ row.createCell(6).setCellValue(obj.getPatentName());
|
|
|
+ row.createCell(7).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
|
|
|
+ row.createCell(8).setCellValue(obj.getCreateTimeFormattedDate());
|
|
|
row.createCell(9).setCellValue(obj.getPatentApplicationFormattedDate());
|
|
|
- row.createCell(10).setCellValue(obj.getAuthor());
|
|
|
+ row.createCell(10).setCellValue(obj.getPatentApplicationFormattedDate());
|
|
|
+ row.createCell(11).setCellValue(obj.getAuthor());
|
|
|
}
|
|
|
FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
|