Skip to content

B
bailuntec-cost
Commit 0dc76b10 by huluobin
Options

Merge branch 'cost-check-flow-master' into cost-check-flow 

# Conflicts:
#	bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostApiController.java
parents 1e3030c8 a4b0c516
Showing with 424 additions and 170 deletions
bailuntec-cost-api/pom.xml
...@@ -81,6 +81,16 @@ ...@@ -81,6 +81,16 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
...@@ -104,18 +114,24 @@ ...@@ -104,18 +114,24 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<!-- omitted xml -->
<distributionManagement>
<repository>
<!--必须与 settings.xml 的 id 一致-->
<id>bailuntec-bailuntec-java-java</id>
<name>java</name>
<url>https://bailuntec-maven.pkg.coding.net/repository/bailuntec-java/java/</url>
</repository>
</distributionManagement>
</project> </project>
bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/CostApi.java
...@@ -6,58 +6,31 @@ import com.bailuntec.cost.api.dto.LogisticsCostDto; ...@@ -6,58 +6,31 @@ import com.bailuntec.cost.api.dto.LogisticsCostDto;
import com.bailuntec.cost.api.dto.ManageCostDto; import com.bailuntec.cost.api.dto.ManageCostDto;
import com.bailuntec.cost.api.dto.WageCostDto; import com.bailuntec.cost.api.dto.WageCostDto;
import com.bailuntec.cost.api.response.CostResult; import com.bailuntec.cost.api.response.CostResult;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@RestController @FeignClient(name = "bailuntec-cost-api", url = "http://api.fee.bailuntec.com/purchase/other/cost/api")
@FeignClient(name = "bailuntec-cost-api", url = "")
public interface CostApi { public interface CostApi {
/** @ApiOperation("接受工资单，自动生成付款费用单到财务审核")
* <p>
* 推送工资单到财务审核
* </p>
*
* @param wageCostDto 工资单入参
* @return 费用单No
*/
@PostMapping("/pushWageCost") @PostMapping("/pushWageCost")
CostResult<Void> pushWageCost(@RequestBody WageCostDto wageCostDto); CostResult<Void> pushWageCost(@RequestBody WageCostDto wageCostDto);
/** @ApiOperation("接收物流单，自动生成付款费用单到财务审核")
* 接收物流单，自动生成付款费用单到财务审核
*
* @return 费用单No
*/
@PostMapping("/pushLogisticsCost") @PostMapping("/pushLogisticsCost")
CostResult<Void> pushLogisticsCost(@RequestBody LogisticsCostDto logisticsCostDto); CostResult<Void> pushLogisticsCost(@RequestBody LogisticsCostDto logisticsCostDto);
/** @ApiOperation("吴通接收物流单，自动生成收款费用单到财务审核")
* 吴通
* 接收物流单，自动生成收款费用单到财务审核
*
* @return costNo
*/
@PostMapping("/pushLogisticsReceipt") @PostMapping("/pushLogisticsReceipt")
CostResult<Void> pushLogisticsReceipt(@RequestBody LogisticsCostDto logisticsCostDto); CostResult<Void> pushLogisticsReceipt(@RequestBody LogisticsCostDto logisticsCostDto);
/**
* 获取所有费用单和采购单 @ApiOperation("获取所有费用单和采购单")
*
* @param startDateStr date
* @param endDateStr date
* @param feeSuperType 大类
* @param feeSubType 小类
* @param companyValue 公司
* @param companyName 公司
* @param departmentName 部门
* @param createUserId 创建用户id
* @param payUserId 支付用户id
* @return 所有费用单和采购单
*/
@GetMapping("/manageCostList") @GetMapping("/manageCostList")
CostResult<List<ManageCostDto>> manageCostList(@RequestParam(name = "startDate", required = false) String startDateStr, CostResult<List<ManageCostDto>> manageCostList(@RequestParam(name = "startDate", required = false) String startDateStr,
@RequestParam(name = "endDate", required = false) String endDateStr, @RequestParam(name = "endDate", required = false) String endDateStr,
...@@ -69,20 +42,7 @@ public interface CostApi { ...@@ -69,20 +42,7 @@ public interface CostApi {
@RequestParam(name = "createUserId", required = false) Integer createUserId, @RequestParam(name = "createUserId", required = false) Integer createUserId,
@RequestParam(name = "payUserId", required = false) Integer payUserId); @RequestParam(name = "payUserId", required = false) Integer payUserId);
/** @ApiOperation("查询所有的物流费用单和采购单")
* 获取所有物流的费用单
*
* @param startDateStr date
* @param endDateStr date
* @param feeSuperType 大类
* @param feeSubType 小类
* @param companyValue 公司
* @param companyName 公司
* @param departmentName 部门
* @param createUserId 创建用户id
* @param payUserId 支付用户id
* @return 所有费用单和采购单
*/
@GetMapping("/logisticsCostList") @GetMapping("/logisticsCostList")
CostResult<List<ManageCostDto>> logisticsCostList(@RequestParam(name = "startDate", required = false) String startDateStr, CostResult<List<ManageCostDto>> logisticsCostList(@RequestParam(name = "startDate", required = false) String startDateStr,
@RequestParam(name = "endDate", required = false) String endDateStr, @RequestParam(name = "endDate", required = false) String endDateStr,
...@@ -94,20 +54,22 @@ public interface CostApi { ...@@ -94,20 +54,22 @@ public interface CostApi {
@RequestParam(name = "createUserId", required = false) Integer createUserId, @RequestParam(name = "createUserId", required = false) Integer createUserId,
@RequestParam(name = "payUserId", required = false) Integer payUserId); @RequestParam(name = "payUserId", required = false) Integer payUserId);
@ApiOperation("获取资产负债表相关费用单")
@GetMapping("/balanceSheetCost") @GetMapping("/balanceSheetCost")
CostResult<List<CostDto>> balanceSheetCostList(@RequestParam(name = "startDate") String startDateStr, CostResult<List<CostDto>> balanceSheetCostList(@RequestParam(name = "startDate") String startDateStr,
@RequestParam(name = "endDate") String endDateStr); @RequestParam(name = "endDate") String endDateStr);
@GetMapping("/noPayCost") @GetMapping("/noPayCost")
@ApiOperation("查询原来传输到数据中心时为待支付状态 变成 已支付状态后的费用单")
CostResult<List<CostDto>> getNoPayCost(@RequestParam(name = "costNoList") List<String> costNoList); CostResult<List<CostDto>> getNoPayCost(@RequestParam(name = "costNoList") List<String> costNoList);
/**
* 吴通新增 @ApiOperation("吴通新增 根据费用单号获取费用单大类")
* 根据费用单号获取费用单大类
*
* @param costNo 费用单号
* @return 费用大类
*/
@GetMapping("/type/{costNo}") @GetMapping("/type/{costNo}")
CostResult<String> getTypeName(@PathVariable("costNo") String costNo); CostResult<String> getTypeName(@PathVariable("costNo") String costNo);
@ApiOperation("获取费用系统列表")
@GetMapping({"/getCostList"})
CostResult<List<CostDto>> getCostList(@RequestParam(name = "startDate") String startDate,
@RequestParam(name = "endDate") String endDate);
} }
bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/CostListApi.java
...@@ -10,6 +10,6 @@ import org.springframework.cloud.openfeign.FeignClient; ...@@ -10,6 +10,6 @@ import org.springframework.cloud.openfeign.FeignClient;
* @author robbendev * @author robbendev
* @since 2020/10/12 9:32 上午 * @since 2020/10/12 9:32 上午
*/ */
@FeignClient(name = "bailuntec-cost-api", url = "") @FeignClient(name = "bailuntec-cost-list-api", url = "")
public interface CostListApi { public interface CostListApi {
} }
bailuntec-cost-core/other/BOOT-INF/classes/application-prod.yml 0 → 100644
spring:
datasource:
druid:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: "#7kfnymAM$Y9-Ntf"
type: org.apache.commons.dbcp.BasicDataSource
mybatis:
mapper-locations: classpath:mapper/*.xml
type-aliases-package: com.blt.other.other_cost.dto
configuration:
map-underscore-to-camel-case: true
pagehelper:
helper-dialect: mysql
reasonable: true
support-methods-arguments: true
params: count=countSql
logging:
file: other/log/other.log
level:
com.blt.other.other_cost.dao: debug
url:
api:
baseServerUrl: http://www.bailuntec.com
baseFinansysUrl: http://cw.bailuntec.com
getExchangeRateApi: ${url.api.baseServerUrl}/api/ExchangeRate/GetExchangeRate
# 获取耗材
getConsumablesApi: ${url.api.baseFinansysUrl}/Cashier/Cashier/BuyCashierRecordList
costTypeKind:
logisticsSubjectCode: 22222
bailuntec-cost-core/other/BOOT-INF/classes/application-test.yml 0 → 100644
spring:
datasource:
druid:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/bailun_other?useUnicode=true&characterEncoding=UTF-8&serverTimeZone=GMT&useSSL=false
username: root
password: root
filters: stat
initial-size: 1
min-idle: 1
max-active: 20
max-wait: -1
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
validation-query: SELECT 'x'
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20
thymeleaf:
prefix: classpath:/templates/
suffix: .html
cache: false
resources:
static-locations: classpath:/resources/, classpath:/static/
mybatis:
mapper-locations: classpath:mapper/*.xml
type-aliases-package: com.blt.other.other_database.model
configuration:
map-underscore-to-camel-case: true
pagehelper:
helper-dialect: mysql
reasonable: true
support-methods-arguments: true
params: count=countSql
logging:
file: other/log/other.log
costTypeKind:
logisticsSubjectCode: 22222
\ No newline at end of file
bailuntec-cost-core/other/BOOT-INF/classes/application.yml 0 → 100644
server:
port: 8085
servlet:
context-path: /logistic/fee
spring:
profiles:
active: prod
bailuntec-cost-core/other/BOOT-INF/classes/mapper/CostDic.xml 0 → 100644
<?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.blt.other.other_cost.dao.CostDicDao">
<update id="updateCostDicCny">
update cost set to_rmb_rate = 1 where dic = 'CNY' and to_rmb_rate != 1
</update>
<update id="updateCostDicOther">
update cost set to_rmb_rate = #{to_rmb_rate} where dic = #{dic} and to_rmb_rate = 1
</update>
<select id="selectCostDicGroupDic" resultType="java.util.Map">
select dic, to_rmb_rate from cost where dic != "CNY" and to_rmb_rate != 1 group by dic order by pay_time desc;
</select>
</mapper>
\ No newline at end of file
bailuntec-cost-core/other/META-INF/MANIFEST.MF 0 → 100644
Manifest-Version: 1.0
Implementation-Title: cost-core-copy
Implementation-Version: 0.0.1-SNAPSHOT
Start-Class: com.blt.other.CostCoreCopyApplication
Spring-Boot-Classes: BOOT-INF/classes/
Spring-Boot-Lib: BOOT-INF/lib/
Build-Jdk-Spec: 1.8
Spring-Boot-Version: 2.2.1.RELEASE
Created-By: Maven Archiver 3.4.0
Main-Class: org.springframework.boot.loader.JarLauncher
bailuntec-cost-core/other/META-INF/maven/com.blt/cost-core-copy/pom.properties 0 → 100644
version=0.0.1-SNAPSHOT
groupId=com.blt
artifactId=cost-core-copy
bailuntec-cost-core/other/META-INF/maven/com.blt/cost-core-copy/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.blt</groupId>
<artifactId>cost-core-copy</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>cost-core-copy</name>
<description>blt other purcharse</description>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<mybatis.version>3.4.1</mybatis.version>
<mybatis.spring.version>1.3.2</mybatis.spring.version>
<mysql.version>5.1.47</mysql.version>
<pagehelper.spring.boot.starter>1.2.5</pagehelper.spring.boot.starter>
<druid.spring.boot.starter>1.1.9</druid.spring.boot.starter>
<pagehelper>5.0.0</pagehelper>
<pagehelper.spring.boot.autoconfigure>1.2.5</pagehelper.spring.boot.autoconfigure>
<commons.io>2.4</commons.io>
<fastjson>1.2.47</fastjson>
</properties>
<dependencies>
<!-- fastjson begin -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson}</version>
</dependency>
<!-- fastjson end -->
<!-- spring boot 热部署-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<!-- spring boot 热部署-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis.spring.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- 分页插件 begin-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.spring.boot.starter}</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>${pagehelper}</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
<version>${pagehelper.spring.boot.autoconfigure}</version>
</dependency>
<!-- pagehelper end-->
<!-- alibaba druid 数据库连接池-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.spring.boot.starter}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
bailuntec-cost-core/pom.xml
...@@ -151,15 +151,24 @@ ...@@ -151,15 +151,24 @@
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.spring.boot.starter}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.1.2</version>
</dependency>
<!--spring boot自动配置--> <!--spring boot自动配置-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
bailuntec-cost-core/src/main/java/com/blt/other/common/config/MybatisPlusConfig.java
...@@ -2,9 +2,12 @@ package com.blt.other.common.config; ...@@ -2,9 +2,12 @@ package com.blt.other.common.config;
import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.github.pagehelper.PageHelper;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import java.util.Properties;
/** /**
* mybatis plus配置 * mybatis plus配置
* *
...@@ -13,20 +16,20 @@ import org.springframework.context.annotation.Configuration; ...@@ -13,20 +16,20 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class MybatisPlusConfig { public class MybatisPlusConfig {
/** @Bean
* mp分页配置 public PageHelper pageHelper() {
* PageHelper pageHelper = new PageHelper();
* @return Properties p = new Properties();
*/ p.setProperty("offsetAsPageNum", "true");
p.setProperty("rowBoundsWithCount", "true");
p.setProperty("reasonable", "true");
pageHelper.setProperties(p);
return pageHelper;
}
@Bean @Bean
public PaginationInterceptor paginationInterceptor() { public PaginationInterceptor paginationInterceptor() {
PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); return new PaginationInterceptor();
// 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false
paginationInterceptor.setOverflow(false);
// 设置最大单页限制数量，默认 500 条，-1 不受限制
// paginationInterceptor.setLimit(500);
// 开启 count 的 join 优化,只针对部分 left join
return paginationInterceptor;
} }
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostApiController.java
package com.blt.other.module.cost.controller.cost; package com.blt.other.module.cost.controller;
import com.bailuntec.cost.api.CostApi; import com.bailuntec.cost.api.CostApi;
import com.bailuntec.cost.api.dto.CostDto; import com.bailuntec.cost.api.dto.CostDto;
...@@ -31,6 +31,7 @@ public class CostApiController implements CostApi { ...@@ -31,6 +31,7 @@ public class CostApiController implements CostApi {
private static Logger logger = LoggerFactory.getLogger(CostApiController.class); private static Logger logger = LoggerFactory.getLogger(CostApiController.class);
@Override
@ApiOperation("接受工资单，自动生成付款费用单到财务审核") @ApiOperation("接受工资单，自动生成付款费用单到财务审核")
@PostMapping("/pushWageCost") @PostMapping("/pushWageCost")
public CostResult<Void> pushWageCost(@RequestBody WageCostDto wageCostDto) { public CostResult<Void> pushWageCost(@RequestBody WageCostDto wageCostDto) {
...@@ -45,6 +46,7 @@ public class CostApiController implements CostApi { ...@@ -45,6 +46,7 @@ public class CostApiController implements CostApi {
} }
@ApiOperation("接收物流单，自动生成付款费用单到财务审核") @ApiOperation("接收物流单，自动生成付款费用单到财务审核")
@Override
@PostMapping("/pushLogisticsCost") @PostMapping("/pushLogisticsCost")
public CostResult<Void> pushLogisticsCost(@RequestBody LogisticsCostDto logisticsCostDto) { public CostResult<Void> pushLogisticsCost(@RequestBody LogisticsCostDto logisticsCostDto) {
logger.warn("接收推送而来的物流单信息：" + logisticsCostDto); logger.warn("接收推送而来的物流单信息：" + logisticsCostDto);
...@@ -58,8 +60,8 @@ public class CostApiController implements CostApi { ...@@ -58,8 +60,8 @@ public class CostApiController implements CostApi {
} }
} }
@ApiOperation("吴通接收物流单，自动生成收款费用单到财务审核") @ApiOperation("吴通接收物流单，自动生成收款费用单到财务审核")
@Override
@PostMapping("/pushLogisticsReceipt") @PostMapping("/pushLogisticsReceipt")
public CostResult<Void> pushLogisticsReceipt(@RequestBody LogisticsCostDto logisticsCostDto) { public CostResult<Void> pushLogisticsReceipt(@RequestBody LogisticsCostDto logisticsCostDto) {
logger.info("接收推送而来的物流单信息：" + logisticsCostDto); logger.info("接收推送而来的物流单信息：" + logisticsCostDto);
...@@ -72,23 +74,9 @@ public class CostApiController implements CostApi { ...@@ -72,23 +74,9 @@ public class CostApiController implements CostApi {
} }
} }
/**
* <p>
* 查询所有的费用单和采购单
* </p>
*
* @param startDateStr 开始时间
* @param endDateStr 开始时间
* @param feeSuperType 大类
* @param feeSubType 小类
* @param companyValue 公司主体value
* @param companyName 主体名称
* @param departmentName 部门
* @param createUserId 创建用户id
* @param payUserId 支付用户id
* @return 单据
*/
@ApiOperation("查询所有的费用单和采购单") @ApiOperation("查询所有的费用单和采购单")
@Override
@GetMapping("/manageCostList") @GetMapping("/manageCostList")
public CostResult<List<ManageCostDto>> manageCostList(@RequestParam(name = "startDate", required = false) String startDateStr, public CostResult<List<ManageCostDto>> manageCostList(@RequestParam(name = "startDate", required = false) String startDateStr,
@RequestParam(name = "endDate", required = false) String endDateStr, @RequestParam(name = "endDate", required = false) String endDateStr,
...@@ -111,23 +99,8 @@ public class CostApiController implements CostApi { ...@@ -111,23 +99,8 @@ public class CostApiController implements CostApi {
} }
} }
/**
* <p>
* 查询所有的物流费用单和采购单
* </p>
*
* @param startDateStr 开始时间
* @param endDateStr 开始时间
* @param feeSuperType 大类
* @param feeSubType 小类
* @param companyValue 公司主体value
* @param companyName 主体名称
* @param departmentName 部门
* @param createUserId 创建用户id
* @param payUserId 支付用户id
* @return 单据
*/
@ApiOperation("查询所有的物流费用单和采购单") @ApiOperation("查询所有的物流费用单和采购单")
@Override
@GetMapping("/logisticsCostList") @GetMapping("/logisticsCostList")
public CostResult<List<ManageCostDto>> logisticsCostList(@RequestParam(name = "startDate", required = false) String startDateStr, public CostResult<List<ManageCostDto>> logisticsCostList(@RequestParam(name = "startDate", required = false) String startDateStr,
@RequestParam(name = "endDate", required = false) String endDateStr, @RequestParam(name = "endDate", required = false) String endDateStr,
...@@ -148,19 +121,21 @@ public class CostApiController implements CostApi { ...@@ -148,19 +121,21 @@ public class CostApiController implements CostApi {
e.printStackTrace(); e.printStackTrace();
return CostResult.error(); return CostResult.error();
} }
}
@ApiOperation("根据最后更新时间查询费用单")
@Override
@GetMapping({"/getCostList"})
public CostResult<List<CostDto>> getCostList(@RequestParam String startDate,
@RequestParam String endDate) {
List<CostDto> costDtoList = this.costApiService.getCostList(startDate, endDate);
return CostResult.success(costDtoList);
} }
/**
* <p>
* 获取资产负债表相关费用单
* </p>
*
* @param startDateStr 开始时间
* @param endDateStr 结束时间
* @return 资产负债表相关费用单
*/
@ApiOperation("获取资产负债表相关费用单") @ApiOperation("获取资产负债表相关费用单")
@Override
@GetMapping("/balanceSheetCost") @GetMapping("/balanceSheetCost")
public CostResult<List<CostDto>> balanceSheetCostList(@RequestParam(name = "startDate") String startDateStr, public CostResult<List<CostDto>> balanceSheetCostList(@RequestParam(name = "startDate") String startDateStr,
@RequestParam(name = "endDate") String endDateStr) { @RequestParam(name = "endDate") String endDateStr) {
...@@ -178,14 +153,8 @@ public class CostApiController implements CostApi { ...@@ -178,14 +153,8 @@ public class CostApiController implements CostApi {
} }
} }
/**
* <p> @Override
* 查询原来传输到数据中心时为待支付状态 变成 已支付状态后的费用单
* </p>
*
* @param costNoList 费用单号
* @return 费用单
*/
@ApiOperation("查询原来传输到数据中心时为待支付状态 变成 已支付状态后的费用单") @ApiOperation("查询原来传输到数据中心时为待支付状态 变成 已支付状态后的费用单")
@GetMapping("/noPayCost") @GetMapping("/noPayCost")
public CostResult<List<CostDto>> getNoPayCost(@RequestParam(name = "costNoList") List<String> costNoList) { public CostResult<List<CostDto>> getNoPayCost(@RequestParam(name = "costNoList") List<String> costNoList) {
...@@ -197,14 +166,9 @@ public class CostApiController implements CostApi { ...@@ -197,14 +166,9 @@ public class CostApiController implements CostApi {
} }
} }
/**
* 吴通新增 @Override
* 根据费用单号获取费用单大类 @ApiOperation("吴通新增 根据费用单号获取费用单大类")
*
* @param costNo 费用单号
* @return 费用单大类
*/
@ApiOperation("根据费用单号获取费用单大类")
@GetMapping("/type/{costNo}") @GetMapping("/type/{costNo}")
public CostResult<String> getTypeName(@PathVariable("costNo") String costNo) { public CostResult<String> getTypeName(@PathVariable("costNo") String costNo) {
// 获取费用单详细信息 // 获取费用单详细信息
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dao/CostDao.java
...@@ -90,22 +90,43 @@ public interface CostDao { ...@@ -90,22 +90,43 @@ public interface CostDao {
/** /**
* 查询管理成本费用列表，付款单+借还单 * 查询管理成本费用列表，付款单+借还单
* *
* @param startDate * @param startDate startDate
* @param endDate * @param endDate endDate
* @param feeSuperType * @param feeSuperType feeSuperType
* @param feeSubType * @param feeSubType feeSubType
* @param companyValueList * @param companyValueList companyValueList
* @param companyName * @param companyName companyName
* @param departmentName * @param departmentName departmentName
* @param createUserId * @param createUserId createUserId
* @param payUserId * @param payUserId payUserId
* @return * @return
*/ */
List<ManageCostDto> selectManageCost(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("feeSuperType") String feeSuperType, List<ManageCostDto> selectManageCost(@Param("startDate") Date startDate,
@Param("feeSubType") String feeSubType, @Param("companyValueList") List<Integer> companyValueList, @Param("endDate") Date endDate,
@Param("companyName") String companyName, @Param("departmentName") String departmentName, @Param("feeSuperType") String feeSuperType,
@Param("createUserId") Integer createUserId, @Param("payUserId") Integer payUserId); @Param("feeSubType") String feeSubType,
@Param("companyValueList") List<Integer> companyValueList,
@Param("companyName") String companyName,
@Param("departmentName") String departmentName,
@Param("createUserId") Integer createUserId,
@Param("payUserId") Integer payUserId);
/**
* <p>
* 查询所有的物流费用单和采购单
* </p>
*
* @param startDate startDate
* @param endDate endDate
* @param feeSuperType feeSuperType
* @param feeSubType feeSubType
* @param companyValueList companyValueList
* @param companyName companyName
* @param departmentName departmentName
* @param createUserId createUserId
* @param payUserId payUserId
* @return
*/
List<ManageCostDto> getLogisticsCostList(@Param("startDate") Date startDate, List<ManageCostDto> getLogisticsCostList(@Param("startDate") Date startDate,
@Param("endDate") Date endDate, @Param("endDate") Date endDate,
@Param("feeSuperType") String feeSuperType, @Param("feeSuperType") String feeSuperType,
...@@ -142,4 +163,6 @@ public interface CostDao { ...@@ -142,4 +163,6 @@ public interface CostDao {
List<String> listCostNoAll(CostExportVo costExportVo); List<String> listCostNoAll(CostExportVo costExportVo);
Integer updateCashierAnnex(@Param("costNo") String costNo, @Param("filePath") String filePath, @Param("downloadUrl") String downloadUrl); Integer updateCashierAnnex(@Param("costNo") String costNo, @Param("filePath") String filePath, @Param("downloadUrl") String downloadUrl);
List<CostDto> getCostList(@Param("startDate") String startDate, @Param("endDate") String endDate);
} }
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/CostApiService.java
package com.blt.other.module.cost.service; package com.blt.other.module.cost.service;
import com.bailuntec.cost.api.dto.CostDto;
import com.bailuntec.cost.api.dto.LogisticsCostDto; import com.bailuntec.cost.api.dto.LogisticsCostDto;
import com.bailuntec.cost.api.dto.ManageCostDto; import com.bailuntec.cost.api.dto.ManageCostDto;
import com.bailuntec.cost.api.dto.WageCostDto; import com.bailuntec.cost.api.dto.WageCostDto;
...@@ -88,4 +89,15 @@ public interface CostApiService { ...@@ -88,4 +89,15 @@ public interface CostApiService {
* @return 费用单costNo * @return 费用单costNo
*/ */
String pushWageCost(WageCostDto wageCostDto) throws IOException; String pushWageCost(WageCostDto wageCostDto) throws IOException;
/**
* <p>
* 根据最后更新时间获取费用单
* </p>
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return 费用单list
*/
List<CostDto> getCostList(String startDate, String endDate);
} }
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/CostApiServiceImpl.java
...@@ -352,4 +352,9 @@ public class CostApiServiceImpl implements CostApiService { ...@@ -352,4 +352,9 @@ public class CostApiServiceImpl implements CostApiService {
return costNo; return costNo;
} }
@Override
public List<CostDto> getCostList(String startDate, String endDate) {
return this.costDao.getCostList(startDate, endDate);
}
} }
bailuntec-cost-core/src/main/resources/application-prod.yml
...@@ -3,6 +3,7 @@ spring: ...@@ -3,6 +3,7 @@ spring:
datasource: datasource:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# url: jdbc:mysql://10.0.8.15:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username: root username: root
password: "#7kfnymAM$Y9-Ntf" password: "#7kfnymAM$Y9-Ntf"
......
bailuntec-cost-core/src/main/resources/mapper/Cost.xml
...@@ -342,8 +342,8 @@ ...@@ -342,8 +342,8 @@
FROM user u, cost c, cost_detail d, type_relation t FROM user u, cost c, cost_detail d, type_relation t
WHERE c.create_userid = u.userid AND c.cost_no = d.cost_no AND t.fee_type = c.type_name AND c.cost_form = 1 AND WHERE c.create_userid = u.userid AND c.cost_no = d.cost_no AND t.fee_type = c.type_name AND c.cost_form = 1 AND
c.cost_status = 4 c.cost_status = 4
AND c.logistics_supplier_id is null AND c.company_value in AND c.logistics_supplier_id is null AND c.company_value in (1,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND
(1,3,5,7,8,11,46,48,50,53,59,60,61,66,69,72,67,58,54,74,46) AND d.kind_name not in ('百伦咨询服务费') d.kind_name not in ('百伦咨询服务费')
<if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if> <if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if>
<if test="feeSubType != null and feeSubType != ''">AND d.kind_name = #{feeSubType}</if> <if test="feeSubType != null and feeSubType != ''">AND d.kind_name = #{feeSubType}</if>
<if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if> <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
...@@ -379,13 +379,11 @@ ...@@ -379,13 +379,11 @@
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0">#{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if> <if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if>
<if test="createUserId != null and createUserId != ''">AND c1.create_userid = #{createUserId}</if> <if test="createUserId != null and createUserId != ''">AND c1.create_userid = #{createUserId}</if>
<if test="payUserId != null and payUserId != ''">AND c1.pay_user_id = #{payUserId}</if> <if test="payUserId != null and payUserId != ''">AND c1.pay_user_id = #{payUserId}</if>
<if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form
manageCostType,u.departmentname1 departmentName, manageCostType,u.departmentname1 departmentName,
...@@ -394,8 +392,7 @@ ...@@ -394,8 +392,7 @@
-c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId -c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId
FROM user u, type_relation t ,cost c1 FROM user u, type_relation t ,cost c1
WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4 WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4
AND c1.company_value in (1,3,5,7,8,11,46,48,50,53,59,60,61,66,69,72,67,58,54,74,46) AND c1.kind_name not in AND c1.company_value in (1,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND c1.kind_name not in ('百伦咨询服务费')
('百伦咨询服务费')
AND exists (SELECT 1 FROM cost c2 WHERE c1.company_value = c2.company_value AND c1.type_name = c2.type_name AND exists (SELECT 1 FROM cost c2 WHERE c1.company_value = c2.company_value AND c1.type_name = c2.type_name
AND c2.create_userid = u.userid AND t.fee_type = c2.type_name AND c2.cost_form = 1 AND c2.cost_status = 4 AND c2.create_userid = u.userid AND t.fee_type = c2.type_name AND c2.cost_form = 1 AND c2.cost_status = 4
AND c2.logistics_supplier_id is null) AND c2.logistics_supplier_id is null)
...@@ -422,8 +419,7 @@ ...@@ -422,8 +419,7 @@
FROM user u, cost c, type_relation t FROM user u, cost c, type_relation t
WHERE c.create_userid = u.userid AND t.fee_type = c.type_name AND c.cost_form = 3 AND c.is_lend = 2 AND WHERE c.create_userid = u.userid AND t.fee_type = c.type_name AND c.cost_form = 3 AND c.is_lend = 2 AND
c.cost_status = 4 c.cost_status = 4
AND c.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69,72,67,58,54,74,46) AND c.kind_name not in AND c.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND c.kind_name not in ('百伦咨询服务费')
('百伦咨询服务费')
<if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if> <if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if>
<if test="feeSubType != null and feeSubType != ''">AND c.kind_name = #{feeSubType}</if> <if test="feeSubType != null and feeSubType != ''">AND c.kind_name = #{feeSubType}</if>
<if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if> <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
...@@ -444,8 +440,7 @@ ...@@ -444,8 +440,7 @@
b.company_value companyValue,b.company companyName,b.sku_type_name feeSuperType,b.sku_type_name feeSubType, b.company_value companyValue,b.company companyName,b.sku_type_name feeSuperType,b.sku_type_name feeSubType,
b.amount amount,'CNY',b.amount amountRmb, 0 as costId1, b.id as costId b.amount amount,'CNY',b.amount amountRmb, 0 as costId1, b.id as costId
FROM buy b FROM buy b
WHERE b.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69,72,67,58,54,74,46) AND b.sku_type_name in WHERE b.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND b.sku_type_name in ('固定资产','低值易耗品')
('固定资产','低值易耗品')
and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3 and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3
<if test="feeSuperType != null and feeSuperType != ''">AND b.sku_type_name = #{feeSuperType}</if> <if test="feeSuperType != null and feeSuperType != ''">AND b.sku_type_name = #{feeSuperType}</if>
<if test="feeSubType != null and feeSubType != ''">AND b.sku_type_name = #{feeSubType}</if> <if test="feeSubType != null and feeSubType != ''">AND b.sku_type_name = #{feeSubType}</if>
...@@ -463,12 +458,13 @@ ...@@ -463,12 +458,13 @@
</select> </select>
<!--查询所有的物流费用单和采购单-->
<select id="getLogisticsCostList" resultType="com.bailuntec.cost.api.dto.ManageCostDto"> <select id="getLogisticsCostList" resultType="com.bailuntec.cost.api.dto.ManageCostDto">
SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form
manageCostType,u.departmentname1 departmentName, manageCostType,u.departmentname1 departmentName,
c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,d.kind_name c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,d.kind_name
feeSubType,d.amount amount,c.dic currency, feeSubType,d.amount amount,c.dic currency,
d.amount * c.to_rmb_rate amountRmb d.amount * c.to_rmb_rate amountRmb, d.id as costId1, c.id as costId
FROM user u, cost c, cost_detail d, type_relation t FROM user u, cost c, cost_detail d, type_relation t
WHERE c.create_userid = u.userid AND c.cost_no = d.cost_no AND t.fee_type = c.type_name AND c.cost_form = 1 AND WHERE c.create_userid = u.userid AND c.cost_no = d.cost_no AND t.fee_type = c.type_name AND c.cost_form = 1 AND
c.cost_status = 4 c.cost_status = 4
...@@ -480,18 +476,18 @@ ...@@ -480,18 +476,18 @@
manageCostType,u.departmentname1 departmentName, manageCostType,u.departmentname1 departmentName,
c1.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name c1.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name
feeSubType,-c1.amount amount,c1.dic currency, feeSubType,-c1.amount amount,c1.dic currency,
-c1.amount * c1.to_rmb_rate amountRmb -c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId
FROM user u, type_relation t ,cost c1 FROM user u, type_relation t ,cost c1
WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4 WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4
AND d.kind_name = '物流费' AND c1.kind_name = '物流费'
<if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c.cost_no no,c.bank_company receiveUnit,c.cost_reason reason,c.pay_time payTime,c.cost_form SELECT c.cost_no no,c.bank_company receiveUnit,c.cost_reason reason,c.pay_time payTime,c.cost_form
manageCostType,u.departmentname1 departmentName, manageCostType,u.departmentname1 departmentName,
c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,c.kind_name c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,c.kind_name
feeSubType,c.amount amount,c.dic currency, feeSubType,c.amount amount,c.dic currency,
c.amount * c.to_rmb_rate amountRmb c.amount * c.to_rmb_rate amountRmb, 0 as costId1, c.id as costId
FROM user u, cost c, type_relation t FROM user u, cost c, type_relation t
WHERE c.create_userid = u.userid AND t.fee_type = c.type_name AND c.cost_form = 3 AND c.is_lend = 2 AND WHERE c.create_userid = u.userid AND t.fee_type = c.type_name AND c.cost_form = 3 AND c.is_lend = 2 AND
c.cost_status = 4 c.cost_status = 4
...@@ -502,11 +498,13 @@ ...@@ -502,11 +498,13 @@
SELECT b.buyno no,b.suppliername receiveUnit,b.note reason,b.pay_time payTime,0 as SELECT b.buyno no,b.suppliername receiveUnit,b.note reason,b.pay_time payTime,0 as
manageCostType,b.departmentname departmentName, manageCostType,b.departmentname departmentName,
b.company_value companyValue,b.company companyName,b.sku_type_name feeSuperType,b.sku_type_name feeSubType, b.company_value companyValue,b.company companyName,b.sku_type_name feeSuperType,b.sku_type_name feeSubType,
b.amount amount,'CNY',b.amount amountRmb FROM buy b b.amount amount,'CNY',b.amount amountRmb, 0 as costId1, 0 as costId
FROM buy b
WHERE b.sku_type_name = '物流费' WHERE b.sku_type_name = '物流费'
and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3 and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3
<if test="startDate != null">AND b.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND b.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND b.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND b.pay_time <![CDATA[<]]>#{endDate}</if>
</select> </select>
<!-- <!--
...@@ -633,7 +631,13 @@ ...@@ -633,7 +631,13 @@
OR OR
company_name LIKE CONCAT('%',#{params.key},'%')) company_name LIKE CONCAT('%',#{params.key},'%'))
</if> </if>
</select>
<select id="getCostList" resultType="com.bailuntec.cost.api.dto.CostDto">
select *
from cost
where last_modify_date &gt;= #{startDate}
and last_modify_date &lt;= #{endDate}
</select> </select>
<update id="updateCashierAnnex"> <update id="updateCashierAnnex">
......
bailuntec-cost-core/src/main/shell/deploy-miniapp-prod.sh
...@@ -4,7 +4,7 @@ git pull ...@@ -4,7 +4,7 @@ git pull
# 拉取开发分支代码 # 拉取开发分支代码
git checkout cost-check-flow-master git checkout cost-check-flow-master
#打包 #打包
mvn clean package -Dmaven.test.skip=true -Dmaven.compile.fork=true mvn clean package -U -Dmaven.test.skip=true -Dmaven.compile.fork=true
# kill测试进程 # kill测试进程
# shellcheck disable=SC2009 # shellcheck disable=SC2009
ps -ef | grep cost-core | grep -v grep | grep prod | awk '{print $2}' | xargs kill -9 ps -ef | grep cost-core | grep -v grep | grep prod | awk '{print $2}' | xargs kill -9
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment