From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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..550d722 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -27,12 +27,17 @@
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.permit.entity.Permit;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.service.IRecordkService;
import org.springblade.modules.recordk.vo.RecordkVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
/**
* 控制器
@@ -66,6 +71,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);
}
@@ -88,7 +94,53 @@
@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 offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getOfficetime());
+ String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getPermitime());
+ String s = "insert into sys_recordk(id,creditCode,enterpriseName,representative," +
+ "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
+ "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,cardid,overtime)" +
+ "values(" + "'" + recordk.getId() + "'" + "," + "'" + recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
+ + recordk.getRepresentative() + "'" + "," +"'" + recordk.getRegisteredcapital() + "'" + "," + "'"
+ + recordk.getOrganizationcode() + "'" + "," + "'" + recordk.getRegistrationnumber() + "'" + "," +
+ "'" + recordk.getIdentificationnumber() + "'" + "," + "'" + recordk.getEnterprises() + "'" + "," + "'" +
+ recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
+ recordk.getRegion() + "'" + "," + "'" + recordk.getRegistration() + "'" + "," + "'" + recordk.getIndustry() + "'" + "," + "'" + recordk.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + recordk.getDeptid() + "'" + "," + "'" + recordk.getPtype() + "'" + "," +
+ "'" + recordk.getRepresentativecell() + "'" + "," + "'" + recordk.getContacts() + "'" + "," + "'" + recordk.getContactscell() + "'" + "," +
+ "'" + recordk.getPerid() + "'" + "," + "'" + recordk.getOffices() + "'" + "," + "'" + offtime + "'"+ "," + "'" + recordk.getCardid() + "'"+"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(recordk.getOvertime()) + "'"+")";
+ 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("暂存成功");
}
/**
@@ -123,4 +175,10 @@
}
+ @PostMapping("/selectIn")
+ public R selectIn(String cardid,String type) {
+ Map map = recordkService.selectIn(cardid,type);
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3