From e5442e561180c6dcaa52308c51cc026e0d364ee9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 03 Mar 2022 14:30:23 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 9 ++++++---
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 | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
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 8cdb315..26ebbe8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -148,5 +148,6 @@
*/
private String workjurisdiction;
private String signals;
-
+ @TableField("job_unit")
+ private String jobUnit;
}
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 3a1937d..e1e4de0 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -223,13 +223,16 @@
user.setExamination_type("0");
user.setExamination_mx("正常");
user.setCardid(zc.getCardid());
- if (zc.getSignals() != "") {
+ if (!zc.getSignals().equals("")) {
user.setSignals(zc.getSignals());
}
user.setStype("0");
- if (zc.getAddress()!=""){
+ if (!zc.getAddress().equals("")) {
user.setAddress(zc.getAddress());
user.setJurisdiction(zc.getJurisdiction());
+ }
+ if (!zc.getJobUnit().equals("")) {
+ user.setJobUnit(zc.getJobUnit());
}
iUserService.saveOrUpdate(user);
String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,parent_id,jurisdiction,cardid,address)" +
@@ -259,7 +262,7 @@
// "," + "'" + zc.getCardid() + "'" +
// "," + "'" + zc.getAddress() + "'"
// + ")";
-// FtpUtil.sqlFileUpload(s);
+ 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 504e609..80578cb 100644
--- a/src/main/java/org/springblade/modules/zc/entity/Zc.java
+++ b/src/main/java/org/springblade/modules/zc/entity/Zc.java
@@ -126,5 +126,7 @@
*/
private String workjurisdiction;
private String signals;
+ @TableField("job_unit")
+ private String jobUnit;
}
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 12e8f50..37161e0 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,workaddress, workjurisdiction, signals)
+ insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid,address,workaddress, workjurisdiction, signals,job_unit)
values (#{username}, #{password}, #{sname}, #{sex}, #{phone}, #{zctime}, #{deptid}, #{parentId},
- #{jurisdiction}, #{cardid},#{address},#{workaddress},#{workjurisdiction},#{signals})
+ #{jurisdiction}, #{cardid},#{address},#{workaddress},#{workjurisdiction},#{signals},#{jobUnit})
</insert>
<select id="selectType" resultType="String">
--
Gitblit v1.9.3