From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 110 insertions(+), 5 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 cb7cae7..9e7de35 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -22,21 +22,42 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.cache.ParamCache;
+import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
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.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.punish.entity.Punish;
+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.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Map;
+
+import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2021-07-12
@@ -48,7 +69,10 @@
public class PermitController extends BladeController {
private final IPermitService permitService;
-
+ private final IDeptService iDeptService;
+ private final IInformationService informationService;
+ private final IUserService userService;
+ private final IAttachService attachService;
/**
* 详情
*/
@@ -66,8 +90,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入permit")
- public R<IPage<Permit>> list(Permit permit, Query query) {
- IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
+ public R<IPage<Permit>> list(@ApiIgnore @RequestParam Map<String, Object> permit, Query query) {
+ IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit, Permit.class));
return R.data(pages);
}
@@ -78,7 +102,21 @@
@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;
+ 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);
}
@@ -101,6 +139,73 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入permit")
public R update(@Valid @RequestBody Permit permit) {
+ //审核通过
+// if (permit.getType().equals("0")) {
+// //新增组织机构和单位信息
+// Information information =new Information();
+// information.setCreditcode(permit.getCreditcode());
+// information.setEnterprisename(permit.getEnterprisename());
+// information.setRepresentative(permit.getRepresentative());
+// information.setEstablishtime(permit.getEstablishtime());
+// information.setRegisteredcapital(permit.getRegisteredcapital());
+// information.setOrganizationcode(permit.getOrganizationcode());
+// information.setRegistrationnumber(permit.getRegistrationnumber());
+// information.setEnterprises(permit.getEnterprises());
+// information.setAddress(permit.getAddress());
+// information.setBusiness(permit.getBusiness());
+// information.setRegion(permit.getRegion());
+// information.setRegistration(permit.getRegistration());
+// information.setIndustry(permit.getIndustry());
+// information.setRepresentativecell(permit.getRepresentativecell());
+// information.setContacts(permit.getContacts());
+// information.setContactscell(permit.getContactscell());
+// Dept dept = new Dept();
+// //本市公司
+// if (permit.getPtype().equals("0")){
+// Long i = 1413470343230877697L;
+// dept.setParentId(i);
+// dept.setAncestors("0,1413470343230877697");
+// }
+// //培训公司
+// else if (permit.getPtype().equals("1")){
+// Long i = 1418458374477549569L;
+// dept.setParentId(i);
+// dept.setAncestors("0,1418458374477549569");
+// }
+// else{
+// Long i = 1420222961377357825L;
+// dept.setParentId(i);
+// dept.setAncestors("0,1420222961377357825");
+// }
+// dept.setTenantId("000000");
+// dept.setDeptName(information.getEnterprisename());
+// dept.setDeptCategory(1);
+// if (iDeptService.submit(dept)) {
+// CacheUtil.clear(SYS_CACHE);
+// // 返回懒加载树更新节点所需字段
+// Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
+// .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
+// String id = kv.get("id").toString();
+// information.setDepartmentid(id);
+// }
+// informationService.save(information);
+// //注册用户
+// User user = new User();
+// 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);
+// }
return R.status(permitService.updateById(permit));
}
--
Gitblit v1.9.3