From 28dce68d3c42b204e468625dab64a6c3fff62c5b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 25 Feb 2022 18:56:45 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 31 +++++++++++++++++++++++--------
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java | 2 +-
src/main/java/org/springblade/modules/zc/entity/Zc.java | 2 +-
src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml | 4 ++--
src/main/java/org/springblade/modules/system/entity/User.java | 2 +-
5 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
index de81cee..a5e3baf 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -182,7 +182,7 @@
}
}
- @PostMapping("/isOnArea")
+ @GetMapping("/isOnArea")
public R isOnArea(String jd, String wd) {
return R.data(jurisdictionService.isOnArea(jd, wd));
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 89e5d14..8cdb315 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -147,6 +147,6 @@
* 工作辖区
*/
private String workjurisdiction;
- private String signal;
+ private String signals;
}
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index a6b84d6..3a1937d 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -216,21 +216,23 @@
user.setRealName(zc.getSname());
user.setSex(Integer.valueOf(zc.getSex()));
user.setPhone(zc.getPhone());
- user.setDeptId(zc.getDeptid());
+ //user.setDeptId(zc.getDeptid());
user.setRoleId(zc.getParentId());
user.setWorkaddress(zc.getWorkaddress());
user.setWorkjurisdiction(zc.getWorkjurisdiction());
- user.setJurisdiction(zc.getJurisdiction());
user.setExamination_type("0");
user.setExamination_mx("正常");
user.setCardid(zc.getCardid());
- if (zc.getSignal() != null) {
- user.setSignal(zc.getSignal());
+ if (zc.getSignals() != "") {
+ user.setSignals(zc.getSignals());
}
user.setStype("0");
- user.setAddress(zc.getAddress());
+ if (zc.getAddress()!=""){
+ user.setAddress(zc.getAddress());
+ user.setJurisdiction(zc.getJurisdiction());
+ }
iUserService.saveOrUpdate(user);
- String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid,address)" +
+ String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,parent_id,jurisdiction,cardid,address)" +
"values(" + "'" + zc.getId() + "'" +
"," + "'" + zc.getUsername() + "'" +
"," + "'" + zc.getPassword() + "'" +
@@ -238,13 +240,26 @@
"," + "'" + zc.getSex() + "'" +
"," + "'" + zc.getPhone() + "'" +
"," + "'" + zc.getZctime() + "'" +
- "," + "'" + zc.getDeptid() + "'" +
"," + "'" + zc.getParentId() + "'" +
"," + "'" + zc.getJurisdiction() + "'" +
"," + "'" + zc.getCardid() + "'" +
"," + "'" + zc.getAddress() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+// String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid,address)" +
+// "values(" + "'" + zc.getId() + "'" +
+// "," + "'" + zc.getUsername() + "'" +
+// "," + "'" + zc.getPassword() + "'" +
+// "," + "'" + zc.getSname() + "'" +
+// "," + "'" + zc.getSex() + "'" +
+// "," + "'" + zc.getPhone() + "'" +
+// "," + "'" + zc.getZctime() + "'" +
+// "," + "'" + zc.getDeptid() + "'" +
+// "," + "'" + zc.getParentId() + "'" +
+// "," + "'" + zc.getJurisdiction() + "'" +
+// "," + "'" + zc.getCardid() + "'" +
+// "," + "'" + zc.getAddress() + "'"
+// + ")";
+// FtpUtil.sqlFileUpload(s);
return R.success("新增成功");
}
diff --git a/src/main/java/org/springblade/modules/zc/entity/Zc.java b/src/main/java/org/springblade/modules/zc/entity/Zc.java
index 4a5417e..504e609 100644
--- a/src/main/java/org/springblade/modules/zc/entity/Zc.java
+++ b/src/main/java/org/springblade/modules/zc/entity/Zc.java
@@ -125,6 +125,6 @@
* 工作辖区
*/
private String workjurisdiction;
- private String signal;
+ private String signals;
}
diff --git a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
index 5e6e164..12e8f50 100644
--- a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
+++ b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
@@ -50,9 +50,9 @@
<!--注册新增-->
<insert id="inster" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
- insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid,address)
+ insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid,address,workaddress, workjurisdiction, signals)
values (#{username}, #{password}, #{sname}, #{sex}, #{phone}, #{zctime}, #{deptid}, #{parentId},
- #{jurisdiction}, #{cardid},#{address})
+ #{jurisdiction}, #{cardid},#{address},#{workaddress},#{workjurisdiction},#{signals})
</insert>
<select id="selectType" resultType="String">
--
Gitblit v1.9.3