Browse Source

8.17区分员工账号

lijianlin/feature-20250728171217-三期金豆消费相关
huangqizhen 4 days ago
parent
commit
907ea143ba
  1. 8
      pom.xml
  2. 2
      src/main/java/com/example/demo/domain/entity/User.java
  3. 2
      src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
  4. 15
      src/main/resources/mapper/GoldDetailMapper.xml

8
pom.xml

@ -48,6 +48,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.5.14</version> <version>4.5.14</version>

2
src/main/java/com/example/demo/domain/entity/User.java

@ -71,4 +71,6 @@ public class User implements Serializable {
private String sortOrder; //排序顺序 private String sortOrder; //排序顺序
@ExcelIgnore @ExcelIgnore
private Integer flag;//是否员工号 private Integer flag;//是否员工号
@ExcelIgnore
private Integer UserFlag;//是否员工号
} }

2
src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java

@ -63,5 +63,7 @@ public class GoldDetail {
private Date auditTime; private Date auditTime;
@ExcelIgnore @ExcelIgnore
private List<String> markets; private List<String> markets;
@ExcelIgnore
private Integer UserFlag;// 用户标识
} }

15
src/main/resources/mapper/GoldDetailMapper.xml

@ -27,8 +27,10 @@
left join market m on m.id=`user`.market left join market m on m.id=`user`.market
<where> <where>
ugr.flag = 1 and ugr.flag = 1 and
`user`.flag = 1 and
ugr.audit_status IN (1,3) ugr.audit_status IN (1,3)
<if test="UserFlag!=null and UserFlag.length > 0">
AND `user`.flag = #{UserFlag}
</if>
<if test="jwcode != null"> <if test="jwcode != null">
and ugr.jwcode = #{jwcode} and ugr.jwcode = #{jwcode}
</if> </if>
@ -67,8 +69,10 @@
from user_gold_record ugr from user_gold_record ugr
<where> <where>
ugr.flag = 1 and ugr.flag = 1 and
`user`.flag = 1 and
ugr.audit_status IN (1,3) ugr.audit_status IN (1,3)
<if test="UserFlag!=null and UserFlag.length > 0">
AND `user`.flag = #{UserFlag}
</if>
<if test="jwcode != null"> <if test="jwcode != null">
and `ugr`.jwcode = #{jwcode} and `ugr`.jwcode = #{jwcode}
</if> </if>
@ -115,6 +119,9 @@
from user u from user u
left join market m on u.market = m.id left join market m on u.market = m.id
<where> <where>
<if test="UserFlag!=null and UserFlag.length > 0">
AND `user`.flag = #{UserFlag}
</if>
<if test="jwcode != null"> <if test="jwcode != null">
and jwcode = #{jwcode} and jwcode = #{jwcode}
</if> </if>
@ -150,7 +157,9 @@
from `user` from `user`
<where> <where>
flag = 1
<if test="UserFlag!=null and UserFlag.length > 0">
AND `user`.flag = #{UserFlag}
</if>
<if test="jwcode != null "> <if test="jwcode != null ">
and jwcode = #{jwcode} and jwcode = #{jwcode}
</if> </if>

Loading…
Cancel
Save