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 ++++++++++++++++------
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 4 +-
src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java | 29 +++++++++++---
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 9 ++++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 4 +-
5 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
index 2b15d62..a9d6881 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -163,6 +163,15 @@
@ApiOperation(value = "导出模板")
public void exportUser(HttpServletResponse response) {
List<EquipageExcel> list = new ArrayList<>();
+ EquipageExcel equipage = new EquipageExcel();
+ equipage.setDeptName("***保安公司");
+ equipage.setName("安全帽");
+ equipage.setMode("S10");
+ equipage.setNum(100);
+ equipage.setPersonInCharge("张三");
+ equipage.setBrand("***有限公司");
+ equipage.setDateForProduction("2021/05/01");
+ list.add(equipage);
ExcelUtil.export(response, "装备导入数据模板", "装备导入数据表", list, EquipageExcel.class);
}
diff --git a/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java b/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
index e7995ce..b3220e7 100644
--- a/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
+++ b/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
@@ -22,6 +22,7 @@
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* EquipageExcel 保安公司装备
@@ -70,6 +71,14 @@
@ExcelProperty("型号")
private String mode;
+
+ /**
+ * 数量
+ */
+ @ColumnWidth(10)
+ @ExcelProperty("数量")
+ private Integer num;
+
/**
* 责任人
*/
@@ -78,12 +87,12 @@
private String personInCharge;
- /**
- * 责任人
- */
- @ColumnWidth(20)
- @ExcelProperty("责任人身份证号码")
- private String idCardNo;
+// /**
+// * 责任人
+// */
+// @ColumnWidth(20)
+// @ExcelProperty("责任人身份证号码")
+// private String idCardNo;
/**
* 品牌，厂商
@@ -93,4 +102,12 @@
private String brand;
+ /**
+ * 出厂日期
+ */
+ @ColumnWidth(25)
+ @ExcelProperty("出厂日期")
+ private String dateForProduction;
+
+
}
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);
+
});
}
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 3ede2f1..2bb3321 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -150,9 +150,9 @@
FROM
(
SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586'AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
+ LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) A ON H.departmentid = A.dept_id
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586'AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
+ LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) B ON H.departmentid = B.dept_id where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and H.jurisdiction = #{jurisdiction}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index b1f3204..f91676f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -76,7 +76,7 @@
where
bu.is_deleted = 0
<if test="user.account!=null and user.account != ''">
- and bu.account = #{user.account}
+ and bu.account like concat('%', #{user.account},'%')
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
@@ -123,7 +123,7 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account != #{user.account}
+ and account like concat('%', #{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
--
Gitblit v1.9.3