From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 833fbbe..259e96c 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -27,6 +27,7 @@
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;
@@ -34,6 +35,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
@@ -69,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);
}
@@ -92,14 +95,31 @@
@ApiOperation(value = "新增", notes = "传入recordk")
public R save(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
- Map map = recordkService.selectIn(cardid);
+ 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.setPtype("3");
- return R.status(recordkService.save(recordk));
+ 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("成功");
}
/**
@@ -109,7 +129,8 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R recorkstorage(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
- Map map = recordkService.selectIn(cardid);
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid,ptype);
if (map!=null){
recordk.setStorage("0");
recordkService.updateById(recordk);
@@ -129,6 +150,15 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入recordk")
public R update(@Valid @RequestBody Recordk recordk) {
+// String s1 = "update sys_recordk set type = " + "'" + recordk.getType() + "'" +
+// ",papprove = " + "'" + recordk.getPapprove() + "'"+
+// ",xapprove = " + "'" + recordk.getXapprove() + "'"+
+// ",sapprove = " + "'" + recordk.getSapprove() + "'"+
+// ",popinion = " + "'" + recordk.getPopinion() + "'"+
+// ",sopinion = " + "'" + recordk.getSopinion() + "'"+
+// ",xopinion = " + "'" + recordk.getXopinion() + "'"+
+// " " +"where id = " + "'" + recordk.getId() + "'";
+// FtpUtil.sqlFileUpload(s1);
return R.status(recordkService.updateById(recordk));
}
@@ -154,4 +184,10 @@
}
+ @PostMapping("/selectIn")
+ public R selectIn(String cardid,String type) {
+ Map map = recordkService.selectIn(cardid,type);
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3