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/permit/controller/PermitController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 1089877..b30ab88 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -38,6 +38,7 @@
import org.json.JSONObject;
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;
@@ -47,22 +48,29 @@
import org.springblade.core.secure.utils.AuthUtil;
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.FTP.OutJson;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.permit.dto.PermitDTO;
+import org.springblade.modules.permit.dto.PermitRecordDTO;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.record.dto.RecordDTO;
+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 sun.net.www.http.HttpClient;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.io.*;
import java.net.HttpURLConnection;
@@ -93,6 +101,7 @@
private final IInformationService informationService;
private final IUserService userService;
private final IAttachService attachService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -124,7 +133,22 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<PermitVO>> page(PermitVO permit, Query query) {
- IPage<PermitVO> pages = permitService.selectPermitPage(Condition.getPage(query), permit);
+ IPage<PermitVO> pages;
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, permit.getJurisdiction());
+// if (permit.getUsetype().equals("0")) {
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+// } else if (permit.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(permit.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 = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
+// } else {
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+// }
return R.data(pages);
}
@@ -134,7 +158,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入permit")
- public R save(@Valid @RequestBody Permit permit) throws FileNotFoundException {
+ public R save(@Valid @RequestBody Permit permit) {
String cardid = permit.getCardid();
String type = permit.getPtype();
Map map = permitService.selectIn(cardid, type);
@@ -146,23 +170,46 @@
permit.setStorage("1");
permit.setPermitime(new Date());
permitService.save(permit);
- String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
+ //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
+ String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid)" +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
+ permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
+ permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
"'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
- + permit.getType() + "'" + "," +
- "'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
+ + permit.getType() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+ permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
- "," + "'" + permit.getCardid() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ "," + "'" + permit.getCardid() + "'" + "," + "'" + overtime + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
return R.success("许可提交成功");
+ }
+
+ /**
+ * 新增
+ */
+ @PostMapping("/saves")
+ public R saves(@Valid @RequestBody Permit permit, HttpServletRequest request) {
+ String fieldNames = request.getHeader("_fieldNames");
+ String cardid = permit.getCardid();
+ String type = permit.getPtype();
+ Map map = permitService.selectIn(cardid, type);
+ if (map != null) {
+ String id = map.get("id").toString();
+ permitService.removeByIds(Func.toLongList(id));
+ }
+ permit.setType("2");
+ permit.setStorage("1");
+ permit.setPermitime(new Date());
+ boolean save = permitService.save(permit);
+ String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
+ //返回
+ return R.data(permit);
}
/**
@@ -218,19 +265,23 @@
information.setIndustry(permit.getIndustry());
information.setRepresentativecell(permit.getRepresentativecell());
information.setContacts(permit.getContacts());
+ information.setJurisdiction(permit.getJurisdiction());
information.setContactscell(permit.getContactscell());
Dept dept = new Dept();
+ boolean b = permitService.updateById(permit);
//本市公司
if (permit.getPtype().equals("0")) {
Long i = 1413470343230877697L;
dept.setParentId(i);
dept.setAncestors("0,1413470343230877697");
+ information.setStats("2");
}
//培训公司
else if (permit.getPtype().equals("1")) {
Long i = 1418458374477549569L;
dept.setParentId(i);
dept.setAncestors("0,1418458374477549569");
+ information.setStats("1");
} else {
Long i = 1420222961377357825L;
dept.setParentId(i);
@@ -248,23 +299,23 @@
information.setDepartmentid(id);
}
informationService.save(information);
+ Integer isDeleted = 0;
//注册用户
User user = new User();
+ user.setDeptId(information.getDepartmentid());
+ user.setTenantId("000000");
user.setAccount(permit.getEnterprisename());
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
- userService.saveOrUpdate(user);
- //把附件添加单位id
- attachService.updat(information.getDepartmentid(), permit.getCardid());
- String s1 = "update sys_permit set type = " + "'" + 0 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
- " " + "where id = " + "'" + permit.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- } else {
- String s1 = "update sys_permit set type = " + "'" + 1 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
- " " + "where id = " + "'" + permit.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);
}
- return R.status(permitService.updateById(permit));
+ return R.success("成功");
}
/**
@@ -287,4 +338,29 @@
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(permitService.removeByIds(Func.toLongList(ids)));
}
+
+ /**
+ * 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
+ *
+ * @param record
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(PermitDTO record) {
+ PermitDTO detail = permitService.getDetails(record);
+ return R.data(detail);
+ }
+
+ /**
+ * 许可备案集合信息
+ *
+ * @param record
+ * @return
+ */
+ @GetMapping("/permitRecordList")
+ public R permitRecordList(PermitDTO record) {
+ List<PermitRecordDTO> permitRecordList = permitService.permitRecordList(record);
+ //返回
+ return R.data(permitRecordList);
+ }
}
--
Gitblit v1.9.3