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 | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 insertions(+), 4 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 00c023c..1733ed7 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -27,15 +27,25 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
+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;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2021-07-12
@@ -47,6 +57,8 @@
public class RecordkController extends BladeController {
private final IRecordkService recordkService;
+ private final IInformationService informationService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -66,6 +78,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入recordk")
public R<IPage<Recordk>> list(Recordk recordk, Query query) {
+ recordk.setStorage("1");
IPage<Recordk> pages = recordkService.page(Condition.getPage(query), Condition.getQueryWrapper(recordk));
return R.data(pages);
}
@@ -77,7 +90,8 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入recordk")
public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
- IPage<RecordkVO> pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk);
+ IPage<RecordkVO> pages;
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk, recordk.getJurisdiction());
return R.data(pages);
}
@@ -88,7 +102,73 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入recordk")
public R save(@Valid @RequestBody Recordk recordk) {
- return R.status(recordkService.save(recordk));
+ String cardid = recordk.getCardid();
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid, ptype);
+ if (map != null) {
+ String id = map.get("id").toString();
+ recordkService.removeByIds(Func.toLongList(id));
+ }
+ recordk.setStorage("1");
+ recordk.setType("2");
+ recordk.setPermitime(new Date());
+ recordkService.save(recordk);
+ String s = "insert into sys_recordk(id,creditCode,enterpriseName,representative," +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,cardid,overtime," +
+ "jurisdiction," +
+ "ksecuritys," +
+ "kproject," +
+ "kzipcode," +
+ "kservicetime," +
+ "kaddress" +
+ ")" +
+ "values(" + "'" + recordk.getId() + "'" + "," + "'" +
+ recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
+ + recordk.getRepresentative() + "'" + "," + "'" +
+ recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
+ recordk.getRegion() + "'" + "," + "'" + recordk.getRegistration() + "'" + "," + "'" +
+ recordk.getIndustry() + "'" + "," + "'" + recordk.getType() + "'" + "," + "'" +
+ recordk.getDeptid() + "'" + "," + "'" + recordk.getPtype() + "'" + "," +
+ "'" + recordk.getRepresentativecell() + "'" + "," + "'" + recordk.getContacts() + "'" + "," + "'" +
+ recordk.getContactscell() + "'" + "," +
+ "'" + recordk.getCardid() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(recordk.getOvertime()) + "'" + "," +
+ "'" + recordk.getJurisdiction() + "'" + "," +
+ "'" + recordk.getKsecuritys() + "'" + "," +
+ "'" + recordk.getKproject() + "'" + "," +
+ "'" + recordk.getKzipcode() + "'" + "," +
+ "'" + recordk.getKservicetime() + "'" + "," +
+ "'" + recordk.getKaddress() + "'" +
+ ")";
+// System.out.println(s);
+// System.out.println(recordk.getKsecuritys());
+// System.out.println(recordk.getKproject());
+// System.out.println(recordk.getKzipcode());
+// System.out.println(recordk.getKservicetime());
+// System.out.println(recordk.getKaddress());
+// System.out.println(recordk);
+// FtpUtil.sqlFileUpload(s);
+ return R.success("成功");
+ }
+
+ /**
+ * 暂存
+ */
+ @PostMapping("/recorkstorage")
+ @ApiOperation(value = "新增", notes = "传入permit")
+ public R recorkstorage(@Valid @RequestBody Recordk recordk) {
+ String cardid = recordk.getCardid();
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid, ptype);
+ if (map != null) {
+ recordk.setStorage("0");
+ recordkService.updateById(recordk);
+ } else {
+ recordk.setStorage("0");
+ recordk.setPermitime(new Date());
+ recordkService.save(recordk);
+ }
+ return R.success("暂存成功");
}
/**
@@ -98,7 +178,12 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入recordk")
public R update(@Valid @RequestBody Recordk recordk) {
- return R.status(recordkService.updateById(recordk));
+ boolean b = recordkService.updateById(recordk);
+ String s1 = "update sys_recordk set type = " + "'" + 0 + "'" + ",approve = " + "'" + recordk.getApprove() + "'" +
+ " " + "where id = " + "'" + recordk.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ return R.status(b);
}
/**
@@ -123,4 +208,20 @@
}
+ @PostMapping("/selectIn")
+ public R selectIn(String cardid, String type) {
+ Map map = recordkService.selectIn(cardid, type);
+ 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