From 388c0a460456c3ecd73f9bc62530a0fd162fa0c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 30 Nov 2021 15:44:56 +0800
Subject: [PATCH] 保安员离职已派遣的人员修改为派遣结束
---
src/main/java/org/springblade/modules/experience/controller/ExperienceController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java b/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
index f00673b..59833d3 100644
--- a/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
+++ b/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
@@ -28,12 +28,16 @@
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.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.experience.vo.ExperienceVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
@@ -50,6 +54,9 @@
public class ExperienceController extends BladeController {
private final IExperienceService experienceService;
+
+
+ private final IUserService userService;
/**
* 详情
@@ -138,7 +145,51 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入experience")
public R submit(@Valid @RequestBody Experience experience) {
- return R.status(experienceService.saveOrUpdate(experience));
+ boolean status = false;
+ if (null!=experience.getId()){
+ //更新
+ status = experienceService.updateById(experience);
+
+ String s1 =
+ "update sys_experience set name = " + "'" + experience.getName() + "'"
+ + ",post = " + "'" + experience.getPost() + "'"
+ + ",department = " + "'" + experience.getDepartment() + "'"
+ + ",responsibilities = " + "'" + experience.getResponsibilities() + "'"
+ + ",entryTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'"
+ + ",departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'"
+ + ",leaving = " + "'" + experience.getLeaving() + "'"
+ + ",cardId = " + "'" + experience.getCardid() + "'"
+ + ",companyname = " + "'" + experience.getCompanyname() + "'"
+ + ",securityId = " + "'" + experience.getSecurityid() + "'"
+ + " " + "where id = " + "'" + experience.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+
+ }else {
+ //新增
+ //查询用户身份证号
+ User user = userService.getById(experience.getSecurityid());
+ experience.setCardid(user.getCardid());
+ experience.setName(user.getRealName());
+ status = experienceService.save(experience);
+
+ //内网同步
+ String s = "insert into sys_experience(id,name,post,department,responsibilities,entryTime,departureTime,leaving," +
+ "cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" + "," +
+ "'" + experience.getName() + "'" + "," +
+ "'" + experience.getPost() + "'" + "," +
+ "'" + experience.getDepartment() + "'" + "," +
+ "'" + experience.getResponsibilities() + "'" + "," +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
+ "," + "'" + experience.getLeaving() + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
+ FtpUtil.sqlFileUpload(s);
+ }
+ return R.status(status);
}
@@ -154,7 +205,7 @@
/**
* 保安就业记录
- * @param cardid 身份证
+ * @param securityid 身份证
* @return
*/
@GetMapping("/selectExperienceInfo")
--
Gitblit v1.9.3