From 3707ace2281019ed0421b59674fc549020239903 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 29 十一月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 4 ++--
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java | 2 +-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java | 3 ++-
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml | 2 +-
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java | 1 -
hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml | 7 ++++---
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index d932fb5..d8e6366 100644
--- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
+++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -114,7 +114,7 @@
</if>
</trim>
</where>
-
+ order by spu.create_time desc
</select>
<select id="queryForPullDownDorm" resultType="com.thhy.staff.modules.biz.platuser.entity.PlatUserPullDown">
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
index 606c4c6..806751e 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
@@ -25,7 +25,7 @@
private String nameOfOrigin;//场地名称
private String materialName;//物料名称
- private Integer incomingQuantity;//进厂数量
+ private Double incomingQuantity;//进厂数量
private Date createTime;//创建时间
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
index c85c199..93b3eff 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -66,7 +66,7 @@
#{materialName,jdbcType=VARCHAR},
</if>
<if test="incomingQuantity != null">
- #{incomingQuantity,jdbcType=INTEGER},
+ #{incomingQuantity,jdbcType=DOUBLE},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
@@ -111,7 +111,7 @@
material_name = #{materialName,jdbcType=VARCHAR},
</if>
<if test="incomingQuantity != null">
- incoming_quantity = #{incomingQuantity,jdbcType=INTEGER},
+ incoming_quantity = #{incomingQuantity,jdbcType=DOUBLE},
</if>
<if test="status != null">
`status` = #{status,jdbcType=INTEGER},
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
index 5bed478..fcfa191 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
@@ -171,7 +171,6 @@
public BasicResult examine(HiddenDangerEntity hiddenDangerEntity) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String platUserId = regionInspectionRecordMapper.selectPlatUserId(hiddenDangerEntity.getCreateUser());
-
Map platUser = regionInspectionRecordMapper.getPlatUser(platUserId);
int user_type = (int) platUser.get("user_type");
Map account = new HashMap();
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java
index 142f0e1..4f9834e 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java
@@ -32,8 +32,9 @@
private Double changeIntegral;//变量在积分超市 修改前的变量
- @Excel(sort = 1,title = "时间")
private Date createTime;
+ @Excel(sort = 1,title = "时间")
+ private String createDate;
@Excel(sort = 2,title = "人员类别")
private String userTypeName;
@Excel(sort = 3,title = "人员姓名")
diff --git a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
index 49fd4d7..6409c6a 100644
--- a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
@@ -236,8 +236,9 @@
SELECT
t.*,
spu.real_name realName,
- spu.user_type userTypeName
- FROM t_integral_detail t
+ spu.user_type userTypeName,
+ DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
+ FROM t_integral_detail t
LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
WHERE t.isUse = 1 and t.type = 2 and t.companyId = #{companyId}
<if test="userId != null and userId !=''">
@@ -280,7 +281,7 @@
<select id="selectSafeIntegralInfo" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto">
SELECT
t.*,
- DATE_FORMAT(t.createTime, '%Y-%m-%d') createDate
+ DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
FROM t_integral_detail t
WHERE t.isUse = 1
<if test="companyId != null and companyId !=''">
--
Gitblit v1.9.3