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 |   61 ++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 17 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 6c04e2f..e1aa2db 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -42,7 +42,7 @@
 import java.util.Map;
 
 /**
- *  控制器
+ * 控制器
  *
  * @author BladeX
  * @since 2021-07-12
@@ -55,6 +55,7 @@
 
 	private final IRecordkService recordkService;
 	private final IInformationService informationService;
+
 	/**
 	 * 详情
 	 */
@@ -86,7 +87,7 @@
 	@ApiOperation(value = "分页", notes = "传入recordk")
 	public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
 		IPage<RecordkVO> pages;
-		pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,recordk.getJurisdiction());
+		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")) {
@@ -113,8 +114,8 @@
 	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));
 		}
@@ -125,30 +126,56 @@
 		//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)" +
-			"values(" + "'" + recordk.getId() + "'" + "," + "'" + recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
-			+ recordk.getRepresentative() + "'" +"," + "'" +
+			"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()+"'"+")";
-		FtpUtil.sqlFileUpload(s);
+			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);
@@ -193,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