修改单点登录模块的一些代码问题 1.全局userId变id

wuzeyu

2024-05-30 5ce74aa073f8f31e3c9d078bbd747609d6a5c038

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml

@@ -1,51 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoSe.SeRechargeMapper">

  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
    <!--@mbg.generated-->
    <!--@Table se_recharge-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="cardId" jdbcType="BIGINT" property="cardid" />
    <result column="clientId" jdbcType="BIGINT" property="clientid" />
    <result column="money" jdbcType="FLOAT" property="money" />
    <result column="amount" jdbcType="FLOAT" property="amount" />
    <result column="gift" jdbcType="FLOAT" property="gift" />
    <result column="afterRecharge" jdbcType="FLOAT" property="afterrecharge" />
    <result column="paymentId" jdbcType="BIGINT" property="paymentid" />
    <result column="price" jdbcType="FLOAT" property="price" />
    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
    <result column="operator" jdbcType="BIGINT" property="operator" />
    <result column="operateDt" jdbcType="TIMESTAMP" property="operatedt" />
  </resultMap>

  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, cardId, money, amount, gift, afterRecharge, paymentId, remarks, `operator`, operateDt
    id, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks, 
    `operator`, operateDt
  </sql>

<!--  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
<!--    &lt;!&ndash;@mbg.generated&ndash;&gt;-->
<!--    select -->
<!--    <include refid="Base_Column_List" />-->
<!--    from se_recharge-->
<!--    where id = #{id,jdbcType=BIGINT}-->
<!--  </select>-->

  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
    select 
    <include refid="Base_Column_List" />
    from se_recharge
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    <!--@mbg.generated-->
    delete from se_recharge
    where id = #{id,jdbcType=BIGINT}
  </delete>

  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
    <!--@mbg.generated-->
    insert into se_recharge (cardId, money, amount, 
      gift, afterRecharge, paymentId, 
      remarks, `operator`, operateDt
      )
    values (#{cardid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, #{amount,jdbcType=FLOAT}, 
      #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT}, #{paymentid,jdbcType=BIGINT}, 
      #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
      )
    insert into se_recharge (id, cardId, clientId, money,
      amount, gift, afterRecharge, 
      paymentId, price, remarks, 
      `operator`, operateDt)
    values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
      #{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT}, 
      #{paymentid,jdbcType=BIGINT}, #{price,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, 
      #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})
  </insert>

  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">
@@ -54,6 +53,9 @@
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="cardid != null">
        cardId,
      </if>
      <if test="clientid != null">
        clientId,
      </if>
      <if test="money != null">
        money,
@@ -70,6 +72,9 @@
      <if test="paymentid != null">
        paymentId,
      </if>
      <if test="price != null">
        price,
      </if>
      <if test="remarks != null">
        remarks,
      </if>
@@ -83,6 +88,9 @@
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="cardid != null">
        #{cardid,jdbcType=BIGINT},
      </if>
      <if test="clientid != null">
        #{clientid,jdbcType=BIGINT},
      </if>
      <if test="money != null">
        #{money,jdbcType=FLOAT},
@@ -99,6 +107,9 @@
      <if test="paymentid != null">
        #{paymentid,jdbcType=BIGINT},
      </if>
      <if test="price != null">
        #{price,jdbcType=FLOAT},
      </if>
      <if test="remarks != null">
        #{remarks,jdbcType=VARCHAR},
      </if>
@@ -110,13 +121,15 @@
      </if>
    </trim>
  </insert>

  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
    <!--@mbg.generated-->
    update se_recharge
    <set>
      <if test="cardid != null">
        cardId = #{cardid,jdbcType=BIGINT},
      </if>
      <if test="clientid != null">
        clientId = #{clientid,jdbcType=BIGINT},
      </if>
      <if test="money != null">
        money = #{money,jdbcType=FLOAT},
@@ -133,6 +146,9 @@
      <if test="paymentid != null">
        paymentId = #{paymentid,jdbcType=BIGINT},
      </if>
      <if test="price != null">
        price = #{price,jdbcType=FLOAT},
      </if>
      <if test="remarks != null">
        remarks = #{remarks,jdbcType=VARCHAR},
      </if>
