Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java

@@ -91,6 +91,36 @@ public class ModifyBizCompanyParam {
      */
     private String street;
 
+    /**
+     * 区县; 代码
+     */
+    private String area;
+
+    /**
+     * 乡镇街道; 代码
+     */
+    private String town;
+
+    /**
+     * 省; 名称
+     */
+    private String provinceName;
+
+    /**
+     * 市; 名称
+     */
+    private String cityName;
+
+    /**
+     * 区县; 名称
+     */
+    private String areaName;
+
+    /**
+     * 乡镇街道; 名称
+     */
+    private String townName;
+
     /**
      * 详细地址
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyChangeDetailMapper.java

@@ -1,13 +1,20 @@
 package com.njzscloud.supervisory.money.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 资金变动明细
  */
 @Mapper
 public interface MoneyChangeDetailMapper extends BaseMapper<MoneyChangeDetailEntity> {
+    /**
+     * 分页查询资金账户（关联用户或企业信息）
+     */
+    IPage<MoneyChangeDetailEntity> page(Page<MoneyChangeDetailEntity> page, @Param("entity") MoneyChangeDetailEntity entity);
 
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java

@@ -96,4 +96,7 @@ public class MoneyChangeDetailEntity {
     @TableLogic
     private Boolean deleted;
 
+    @TableField(exist = false)
+    private String nickname;
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyChangeDetailService.java

@@ -1,10 +1,12 @@
 package com.njzscloud.supervisory.money.service;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.security.util.SecurityUtil;
 import com.njzscloud.supervisory.money.mapper.MoneyChangeDetailMapper;
 import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +26,8 @@ public class MoneyChangeDetailService extends ServiceImpl<MoneyChangeDetailMappe
      * 新增
      */
     public void add(MoneyChangeDetailEntity moneyChangeDetailEntity) {
+        moneyChangeDetailEntity.setUserId(SecurityUtil.currentUserId());
+        moneyChangeDetailEntity.setNewMoney(moneyChangeDetailEntity.getOldMoney().add(moneyChangeDetailEntity.getDelta()));
         this.save(moneyChangeDetailEntity);
     }
 
@@ -53,7 +57,9 @@ public class MoneyChangeDetailService extends ServiceImpl<MoneyChangeDetailMappe
      * 分页查询
      */
     public PageResult<MoneyChangeDetailEntity> paging(PageParam pageParam, MoneyChangeDetailEntity moneyChangeDetailEntity) {
-        return PageResult.of(this.page(pageParam.toPage(), Wrappers.<MoneyChangeDetailEntity>query(moneyChangeDetailEntity)));
+        Page<MoneyChangeDetailEntity> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        IPage<MoneyChangeDetailEntity> result = baseMapper.page(page, moneyChangeDetailEntity);
+        return PageResult.of(result);
     }
 
 }

njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml

@@ -2,5 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.njzscloud.supervisory.money.mapper.MoneyChangeDetailMapper">
-
+    <!-- 分页查询资金账户（关联用户或企业信息） -->
+    <select id="page" resultType="com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity">
+        SELECT
+        mcd.id,
+        mcd.user_id,
+        mcd.money_account_id,
+        mcd.old_money,
+        mcd.delta,
+        mcd.new_money,
+        mcd.money_change_category,
+        mcd.extend_info,
+        mcd.memo,
+        mcd.creator_id,
+        mcd.modifier_id,
+        mcd.create_time,
+        mcd.modify_time,
+        mcd.deleted,
+        u.nickname
+        FROM money_change_detail mcd
+        LEFT JOIN sys_user u ON mcd.user_id = u.id
+        <where>
+            <if test="entity.nickname != null and entity.nickname != ''">
+                AND u.nickname LIKE CONCAT('%', #{entity.nickname}, '%')
+            </if>
+            <if test="entity.moneyChangeCategory != null">
+                AND mcd.money_change_category = #{entity.moneyChangeCategory}
+            </if>
+        </where>
+        ORDER BY mcd.modify_time DESC
+    </select>
 </mapper>