From f2032d8331cd8939bb8dd4ef372033a2dcdbc850 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 17 Feb 2022 16:10:55 +0800
Subject: [PATCH] +添加法人变更，以及跨区域备案字段更改
---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 88 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 13 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 d0e30b1..e1aa2db 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -27,18 +27,22 @@
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.information.service.IInformationService;
import org.springblade.modules.permit.entity.Permit;
+import org.springblade.modules.permit.vo.PermitVO;
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;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2021-07-12
@@ -50,6 +54,7 @@
public class RecordkController extends BladeController {
private final IRecordkService recordkService;
+ private final IInformationService informationService;
/**
* 详情
@@ -69,6 +74,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);
}
@@ -80,7 +86,22 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入recordk")
public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
- IPage<RecordkVO> pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk);
+ IPage<RecordkVO> pages;
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk, recordk.getJurisdiction());
+// if (recordk.getUsetype().equals("0")) {
+// pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
+// } else if (recordk.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(recordk.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 = recordkService.selectRecordkPage(Condition.getPage(query), recordk,jurisdiction);
+// } else {
+// pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
+// }
return R.data(pages);
}
@@ -93,31 +114,68 @@
public R save(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
String ptype = recordk.getPtype();
- Map map = recordkService.selectIn(cardid,ptype);
- if (map!=null){
+ 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());
- return R.status(recordkService.save(recordk));
+ 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," +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,cardid,overtime," +
+ "jurisdiction," +
+ "ksecuritys," +
+ "kproject," +
+ "kzipcode," +
+ "kservicetime," +
+ "kaddress" +
+ ")" +
+ "values(" + "'" + recordk.getId() + "'" + "," + "'" +
+ recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
+ + recordk.getRepresentative() + "'" + "," + "'" +
+ recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
+ recordk.getRegion() + "'" + "," + "'" + recordk.getRegistration() + "'" + "," + "'" +
+ recordk.getIndustry() + "'" + "," + "'" + recordk.getType() + "'" + "," + "'" +
+ recordk.getDeptid() + "'" + "," + "'" + recordk.getPtype() + "'" + "," +
+ "'" + recordk.getRepresentativecell() + "'" + "," + "'" + recordk.getContacts() + "'" + "," + "'" +
+ recordk.getContactscell() + "'" + "," +
+ "'" + recordk.getCardid() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(recordk.getOvertime()) + "'" + "," +
+ "'" + recordk.getJurisdiction() + "'" + "," +
+ "'" + recordk.getKsecuritys() + "'" + "," +
+ "'" + recordk.getKproject() + "'" + "," +
+ "'" + recordk.getKzipcode() + "'" + "," +
+ "'" + recordk.getKservicetime() + "'" + "," +
+ "'" + recordk.getKaddress() + "'" +
+ ")";
+// System.out.println(s);
+// System.out.println(recordk.getKsecuritys());
+// System.out.println(recordk.getKproject());
+// System.out.println(recordk.getKzipcode());
+// System.out.println(recordk.getKservicetime());
+// System.out.println(recordk.getKaddress());
+// System.out.println(recordk);
+// 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){
+ Map map = recordkService.selectIn(cardid, ptype);
+ if (map != null) {
recordk.setStorage("0");
recordkService.updateById(recordk);
- }
- else {
+ } else {
recordk.setStorage("0");
recordk.setPermitime(new Date());
recordkService.save(recordk);
@@ -132,7 +190,11 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入recordk")
public R update(@Valid @RequestBody Recordk recordk) {
- return R.status(recordkService.updateById(recordk));
+ boolean b = recordkService.updateById(recordk);
+ String s1 = "update sys_recordk set type = " + "'" + 0 + "'" + ",approve = " + "'" + recordk.getApprove() + "'" +
+ " " + "where id = " + "'" + recordk.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.status(b);
}
/**
@@ -158,8 +220,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid,String type) {
- Map map = recordkService.selectIn(cardid,type);
+ public R selectIn(String cardid, String type) {
+ Map map = recordkService.selectIn(cardid, type);
return R.data(map);
}
--
Gitblit v1.9.3