lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lzq:1b2687a4411f27633b6625badb2c6f4b2288bda8
Branches Tags
lzq:dev
lzq:master
lzq:localizer
..
compare: lzq:1fa1db7381251ce0804ea5dcacddf7090c4bb9d7
Branches Tags
lzq:dev
lzq:master
lzq:localizer

No commits in common. "1b2687a4411f27633b6625badb2c6f4b2288bda8" and "1fa1db7381251ce0804ea5dcacddf7090c4bb9d7" have entirely different histories.
1b2687a441 ... 1fa1db7381

7 changed files with 4 additions and 81 deletions
Show Stats Expand all files Collapse all files

9
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyBillController.java
View File

@ -4,6 +4,7 @@ import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity;
import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity;
import com.njzscloud.supervisory.money.pojo.param.RebuildBillParam;
import com.njzscloud.supervisory.money.service.MoneyBillService;
import lombok.RequiredArgsConstructor;
@ -68,14 +69,6 @@ public class MoneyBillController {
return R.success(moneyBillService.paging(pageParam, moneyBillEntity));
}
/**
* 根据清运公司ID分页查询
*/
@GetMapping("/selectPagingByStationId")
public R<PageResult<MoneyBillEntity>> selectPagingByStationId(PageParam pageParam, MoneyBillEntity moneyBillEntity) {
return R.success(moneyBillService.selectPagingByStationId(pageParam, moneyBillEntity));
}
/**
* 重新生成账单
*/

9
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java
View File

@ -4,7 +4,6 @@ import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity;
import com.njzscloud.supervisory.money.pojo.result.MoneyChangeDetailExportResult;
import com.njzscloud.supervisory.money.service.MoneyChangeDetailService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -68,14 +67,6 @@ public class MoneyChangeDetailController {
return R.success(moneyChangeDetailService.paging(pageParam, moneyChangeDetailEntity));
}
/**
* 根据清运公司查询资金明细接口
*/
@GetMapping("/selectPagingByCompanyId")
public R<PageResult<MoneyChangeDetailExportResult>> selectPagingByCompanyId(PageParam pageParam, MoneyChangeDetailEntity entity) {
return R.success(moneyChangeDetailService.selectPagingByCompanyId(pageParam, entity));
}
/**
* 导出资金明细
*/

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

@ -1,10 +1,12 @@
package com.njzscloud.supervisory.money.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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 com.njzscloud.supervisory.money.pojo.result.MoneyChangeDetailExportResult;
import com.njzscloud.supervisory.order.pojo.result.OrderPagingResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -22,5 +24,4 @@ public interface MoneyChangeDetailMapper extends BaseMapper<MoneyChangeDetailEnt
List<MoneyChangeDetailExportResult> exportList(@Param("entity") MoneyChangeDetailEntity entity);
IPage<MoneyChangeDetailExportResult> exportList(Page<MoneyChangeDetailExportResult> page, @Param("entity") MoneyChangeDetailEntity entity);
}

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

@ -109,16 +109,4 @@ public class MoneyChangeDetailEntity {
@TableField(exist = false)
private String nickname;
/**
* 开始时间（用于时间范围查询）
*/
@TableField(exist = false)
private LocalDateTime startTime;
/**
* 结束时间（用于时间范围查询）
*/
@TableField(exist = false)
private LocalDateTime endTime;
}

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyBillService.java
View File

@ -5,14 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.money.mapper.MoneyBillMapper;
import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity;
import com.njzscloud.supervisory.money.pojo.param.RebuildBillParam;
import com.njzscloud.supervisory.order.utils.FileUtil;
import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -32,11 +28,8 @@ import java.util.Map;
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class MoneyBillService extends ServiceImpl<MoneyBillMapper, MoneyBillEntity> {
private final AuthMapper authMapper;
/**
* 新增
*/
@ -75,21 +68,6 @@ public class MoneyBillService extends ServiceImpl<MoneyBillMapper, MoneyBillEnti
return PageResult.of(result);
}
/**
* 根据清运公司ID分页查询
*/
public PageResult<MoneyBillEntity> selectPagingByStationId(PageParam pageParam, MoneyBillEntity moneyBillEntity) {
Page<MoneyBillEntity> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
Long userId = SecurityUtil.currentUserId();
SearchCompanyResult company = authMapper.selectCompanyInfo(userId);
IPage<MoneyBillEntity> result = new Page<>();
if (null != company) {
moneyBillEntity.setStationId(company.getId());
result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity);
}
return PageResult.of(result);
}
/**
* 重新生成账单
*/

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

@ -7,13 +7,10 @@ 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.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.money.mapper.MoneyChangeDetailMapper;
import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity;
import com.njzscloud.supervisory.money.pojo.result.MoneyChangeDetailExportResult;
import com.njzscloud.supervisory.order.utils.FileUtil;
import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -30,11 +27,8 @@ import java.util.Map;
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class MoneyChangeDetailService extends ServiceImpl<MoneyChangeDetailMapper, MoneyChangeDetailEntity> implements IService<MoneyChangeDetailEntity> {
private final AuthMapper authMapper;
/**
* 新增
*/
@ -75,18 +69,6 @@ public class MoneyChangeDetailService extends ServiceImpl<MoneyChangeDetailMappe
return PageResult.of(result);
}
public PageResult<MoneyChangeDetailExportResult> selectPagingByCompanyId(PageParam pageParam, MoneyChangeDetailEntity entity) {
Page<MoneyChangeDetailExportResult> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
Long userId = SecurityUtil.currentUserId();
SearchCompanyResult company = authMapper.selectCompanyInfo(userId);
IPage<MoneyChangeDetailExportResult> result = new Page<>();
if (null != company) {
entity.setCompanyId(company.getId());
result = baseMapper.exportList(page, entity);
}
return PageResult.of(result);
}
public void export(HttpServletResponse response, MoneyChangeDetailEntity entity) throws IOException {
List<MoneyChangeDetailExportResult> list = baseMapper.exportList(entity);
List<Map<String, Object>> downList = new ArrayList<>();

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

@ -54,9 +54,7 @@
ROUND( ocio.settle_weight / 1000, 2 ) AS settle_weight,
ocio.in_time,
ocio.out_time,
mcd.memo,
mcd.create_time,
sdi2.txt AS settlement_way
mcd.memo
FROM
money_change_detail mcd
LEFT JOIN order_info oi ON oi.id = mcd.order_id
@ -67,8 +65,6 @@
LEFT JOIN order_car_in_out ocio ON ocio.id = oi.car_in_out_id
LEFT JOIN sys_user u ON mcd.user_id = u.id
LEFT JOIN biz_company bc ON mcd.company_id = bc.id
LEFT JOIN sys_dict_item sdi2 ON oi.settlement_way = sdi2.val
AND sdi2.dict_key = 'settlement_way'
<where>
<if test="entity.nickname != null and entity.nickname != ''">
AND (u.nickname LIKE CONCAT('%', #{entity.nickname}, '%') or
@ -80,12 +76,6 @@
<if test="entity.companyId != null">
AND mcd.company_id = #{entity.companyId}
</if>
<if test="entity.startTime != null">
AND mcd.create_time &gt;= #{entity.startTime}
</if>
<if test="entity.endTime != null">
AND mcd.create_time &lt;= #{entity.endTime}
</if>
</where>
ORDER BY
mcd.create_time DESC