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/record/controller/RecordController.java | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index 85ab88b..ab4bc9a 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -24,6 +24,7 @@
import lombok.AllArgsConstructor;
import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.ParamCache;
+import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
@@ -31,18 +32,23 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
+import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -70,6 +76,7 @@
private final IInformationService informationService;
private final IUserService userService;
private final IAttachService attachService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -101,7 +108,23 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入record")
public R<IPage<RecordVO>> page(RecordVO record, Query query) {
- IPage<RecordVO> pages = recordService.selectRecordPage(Condition.getPage(query), record);
+ IPage<RecordVO> pages;
+ pages = recordService.selectRecordPage(Condition.getPage(query), record, record.getJurisdiction());
+// if (record.getUsetype().equals("0")) {
+// pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
+// } else if (record.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(record.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 = recordService.selectRecordPage(Condition.getPage(query), record, jurisdiction);
+// } else {
+// pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
+// }
+
return R.data(pages);
}
@@ -114,28 +137,31 @@
public R save(@Valid @RequestBody Record record) {
String cardid = record.getCardid();
String type = record.getPtype();
- Map map = recordService.selectIn(cardid,type);
+ Map map = recordService.selectIn(cardid, type);
if (map != null) {
String id = map.get("id").toString();
recordService.removeByIds(Func.toLongList(id));
+ String s1 = "delete from sys_record where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
record.setStorage("1");
record.setType("2");
record.setPermitime(new Date());
- recordService.save(record);
- String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
- String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
- String s = "insert into sys_record(id,creditCode,enterpriseName,representative,establishtime," +
- "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid)" +
- "values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"+ record.getRepresentative() + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
- + record.getOrganizationcode() + "'" + "," + "'" + record.getRegistrationnumber() + "'" + "," +
- "'" + record.getIdentificationnumber() + "'" + "," + "'" + record.getEnterprises() + "'" + "," + "'" +
- record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" +
- record.getRegion() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getDeptid() + "'" + "," + "'" + record.getPtype() + "'" + "," +
- "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," +
- "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" + "," + "'" + record.getCardid() + "'"+ ")";
- FtpUtil.sqlFileUpload(s);
+ boolean save = recordService.save(record);
+ if (save) {
+ String s = "insert into sys_record(id,representative," +
+ "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
+ "values(" + "'" + record.getId() + "'" + "," +
+ "'" + record.getRepresentative() + "'" + "," + "'" +
+ record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
+ "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
+ "," + "'" + record.getCardid() + "'" +
+ "," + "'" + record.getStorage() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
+ + ")";
+ myAsyncService.dataSync(s);
+ }
return R.success("成功");
}
@@ -148,7 +174,7 @@
public R rocordsave(@Valid @RequestBody Record record) {
String cardid = record.getCardid();
String type = record.getPtype();
- Map map = recordService.selectIn(cardid,type);
+ Map map = recordService.selectIn(cardid, type);
if (map != null) {
record.setStorage("0");
record.setPermitime(new Date());
@@ -172,7 +198,7 @@
//审核通过
if (record.getType().equals("0")) {
//新增组织机构和单位信息
- Information information =new Information();
+ Information information = new Information();
information.setCreditcode(record.getCreditcode());
information.setEnterprisename(record.getEnterprisename());
information.setRepresentative(record.getRepresentative());
@@ -191,7 +217,7 @@
information.setContactscell(record.getContactscell());
Dept dept = new Dept();
//本市公司
- if (record.getPtype().equals("2")){
+ if (record.getPtype().equals("2")) {
Long i = 1425366663452196865L;
dept.setParentId(i);
dept.setAncestors("0,1425366663452196865");
@@ -214,24 +240,23 @@
information.setDepartmentid(id);
}
informationService.save(information);
+ Integer isDeleted = 0;
//注册用户
User user = new User();
+ user.setDeptId(information.getDepartmentid());
+ user.setTenantId("000000");
user.setAccount(record.getEnterprisename());
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
- userService.saveOrUpdate(user);
- //把附件添加单位id
- attachService.updat(information.getDepartmentid(),record.getCardid());
- String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+
- " " +"where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ user.setPassword(DigestUtil.encrypt(initPassword));
+ //user.setPassword(initPassword);
+ user.setCreateTime(new Date());
+ user.setUpdateTime(new Date());
+ user.setRoleId("1414575196264300546");
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ boolean save = userService.save(user);
}
- else {
- String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+
- " " +"where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }
- return R.status(recordService.updateById(record));
+ return R.status(recordService.saveOrUpdate(record));
}
/**
@@ -257,8 +282,20 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid,String type) {
- Map map = recordService.selectIn(cardid,type);
+ public R selectIn(String cardid, String type) {
+ Map map = recordService.selectIn(cardid, type);
return R.data(map);
}
+
+ /**
+ * 保安公司备案信息(基本信息和附件列表信息)
+ *
+ * @param record
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(RecordDTO record) {
+ RecordDTO detail = recordService.getDetails(record);
+ return R.data(detail);
+ }
}
--
Gitblit v1.9.3