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/revoke/controller/RevokeController.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index 2dca31c..86a0d1e 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -28,9 +28,12 @@
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.vo.PermitVO;
import org.springblade.modules.revoke.entity.Revoke;
import org.springblade.modules.revoke.service.IRevokeService;
import org.springblade.modules.revoke.vo.RevokeVO;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -51,6 +54,8 @@
public class RevokeController extends BladeController {
private final IRevokeService revokeService;
+ private final IInformationService informationService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -70,6 +75,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入revoke")
public R<IPage<Revoke>> list(Revoke revoke, Query query) {
+ revoke.setStorage("1");
IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke));
return R.data(pages);
}
@@ -81,7 +87,8 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入revoke")
public R<IPage<RevokeVO>> page(RevokeVO revoke, Query query) {
- IPage<RevokeVO> pages = revokeService.selectRevokePage(Condition.getPage(query), revoke);
+ IPage<RevokeVO> pages;
+ pages = revokeService.selectRevokePage(Condition.getPage(query), revoke, revoke.getJurisdiction());
return R.data(pages);
}
@@ -93,33 +100,31 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R save(@Valid @RequestBody Revoke revoke) {
String cardid = revoke.getCardid();
- Map map = revokeService.selectIn(cardid);
+ String type = revoke.getPtype();
+ Map map = revokeService.selectIn(cardid, type);
if (map != null) {
String id = map.get("id").toString();
revokeService.removeByIds(Func.toLongList(id));
}
revoke.setStorage("1");
revoke.setType("2");
- revoke.setPtype("6");
revoke.setPermitime(new Date());
- revokeService.save(revoke);
- String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getEstablishtime());
- String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getPermitime());
- String s = "insert into sys_revoke(id,creditCode,enterpriseName,representative,establishTime," +
- "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,reason,jurisdiction)" +
- "values(" + "'" + revoke.getId() + "'" + "," + "'" + revoke.getCreditcode() + "'" + "," + "'" + revoke.getEnterprisename() + "'" + "," + "'"
- + revoke.getRepresentative() + "'" + "," +
- "'" + formatStr + "'" + "," + "'" + revoke.getRegisteredcapital() + "'" + "," + "'"
- + revoke.getOrganizationcode() + "'" + "," + "'" + revoke.getRegistrationnumber() + "'" + "," +
- "'" + revoke.getIdentificationnumber() + "'" + "," + "'" + revoke.getEnterprises() + "'" + "," + "'" +
- revoke.getAddress() + "'" + "," + "'" + revoke.getBusiness() + "'" + "," + "'" +
- revoke.getRegion() + "'" + "," + "'" + revoke.getRegistration() + "'" + "," + "'" + revoke.getIndustry() + "'" + "," + "'"
- + revoke.getType() + "'" + "," +
- "'" + pertime + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
- "'" + revoke.getRepresentativecell() + "'" + "," + "'" + revoke.getContacts() + "'" + "," + "'" + revoke.getContactscell() + "'" + "," +
- "'" + revoke.getReason() + "'" + "," + "'" + revoke.getJurisdiction() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ boolean save = revokeService.save(revoke);
+ if (save) {
+ String s = "insert into sys_revoke(id,creditCode,enterpriseName,representative," +
+ "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,reason,jurisdiction,cardid)" +
+ "values(" + "'" + revoke.getId() + "'" + "," + "'" + revoke.getCreditcode() + "'" + "," + "'" + revoke.getEnterprisename() + "'" + "," + "'"
+ + revoke.getRepresentative() + "'" + "," + "'" + revoke.getRegisteredcapital() + "'" + "," + "'"
+ + revoke.getOrganizationcode() + "'" + "," + "'" + revoke.getRegistrationnumber() + "'" + "," +
+ "'" + revoke.getIdentificationnumber() + "'" + "," + "'" + revoke.getEnterprises() + "'" + "," + "'" +
+ revoke.getAddress() + "'" + "," + "'" + revoke.getBusiness() + "'" + "," + "'" +
+ revoke.getRegion() + "'" + "," + "'" + revoke.getRegistration() + "'" + "," + "'" + revoke.getIndustry() + "'" + "," + "'"
+ + revoke.getType() + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
+ "'" + revoke.getRepresentativecell() + "'" + "," + "'" + revoke.getContacts() + "'" + "," + "'" + revoke.getContactscell() + "'" + "," +
+ "'" + revoke.getReason() + "'" + "," + "'" + revoke.getJurisdiction() + "'" + "," + "'" + revoke.getCardid() + "'" + ")";
+ myAsyncService.dataSync(s);
+ }
return R.success("成功");
}
@@ -131,14 +136,14 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R revokesave(@Valid @RequestBody Revoke revoke) {
String cardid = revoke.getCardid();
- Map map = revokeService.selectIn(cardid);
+ String type = revoke.getPtype();
+ Map map = revokeService.selectIn(cardid, type);
if (map != null) {
revoke.setStorage("0");
revokeService.updateById(revoke);
} else {
revoke.setStorage("0");
revoke.setType("2");
- revoke.setPtype("6");
revoke.setPermitime(new Date());
revokeService.save(revoke);
}
@@ -177,8 +182,8 @@
}
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = revokeService.selectIn(cardid);
+ public R selectIn(String cardid, String type) {
+ Map map = revokeService.selectIn(cardid, type);
return R.data(map);
}
--
Gitblit v1.9.3