From ce56ee73b3a280e9ccbc7258a1402dbaaf3ec4c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Sep 2021 15:33:54 +0800
Subject: [PATCH] 1.装备导入修改，新增数量，模板示例 2.用户查询接口修改
---
src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
index 450230d..300f481 100644
--- a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.equipage.entity.Equipage;
import org.springblade.modules.equipage.excel.EquipageExcel;
import org.springblade.modules.equipage.mapper.EquipageMapper;
@@ -15,6 +16,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.List;
/**
@@ -55,11 +58,6 @@
//数据导入
data.forEach(equipageExcel -> {
Equipage equipage = new Equipage();
- //使用责任人身份证号匹配userId
- if (null!=equipageExcel.getIdCardNo() && equipageExcel.getIdCardNo()!=""){
- equipage.setUserId(userService.getUserInfoByIdCardNo(equipageExcel.getIdCardNo()).getId());
- equipage.setPersonInCharge(userService.getUserInfoByIdCardNo(equipageExcel.getIdCardNo()).getRealName());
- }
//使用保安公司名称匹配组织机构id
if (null!=equipageExcel.getDeptName() && equipageExcel.getDeptName()!=""){
equipage.setDeptId(Long.parseLong(userDeptService.selectIn(equipageExcel.getDeptName())));
@@ -77,17 +75,39 @@
equipage.setName(equipageExcel.getName());
}
-// if (null!=equipageExcel.getNumber() && equipageExcel.getNumber()!="") {
-// equipage.setNumber(equipageExcel.getNumber());
-// }
-//
-// if (null!=equipageExcel.getSpecifications() && equipageExcel.getSpecifications()!="") {
-// equipage.setSpecifications(equipageExcel.getSpecifications());
-// }
+ if (null!=equipageExcel.getNum()) {
+ equipage.setNum(equipageExcel.getNum());
+ }
+
+ if (null!=equipageExcel.getPersonInCharge() && equipageExcel.getPersonInCharge()!="") {
+ equipage.setPersonInCharge(equipageExcel.getPersonInCharge());
+ }
+
+ if (null!=equipageExcel.getDateForProduction() && equipageExcel.getDateForProduction()!="") {
+ try {
+ equipage.setDateForProduction(new SimpleDateFormat("yyyy/MM/dd").parse(equipageExcel.getDateForProduction()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
//插入数据
this.save(equipage);
+
+ //数据推送
+ String s1 =
+ "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,date_for_production,num) " +
+ "values(" + "'" + equipage.getId() + "'" + "," +
+ "'" + equipage.getName() + "'" + "," +
+ "'" + equipage.getMode() + "'" + "," +
+ "'" + equipage.getDeptId() + "'" + "," +
+ "'" + equipage.getPersonInCharge() + "'" + "," +
+ "'" + equipage.getBrand() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy/MM/dd").format(equipage.getDateForProduction()) + "'" + "," +
+ "'" +equipage.getNum() + "'" + ")";
+ FtpUtil.sqlFileUpload(s1);
+
});
}
}
--
Gitblit v1.9.3