@@ -145,36 +161,52 @@
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>

  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
    <!--@mbg.generated-->
    update se_recharge
    set cardId = #{cardid,jdbcType=BIGINT},
      clientId = #{clientid,jdbcType=BIGINT},
      money = #{money,jdbcType=FLOAT},
      amount = #{amount,jdbcType=FLOAT},
      gift = #{gift,jdbcType=FLOAT},
      afterRecharge = #{afterrecharge,jdbcType=FLOAT},
      paymentId = #{paymentid,jdbcType=BIGINT},
      price = #{price,jdbcType=FLOAT},
      remarks = #{remarks,jdbcType=VARCHAR},
      `operator` = #{operator,jdbcType=BIGINT},
      operateDt = #{operatedt,jdbcType=TIMESTAMP}
    where id = #{id,jdbcType=BIGINT}
  </update>

  <!--根据水卡编号删除充值记录-->
<!--  <delete id="deleteByCardNum" parameterType="java.lang.String">-->
<!--    DELETE FROM   se_recharge WHERE cardNum = #{cardNum}-->
<!--  </delete>-->

  <!--根据水卡ID删除充值记录-->
  <delete id="deleteByCardId" parameterType="java.lang.Long">
    DELETE FROM   se_recharge WHERE cardId = #{cardId}
  </delete>

  <!--根据指定的条件获取充值记录-->
  <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
    select
        COUNT(*) AS recordCount
    FROM se_client_card card
        INNER JOIN se_recharge rec ON card.id = rec.cardId
        INNER JOIN ba_client cli ON card.clientId = cli.id
    FROM se_recharge_history rec
    INNER JOIN se_client_card card ON rec.cardId = card.id
    INNER JOIN se_client cli ON rec.clientId = cli.id
    , (SELECT @i:=0) AS itable
    <where>
      <if test = "clientName != null and clientName !=''">
        AND cli.name like CONCAT('%',#{clientName},'%')
      </if>

      <if test = "cardAddr != null and cardAddr !=''">
        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
      <if test = "clientNum != null and clientNum > 0">
        AND cli.clientNum like CONCAT('%',#{clientNum},'%')
      </if>

      <if test = "cardNum != null and cardNum !=''">
        AND card.cardNum like CONCAT('%',#{cardNum},'%')
      </if>

      <if test = "paymentId != null and paymentId > 0">
@@ -182,34 +214,39 @@
      </if>

      <if test = "rechargeTimeStart != null and rechargeTimeStop != null">
        AND card.rechargeDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
        AND rec.operateDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
      </if>
    </where>
  </select>

  <!--根据制定的条件获取充值记录-->
  <select id="getRecharges" resultType="com.dy.pipIrrGlobal.pojoSe.VoRecharge">
  <!--根据指定的条件获取充值记录-->
  <select id="getRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoRecharge">
    SELECT
        (@i:=@i+1) AS id,
        cli.`name` AS clientName,
        cli.id AS clientId,
        card.cardAddr,
        cli.name AS clientName,
        cli.clientNum,
        card.cardNum,
        rec.amount,
        rec.afterRecharge,
        rec.paymentId,
        rec.price,
        (SELECT `name` FROM ba_user WHERE id =  rec.operator) AS operator, rec.operateDt
    FROM se_client_card card
        INNER JOIN se_recharge rec ON card.id = rec.cardId
        INNER JOIN ba_client cli ON card.clientId = cli.id
        (SELECT `name` FROM ba_user WHERE id =  rec.operator) AS operator,
        rec.operateDt
    FROM se_recharge_history rec
        INNER JOIN se_client_card card ON rec.cardId = card.id
        INNER JOIN se_client cli ON rec.clientId = cli.id
        , (SELECT @i:=0) AS itable
    <where>
      <if test = "clientName != null and clientName !=''">
        AND cli.name like CONCAT('%',#{clientName},'%')
      </if>

      <if test = "cardAddr != null and cardAddr !=''">
        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
      <if test = "clientNum != null and clientNum > 0">
        AND cli.clientNum like CONCAT('%',#{clientNum},'%')
      </if>

      <if test = "cardNum != null and cardNum !=''">
        AND card.cardNum like CONCAT('%',#{cardNum},'%')
      </if>

      <if test = "paymentId != null and paymentId > 0">
@@ -217,12 +254,14 @@
      </if>

      <if test = "rechargeTimeStart != null and rechargeTimeStop != null">
        AND card.rechargeDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
        AND rec.operateDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
      </if>
    </where>

    <if test="pageCurr != null and pageSize != null">
      LIMIT ${pageCurr}, ${pageSize}
    </if>
    ORDER BY rec.operateDt DESC
    <trim prefix="limit " >
      <if test="start != null and count != null">
        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
      </if>
    </trim>
  </select>
</mapper>