From f34dc97df6dc9f4480e7903016f104388ec1a7ab Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期四, 23 五月 2024 11:34:47 +0800 Subject: [PATCH] 田间灌溉项目管理 轮灌组 修改查一个、分页查、轮灌组绑定灌溉单元变物理删除 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 153 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 141 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml index b84d83e..97e9c98 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml @@ -10,6 +10,7 @@ <result column="clientId" jdbcType="BIGINT" property="clientid" /> <result column="money" jdbcType="FLOAT" property="money" /> <result column="state" jdbcType="TINYINT" property="state" /> + <result column="original_card_id" jdbcType="BIGINT" property="originalCardId"/> <result column="createDt" jdbcType="TIMESTAMP" property="createdt" /> <result column="replaceDt" jdbcType="TIMESTAMP" property="replacedt" /> <result column="rechargeDt" jdbcType="TIMESTAMP" property="rechargedt" /> @@ -24,7 +25,7 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> - id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt, + id, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> @@ -75,13 +76,13 @@ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard"> <!--@mbg.generated--> insert into se_client_card (id, cardAddr, cardNum, clientId, - money, `state`, createDt, + money, `state`, original_card_id, createDt, replaceDt, rechargeDt, lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks ) values (#{id,jdbcType=BIGINT}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, - #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{createdt,jdbcType=TIMESTAMP}, + #{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{originalCardId,jdbcType=BIGINT}, #{createdt,jdbcType=TIMESTAMP}, #{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP}, #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP}, #{refunddt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR} @@ -106,6 +107,9 @@ </if> <if test="state != null"> `state`, + </if> + <if test="originalCardId != null"> + original_card_id, </if> <if test="createdt != null"> createDt, @@ -156,6 +160,9 @@ </if> <if test="state != null"> #{state,jdbcType=TINYINT}, + </if> + <if test="originalCardId != null"> + #{originalCardId,jdbcType=BIGINT}, </if> <if test="createdt != null"> #{createdt,jdbcType=TIMESTAMP}, @@ -211,6 +218,9 @@ <if test="state != null"> `state` = #{state,jdbcType=TINYINT}, </if> + <if test="originalCardId != null"> + `original_card_id` = #{originalCardId,jdbcType=BIGINT}, + </if> <if test="createdt != null"> createDt = #{createdt,jdbcType=TIMESTAMP}, </if> @@ -255,6 +265,7 @@ clientId = #{clientid,jdbcType=BIGINT}, money = #{money,jdbcType=FLOAT}, `state` = #{state,jdbcType=TINYINT}, + original_card_id = #{originalCardId,jdbcType=BIGINT}, createDt = #{createdt,jdbcType=TIMESTAMP}, replaceDt = #{replacedt,jdbcType=TIMESTAMP}, rechargeDt = #{rechargedt,jdbcType=TIMESTAMP}, @@ -305,18 +316,136 @@ <!--鏍规嵁姘村崱缂栧彿鑾峰彇鍗$墖鐘舵�侊細1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙i攣锛�7-鍐叉锛�8-娑堣垂--> <select id="getCardStateByCardNum" resultType="java.lang.String"> +<!-- SELECT--> +<!-- (CASE--> +<!-- WHEN lastOper = 1 THEN "寮�鍗�"--> +<!-- WHEN lastOper = 2 THEN "琛ュ崱"--> +<!-- WHEN lastOper = 3 THEN "鍏呭��"--> +<!-- WHEN lastOper = 4 THEN "鎸傚け"--> +<!-- WHEN lastOper = 5 THEN "娉ㄩ攢"--> +<!-- WHEN lastOper = 6 THEN "瑙i攣"--> +<!-- WHEN lastOper = 7 THEN "鍐叉"--> +<!-- WHEN lastOper = 8 THEN "娑堣垂"--> +<!-- END) AS stateName--> +<!-- FROM se_client_card--> +<!-- WHERE cardNum = ${cardNum}--> SELECT - (CASE - WHEN lastOper = 1 THEN "寮�鍗�" - WHEN lastOper = 2 THEN "琛ュ崱" - WHEN lastOper = 3 THEN "鍏呭��" - WHEN lastOper = 4 THEN "鎸傚け" - WHEN lastOper = 5 THEN "娉ㄩ攢" - WHEN lastOper = 6 THEN "瑙i攣" - WHEN lastOper = 7 THEN "鍐叉" - WHEN lastOper = 8 THEN "娑堣垂" + (CASE + WHEN state = 1 THEN '姝e父' + WHEN state = 2 THEN '宸叉敞閿�' + WHEN state = 3 THEN '宸叉寕澶�' END) AS stateName FROM se_client_card WHERE cardNum = ${cardNum} </select> + + <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤--> + <select id="getCardsCount" parameterType="java.util.Map" resultType="java.lang.Long"> + SELECT + COUNT(*) AS recordCount + FROM se_client_card card + INNER JOIN se_client cli ON card.clientId = cli.id + <where> + <if test = "clientNum != null and clientNum !=''"> + AND cli.clientNum like CONCAT('%',#{clientNum},'%') + </if> + + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + + <if test = "cardNum != null and cardNum !=''"> + AND card.cardNum like CONCAT('%',#{cardNum},'%') + </if> + </where> + </select> + + <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢�--> + <select id="getCards" resultType="com.dy.pipIrrGlobal.voSe.VoCards"> + SELECT + cli.clientNum, + cli.name AS clientName, + card.cardNum, + cli.phone, + cli.idCard, + card.state AS cardState, + (CASE + WHEN card.state = 1 THEN '姝e父' + WHEN card.state = 2 THEN '宸叉敞閿�' + WHEN card.state = 3 THEN '宸叉寕澶�' + End) AS stateName, + '鍐滄埛鍗�' AS cardType, + FORMAT(card.money, 2) AS money + FROM se_client_card card + INNER JOIN se_client cli ON card.clientId = cli.id + <where> + <if test = "clientNum != null and clientNum !=''"> + AND cli.clientNum like CONCAT('%',#{clientNum},'%') + </if> + + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + + <if test = "cardNum != null and cardNum !=''"> + AND card.cardNum like CONCAT('%',#{cardNum},'%') + </if> + </where> + ORDER BY card.id + <trim prefix="limit " > + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> + </select> + + <!--鑾峰彇宸叉寕澶辨湭琛ュ崱鐨勮褰曟暟閲�--> + <select id="getUnreplacedRecordCount" resultType="java.lang.Long"> + SELECT + COUNT(*) AS recordCount + FROM se_client_card card + INNER JOIN se_client cli ON card.clientId = cli.id + WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.cardNum) + </select> + + <!--鑾峰彇宸叉寕澶辨湭琛ュ崱鐨勮褰�--> + <select id="getUnreplaced" resultType="com.dy.pipIrrGlobal.voSe.VoCards"> + SELECT + cli.clientNum, + cli.name AS clientName, + card.cardNum, + cli.phone, + cli.idCard, + card.state AS cardState, + (CASE + WHEN card.state = 1 THEN '姝e父' + WHEN card.state = 2 THEN '宸叉敞閿�' + WHEN card.state = 3 THEN '宸叉寕澶�' + End) AS stateName, + '鍐滄埛鍗�' AS cardType, + FORMAT(card.money,2) AS money + FROM se_client_card card + INNER JOIN se_client cli ON card.clientId = cli.id + WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.cardNum) + ORDER BY card.id + <trim prefix="limit " > + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> + </select> + + <!--鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰�--> + <select id="isLostAndUnreplaced" resultType="java.lang.Integer"> + SELECT + COUNT(*) AS recordCount + FROM se_client_card card + INNER JOIN se_client_card card2 ON card2.original_card_id = card.cardNum + <where> + AND card.state = 3 + <if test = "cardNum != null and cardNum > 0"> + AND card.cardNum = #{cardNum} + </if> + </where> + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0