From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index e1aa2db..1733ed7 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -31,9 +31,12 @@
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.record.dto.RecordDTO;
+import org.springblade.modules.recordk.dto.RecordkDTO;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.service.IRecordkService;
import org.springblade.modules.recordk.vo.RecordkVO;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -55,6 +58,7 @@
private final IRecordkService recordkService;
private final IInformationService informationService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -88,20 +92,6 @@
public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
IPage<RecordkVO> pages;
pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk, recordk.getJurisdiction());
-// if (recordk.getUsetype().equals("0")) {
-// pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
-// } else if (recordk.getUsetype().equals("1")) {
-// String childer = informationService.selJurchilder(recordk.getJurisdiction());
-// String[] split = childer.split(",");
-// String strArrays = "";
-// for (int j = 0; j < split.length; j++) {
-// strArrays += "'" + split[j] + "',";
-// }
-// String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
-// pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,jurisdiction);
-// } else {
-// pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
-// }
return R.data(pages);
}
@@ -123,8 +113,6 @@
recordk.setType("2");
recordk.setPermitime(new Date());
recordkService.save(recordk);
- //String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getOfficetime());
- //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getPermitime());
String s = "insert into sys_recordk(id,creditCode,enterpriseName,representative," +
"address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,cardid,overtime," +
"jurisdiction," +
@@ -193,7 +181,8 @@
boolean b = recordkService.updateById(recordk);
String s1 = "update sys_recordk set type = " + "'" + 0 + "'" + ",approve = " + "'" + recordk.getApprove() + "'" +
" " + "where id = " + "'" + recordk.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
return R.status(b);
}
@@ -225,4 +214,14 @@
return R.data(map);
}
+ /**
+ * 保安公司项目备案信息(基本信息和附件列表信息)
+ * @param record
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(RecordkDTO record) {
+ RecordkDTO detail = recordkService.getDetails(record);
+ return R.data(detail);
+ }
}
--
Gitblit v1.9.3