Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
6d5d50a74f
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java
  2. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  3. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java
  4. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
  5. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingQuery.java
  6. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  7. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java
  8. 13
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
  9. 64
      anrui-reportcenter/anrui-reportcenter-api/pom.xml
  10. 37
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReport.java
  11. 143
      anrui-reportcenter/anrui-reportcenter-biz/pom.xml
  12. 23
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java
  13. 35
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/config/Swagger2Config.java
  14. 33
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-devv.yml
  15. 31
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-pro.yml
  16. 32
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-test.yml
  17. 62
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application.yml
  18. 13
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/banner.txt
  19. 50
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/logback-spring.xml
  20. 26
      anrui-reportcenter/pom.xml
  21. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
  22. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java
  23. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java
  24. 295
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java

@ -32,6 +32,10 @@ public class BaseVehicleState extends BaseEntity {
private String carryVehicleState;
@ApiModelProperty("欠款开票状态")
private String carryInvoiceState;
@ApiModelProperty("开票申请状态:未发起过0,审批通过的为1,审批不通过为改为0,审批中的为2,驳回或撤回到发起人修改为0,默认为0,提交时需要判断是否已发起开票申请流程")
private String invoiceApplyState;
@ApiModelProperty("资方终审:0未通过,1通过,贷款资方终审通过时设置为1")
private String manageState;
@ApiModelProperty("包牌业务")
private String packageBusiness;
@ApiModelProperty("合同状态")

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@ -39,6 +39,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
baseVehicleState.setFinState("0");
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
baseVehicleState.setInvoiceApplyState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@ -116,6 +117,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
baseVehicleState.setFinState("0");
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
baseVehicleState.setInvoiceApplyState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@ -131,6 +133,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
baseVehicleState.setInvoiceApplyState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@ -145,6 +148,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
//欠款提车提交后,将提车状态修改为1,0为未提交过,1为审核通过,2为审核中
baseVehicleState.setCarryVehicleState("2");
baseVehicleState.setFinState("0");
baseVehicleState.setInvoiceApplyState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_2.getStateKey());

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java

@ -64,6 +64,10 @@ public class AppDeliveredApplyDto implements Dto {
@ApiModelProperty("车辆集合")
private List<AppCarListVo> carList;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoiceKey;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoice;
/* @ApiModelProperty("记录sid")
private String sid;

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java

@ -121,6 +121,8 @@ public class BusDeliveredApply extends BaseEntity {
private String orgSidPath;
@ApiModelProperty("是否开票(0开票,1不开票)")
private String isInvoicing;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoiceKey;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoice;
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingQuery.java

@ -64,4 +64,5 @@ public class BusValcustFilingQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
private String menuUrl;
private String menuSid;
}

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -2533,6 +2533,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
String sid = resultBean.getData();
busDeliveredApply = fetchBySid(sid);
if ("1".equals(dto.getHasInvoiceKey())){
BusBillApplicationDetailsVo busBillApplicationDetailsVo = busBillApplicationService.fetchDetailByCkSid(sid);
if (busBillApplicationDetailsVo == null){
return rb.setMsg("未保存开票信息,无法提交");
}
}
String orgSidPath = "";
if (StringUtils.isNotBlank(busDeliveredApply.getOrgSidPath())) {
orgSidPath = busDeliveredApply.getOrgSidPath();

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@ -97,6 +97,6 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
String fetchByVehSid(String vinSid);
@Select("SELECT COUNT(*) FROM bus_delivered_apply_details WHERE vinSid = #{vinSid} AND isDelete = 0")
@Select("SELECT count(*) FROM bus_delivered_apply_details bd left join bus_delivered_apply ba on ba.sid = bd.applySid WHERE bd.vinSid = #{vinSid} AND bd.isDelete = 0 and ba.nodeState != '终止'")
int fetchByIsDeleteVinSid(String vinSid);
}

13
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@ -704,6 +704,14 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
log.info("抄送失败:没有获取到业务参数!");
return rb.setMsg("抄送失败!");
}
//
String assignee = (String) processVariables.get("assignee");
ResultBean<SysUserVo> stringResultBean = sysUserFeign.fetchBySid(assignee);
String assigneeName = "";
if(stringResultBean.getData() != null){
assigneeName= stringResultBean.getData().getName();
}
Map<String, Object> app = new HashMap<>();
if (processVariables.get("app") != null) {
app = (Map<String, Object>) processVariables.get("app");
@ -711,8 +719,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
log.info("抄送方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance));
mfq.setAppMap(app);
mfq.setBusinessSid(bv.getBusinessSid());
mfq.setMsgContent("系统抄送的流程审批,请查看");
mfq.setMsgContent(assigneeName+"抄送的流程审批,请查看");
// act_re_procdef
Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
log.info("抄送成功-process:{}", process);
@ -739,6 +746,8 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
userSids.deleteCharAt(userSids.length() - 1);
mfq.setUserSids(userSids.toString());
mfq.setOrgPath(createrOrgPath);
mfq.setUserSid(assignee);
mfq.setApplicationName(assigneeName);
ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
log.info("抄送成功:{}", userName.toString());
log.info("抄送成功-resultBean:{}", resultBean);

64
anrui-reportcenter/anrui-reportcenter-api/pom.xml

@ -0,0 +1,64 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
<!-- <parent>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-reportcenter</artifactId>
<version>0.0.1</version>
</parent>-->
<modelVersion>4.0.0</modelVersion>
<artifactId>anrui-reportcenter-api</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>com.yxt</groupId>
<artifactId>yxt-common-core</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>nexus-releases</id>
<url>http://172.18.0.3:8081/repository/yxt-mvn-releases/</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<url>http://172.18.0.3:8081/repository/yxt-mvn-snapshot/</url>
</snapshotRepository>
</distributionManagement>
</project>

37
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReport.java

@ -0,0 +1,37 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/25
**/
@Data
public class DailyReport {
private int id;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("事业部sid")
private String busOrgSid;
@ApiModelProperty("事业部名称")
private String busOrgName;
private String brandSid;
@ApiModelProperty("品牌名称")
private String brandName;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司sid")
private String useOrgName;
@ApiModelProperty("车型sid")
private String vehModelSid;
@ApiModelProperty("车型名称")
private String vehModeName;
@ApiModelProperty("配置sid")
private String vehMConfigSid;
@ApiModelProperty("配置名称")
private String vehMConfigName;
}

143
anrui-reportcenter/anrui-reportcenter-biz/pom.xml

@ -0,0 +1,143 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<version>0.0.1</version>
<relativePath/>
</parent>
<!-- <parent>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-reportcenter</artifactId>
<version>0.0.1</version>
</parent>-->
<modelVersion>4.0.0</modelVersion>
<artifactId>anrui-reportcenter-biz</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1</version>
<dependencies>
<dependency>
<artifactId>anrui-reportcenter-api</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yxt</groupId>
<artifactId>yxt-common-base</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>net.dongliu</groupId>
<artifactId>apk-parser</artifactId>
<version>2.6.10</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.6</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*Mapper.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.*</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</build>
</project>

23
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java

@ -0,0 +1,23 @@
package com.yxt.anrui.reportcenter;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
/**
* @author dimengzhe
*/
@SpringBootApplication(scanBasePackages = {
"com.yxt.common.base.config",
"com.yxt.anrui.reportcenter"
})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {})
public class ReportcenterApplication {
public static void main(String[] args) {
SpringApplication.run(ReportcenterApplication.class, args);
}
}

35
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/config/Swagger2Config.java

@ -0,0 +1,35 @@
package com.yxt.anrui.reportcenter.config;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
* @author dimengzhe
* @date 2020/9/9 16:42
* @description
*/
@Configuration
@EnableSwagger2
@EnableKnife4j
public class Swagger2Config {
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo()).select()
.apis(RequestHandlerSelectors.basePackage("com.yxt"))
.paths(PathSelectors.any()).build();
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder().title("安瑞/报表中心").description("报表中心接口").version("1.0")
.build();
}
}

33
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-devv.yml

@ -0,0 +1,33 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/anrui_reportcenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: root
password: root
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
redis:
database: 3 # Redis数据库索引(默认为0)
host: 127.0.0.1
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password: 123456
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: D:\\anrui\\upload\\
url:
prefix: http://192.168.1.108:8111/upload/
login:
path: D:\\images\\pic-click
config:
url:
prefix: http://192.168.1.108:8111/

31
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-pro.yml

@ -0,0 +1,31 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://120.46.172.184:3306/anrui_reportcenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
username: root
password: '@anrui18033887500'
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
redis:
database: 3 # Redis数据库索引(默认为0)
host: 127.0.0.1
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password: 123456
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: D:\anrui\upload\
url:
prefix: http://120.46.172.184/api/upload/
config:
url:
prefix: http://120.46.172.184/api/

32
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-test.yml

@ -0,0 +1,32 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://172.18.0.4:3306/anrui_reportcenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: root
password: yxt_mysql_138
cloud:
nacos:
discovery:
server-addr: 172.18.0.5:8848
redis:
database: 3 # Redis数据库索引(默认为0)
host: 172.18.0.7
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
url:
prefix: http://anrui.yyundong.com/upload/
config:
url:
prefix: http://anrui.yyundong.com

62
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application.yml

@ -0,0 +1,62 @@
spring:
application:
name: anrui-reportcenter
profiles:
active: devv
messages:
# 国际化资源文件路径
basename: i18n/messages
servlet:
#上传文件
multipart:
max-file-size: 50MB
max-request-size: 100MB
devtools:
restart:
# 热部署开关
enabled: true
mvc:
async:
request-timeout: 20000
server:
port: 7003
max-http-header-size: 102400
tomcat:
max-http-form-post-size: -1
#mybatis
mybatis-plus:
# 配置mapper的扫描,找到所有的mapper.xml映射文件
mapper-locations: classpath*:**Mapper.xml
global-config:
refresh: true
db-config:
#定义生成ID的类型
id-type: Auto
db-type: mysql
configuration:
map-underscore-to-camel-case: false
cache-enabled: true
call-setters-on-nulls: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#hystrix的超时时间
hystrix:
command:
default:
execution:
timeout:
enabled: true
isolation:
thread:
timeoutInMilliseconds: 60000
#ribbon的超时时间
ribbon:
ReadTimeout: 60000
ConnectTimeout: 60000

13
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/banner.txt

@ -0,0 +1,13 @@
,----.. ____
/ / \ ,' , `.
| : : ,---. ,-+-,.' _ | ,---. ,---,
. | ;. / ' ,'\ ,-+-. ; , || ' ,'\ ,-+-. / |
. ; /--` / / | ,--.'|' | || ,---. / / | ,--.'|' |
; | ; . ; ,. :| | ,', | |,/ \ . ; ,. :| | ,"' |
| : | ' | |: :| | / | |--'/ / | ' | |: :| | / | |
. | '___' | .; :| : | | , . ' / | ' | .; :| | | | |
' ; : .'| : || : | |/ ' ; /| | : || | | |/
' | '/ :\ \ / | | |`-' ' | / | \ \ / | | |--'
| : / `----' | ;/ | : | `----' | |/
\ \ .' '---' \ \ / '---'
`---` `----'

50
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/logback-spring.xml

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<property name="log.base" value="logs/anrui_reportcenter" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 :
|%blue(%thread) 线程 如 :DiscoveryClient-CacheRefreshExecutor-0-->
<!--<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>-->
<pattern>%yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n)
</pattern>
<!--<charset>UTF-8</charset> -->
</encoder>
</appender>
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<appender name="FILEOUT"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.base}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.base}.%d{yyyyMMdd}.%i.log.zip
</fileNamePattern>
<!-- 当文件大小超过10MB时触发滚动 -->
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>1MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<!--<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>-->
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}
-%msg%n</Pattern>
<!--<charset>UTF-8</charset> -->
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILEOUT" />
</root>
</configuration>

26
anrui-reportcenter/pom.xml

@ -0,0 +1,26 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>anrui-reportcenter</artifactId>
<modules>
<module>anrui-reportcenter-api</module>
<module>anrui-reportcenter-biz</module>
</modules>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1</version>
<packaging>pom</packaging>
<description>报表中心</description>
<parent>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui</artifactId>
<version>0.0.1</version>
</parent>
</project>

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@ -33,11 +33,21 @@ public interface InvoicedFeign {
@ResponseBody
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(@SpringQueryMap BillApplicationPageInfoQuery query);
@ApiOperation("手机端-初始化 出库开票/详情")
@GetMapping("/getInvoicedApply2")
@ResponseBody
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(@SpringQueryMap BillApplicationPageInfoQuery query);
@ApiOperation("移动端-保存开票申请")
@PostMapping("/saveInvoicedApplyInfo")
@ResponseBody
public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody BillApplicationIInfoDto dto);
@ApiOperation("移动端-保存出库开票")
@PostMapping("/saveInvoicedApplyInfo2")
@ResponseBody
public ResultBean saveInvoicedApplyInfo2(@Valid @RequestBody BillApplicationIInfoDto dto);
@ApiOperation("提交")
@PostMapping("/submitInvoicedInfo")
@ResponseBody

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java

@ -25,11 +25,21 @@ public class InvoicedFeignFallback implements InvoicedFeign {
return null;
}
@Override
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(BillApplicationPageInfoQuery query) {
return null;
}
@Override
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
return null;
}
@Override
public ResultBean saveInvoicedApplyInfo2(BillApplicationIInfoDto dto) {
return null;
}
@Override
public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
return null;

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java

@ -33,11 +33,21 @@ public class InvoicedRest implements InvoicedFeign {
return invoicedService.getInvoicedApply(query);
}
@Override
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(BillApplicationPageInfoQuery query) {
return invoicedService.getInvoicedApply2(query);
}
@Override
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
return invoicedService.saveInvoicedApplyInfo(dto);
}
@Override
public ResultBean saveInvoicedApplyInfo2(BillApplicationIInfoDto dto) {
return invoicedService.saveInvoicedApplyInfo2(dto);
}
@Override
public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
return invoicedService.submitInvoicedInfo(dto);

295
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -1,9 +1,26 @@
package com.yxt.anrui.terminal.biz.autoservice.invoiced;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign;
import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileDto;
import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileVo;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerDto;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleDto;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.fin.api.finbillapplication.*;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@ -13,10 +30,11 @@ import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.ItemEditTextInfo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.qkkpFlowListVo;
import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.*;
import com.yxt.common.base.utils.StringUtils;
@ -46,7 +64,16 @@ public class InvoicedService {
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BusBillApplicationFeign busBillApplicationFeign;
@Autowired
private BusDeliveredApplyFeign busDeliveredApplyFeign;
@Autowired
private BusDeliveredApplyDetailsFeign busDeliveredApplyDetailsFeign;
@Autowired
private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@Autowired
private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
ResultBean<PagerVo<BillApplicationPageVo>> rb = ResultBean.fireFail();
@ -202,6 +229,155 @@ public class InvoicedService {
return rb.success().setData(vo);
}
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(BillApplicationPageInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
//参数sid为出库sid
BillApplicationIInfoVo billApplicationIInfoVo = new BillApplicationIInfoVo();
BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(query.getSid()).getData();
BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(query.getSid()).getData();
if (data != null) {
billApplicationIInfoVo.setProcInsId(data.getProcInstSid());
billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney());
billApplicationIInfoVo.setOrgPath(data.getOrgSidPath());
billApplicationIInfoVo.setSaleType(data.getSaleTypeValue());
billApplicationIInfoVo.setSellerDept(data.getSaleDeptName());
billApplicationIInfoVo.setSellerName(data.getStaffName());
billApplicationIInfoVo.setInvoicingUnit(data.getOpenTickUnitName());
billApplicationIInfoVo.setName(data.getCustomerName());
billApplicationIInfoVo.setInvoiceMoney(data.getOneBillMoney());
billApplicationIInfoVo.setOpenTickTypeKey(data.getOpenTickTypeKey());
billApplicationIInfoVo.setOpenTickTypeValue(data.getOpenTickTypeValue());
billApplicationIInfoVo.setOpenTickSid(data.getOpenTickSid());
billApplicationIInfoVo.setOpenTickName(data.getOpenTickName());
billApplicationIInfoVo.setInvoiceStateKey(data.getBillStateKey());
billApplicationIInfoVo.setInvoiceState(data.getBillStateValue());
billApplicationIInfoVo.setContractId(data.getContractNo());
billApplicationIInfoVo.setDate(data.getApplyDate());
billApplicationIInfoVo.setUserSid(data.getCreateBySid());
billApplicationIInfoVo.setPublishInfo(data.getDeptName() + "-" + data.getCreateByName());
//根据合同查询销售订单
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(data.getContractNo()).getData();
billApplicationIInfoVo.setBusSalesOrderSid(busSalesOrder.getSid());
//车辆信息
List<VinListVo> vinListVos = new ArrayList<>();
List<BusBillVehicleVo> busBillVehicleVos = data.getBusBillVehicles();
for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
VinListVo vinListVo = new VinListVo();
vinListVo.setVin(busBillVehicleVo.getVinNo());
vinListVo.setVinSid(busBillVehicleVo.getVehSid());
vinListVo.setCertificateStateKey(busBillVehicleVo.getCertificateStateKey());
vinListVo.setCertificateState(busBillVehicleVo.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey());
vinListVo.setInvoiceType(busBillVehicleVo.getBillTypeValue());
vinListVo.setOpenTickSid(busBillVehicleVo.getOpenTickSid());
vinListVo.setInvoiceName(busBillVehicleVo.getOpenTickName());
vinListVo.setInvoiceInfo(busBillVehicleVo.getOpenTickRemarks());
vinListVo.setZcHgzImages(busBillVehicleVo.getCertificatePhoto());
vinListVos.add(vinListVo);
}
billApplicationIInfoVo.setVinList(vinListVos);
//挂车信息
List<BusBillTrailerVo> busBillTrailers = data.getBusBillTrailers();
List<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
if (busBillTrailers != null && busBillTrailers.size() > 0) {
for (BusBillTrailerVo busBillTrailerVo : busBillTrailers) {
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
BeanUtil.copyProperties(busBillTrailerVo, finBillTrailerVo);
List<String> hgzImageUrl = busBillTrailerVo.getHgzImageUrl();
finBillTrailerVo.setFiles(hgzImageUrl);
finBillTrailerVo.setOneBillMoney(busBillTrailerVo.getOneBillMoney());
finBillTrailerVos.add(finBillTrailerVo);
}
}
billApplicationIInfoVo.setFinBillTrailers(finBillTrailerVos);
//附件信息
List<BusBillFileVo> carBuyContractImages = data.getCarBuyContractImages();
List<BusBillFileVo> khkpsqsApplicationAppendxs = data.getKhkpsqsApplicationAppendxs();
List<BusBillFileVo> kpxxqrsApplicationAppendxs = data.getKpxxqrsApplicationAppendxs();
List<BusBillFileVo> cldjhtApplicationAppendxs = data.getCldjhtApplicationAppendxs();
List<BusBillFileVo> zjApplicationAppendxs = data.getZjApplicationAppendxs();
List<String> appCarBuyContractImages = new ArrayList<>();//客户开票申请书
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
List<String> idCardImages = new ArrayList<>();
if (carBuyContractImages.size() > 0) {
for (BusBillFileVo carBuyContractImage : carBuyContractImages) {
appCarBuyContractImages.add(carBuyContractImage.getFileUrl());
}
}
if (zjApplicationAppendxs.size() > 0) {
for (BusBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
idCardImages.add(zjApplicationAppendx.getFileUrl());
}
}
if (khkpsqsApplicationAppendxs.size() > 0) {
for (BusBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
}
}
if (kpxxqrsApplicationAppendxs.size() > 0) {
for (BusBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
}
}
if (cldjhtApplicationAppendxs.size() > 0) {
for (BusBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
}
}
billApplicationIInfoVo.setCarBuyContractImages(appCarBuyContractImages);
billApplicationIInfoVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
billApplicationIInfoVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
billApplicationIInfoVo.setRegisterContractImages(registerContractImages);
billApplicationIInfoVo.setIdCardImages(idCardImages);
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData();
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
billApplicationIInfoVo.setIsCanEdit(false);
billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
} else {
billApplicationIInfoVo.setIsCanEdit(true);
}
}else {
billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
billApplicationIInfoVo.setOrgPath(busDeliveredApply.getOrgSidPath());
billApplicationIInfoVo.setSaleType(busDeliveredApply.getPaymentMethodKey());
billApplicationIInfoVo.setSellerDept(busDeliveredApply.getPaymentMethod());
billApplicationIInfoVo.setSellerName(busDeliveredApply.getStaffName());
//开票单位
ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData();
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
billApplicationIInfoVo.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName());
}
}
billApplicationIInfoVo.setName(appOrderDetailsVo.getName());
billApplicationIInfoVo.setContractId(busDeliveredApply.getContractNo());
billApplicationIInfoVo.setDate(DateUtil.today());
billApplicationIInfoVo.setUserSid(busDeliveredApply.getCreateBySid());
billApplicationIInfoVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
//车辆信息
List<VinListVo> vinListVos = new ArrayList<>();
List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(query.getSid()).getData();
for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) {
VinListVo vinListVo = new VinListVo();
vinListVo.setVin(busDeliveredApplyDetail.getVinNo());
vinListVo.setVinSid(busDeliveredApplyDetail.getVinSid());
//合格证状态
BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetail.getVinSid()).getData();
if (baseVehicleCertificate != null) {
vinListVo.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
vinListVo.setCertificateState(baseVehicleCertificate.getCertificateStateValue());
}
vinListVos.add(vinListVo);
}
billApplicationIInfoVo.setVinList(vinListVos);
}
return rb.success().setData(billApplicationIInfoVo);
}
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
@ -317,6 +493,121 @@ public class InvoicedService {
return resultBean;
}
public ResultBean saveInvoicedApplyInfo2(BillApplicationIInfoDto billApplicationIInfoDto) {
BusBillApplicationDto busBillApplicationDto = new BusBillApplicationDto();
BeanUtil.copyProperties(billApplicationIInfoDto, busBillApplicationDto, "carBuyContractImages");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(billApplicationIInfoDto.getOrgPath()).getData();
busBillApplicationDto.setUseOrgSid(useOrgSid);
busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid());
busBillApplicationDto.setTotalBillMoney(billApplicationIInfoDto.getInvoiceTotal());
busBillApplicationDto.setOrgSidPath(billApplicationIInfoDto.getOrgPath());
busBillApplicationDto.setSaleTypeValue(billApplicationIInfoDto.getSaleType());
busBillApplicationDto.setSaleDeptName(billApplicationIInfoDto.getSellerDept());
busBillApplicationDto.setStaffName(billApplicationIInfoDto.getSellerName());
busBillApplicationDto.setOpenTickUnitName(billApplicationIInfoDto.getInvoicingUnit());
busBillApplicationDto.setCustomerName(billApplicationIInfoDto.getName());
busBillApplicationDto.setOneBillMoney(billApplicationIInfoDto.getInvoiceMoney());
busBillApplicationDto.setOpenTickTypeKey(billApplicationIInfoDto.getOpenTickTypeKey());
busBillApplicationDto.setOpenTickTypeValue(billApplicationIInfoDto.getOpenTickTypeValue());
busBillApplicationDto.setOpenTickSid(billApplicationIInfoDto.getOpenTickSid());
busBillApplicationDto.setOpenTickName(billApplicationIInfoDto.getOpenTickName());
busBillApplicationDto.setBillStateKey(billApplicationIInfoDto.getInvoiceStateKey());
busBillApplicationDto.setBillStateValue(billApplicationIInfoDto.getInvoiceState());
busBillApplicationDto.setContractNo(billApplicationIInfoDto.getContractId());
busBillApplicationDto.setApplyDate(billApplicationIInfoDto.getDate());
busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid());
busBillApplicationDto.setNodeState(billApplicationIInfoDto.getNodeState());
busBillApplicationDto.setBillNo(billApplicationIInfoDto.getBillNo());
String publishInfo = billApplicationIInfoDto.getPublishInfo();
String[] split = publishInfo.split("-");
busBillApplicationDto.setDeptName(split[0]);
busBillApplicationDto.setCreateByName(split[1]);
//开票车辆信息
List<VinListDto> vinList = billApplicationIInfoDto.getVinList();
List<BusBillVehicleDto> busBillVehicleDtos = new ArrayList<>();
for (VinListDto vinListDto : vinList) {
if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) {
return new ResultBean().fail().setMsg("开票信息不能为空");
}
BusBillVehicleDto busBillVehicleDto = new BusBillVehicleDto();
busBillVehicleDto.setVinNo(vinListDto.getVin());
busBillVehicleDto.setVehSid(vinListDto.getVinSid());
busBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
busBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
busBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
busBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType());
busBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
busBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
busBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
busBillVehicleDtos.add(busBillVehicleDto);
}
busBillApplicationDto.setBusBillVehicles(busBillVehicleDtos);
//开票挂车信息
List<FinBillTrailerDto> finBillTrailers = billApplicationIInfoDto.getFinBillTrailers();
List<BusBillTrailerDto> busBillTrailerDtos = new ArrayList<>();
if (finBillTrailers != null && finBillTrailers.size() > 0) {
for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
BusBillTrailerDto busBillTrailerDto = new BusBillTrailerDto();
BeanUtil.copyProperties(finBillTrailerDto, busBillTrailerDto);
busBillTrailerDtos.add(busBillTrailerDto);
}
}
busBillApplicationDto.setBusBillTrailers(busBillTrailerDtos);
//附件信息
List<String> appCarBuyContractImages = billApplicationIInfoDto.getCarBuyContractImages();//车辆买卖合同
List<String> customerInvoiceApplyImages = billApplicationIInfoDto.getCustomerInvoiceApplyImages();//客户开票申请书
List<String> invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同
List<String> idCardImages = billApplicationIInfoDto.getIdCardImages();//证件
List<BusBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
List<BusBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
List<BusBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
List<BusBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
List<BusBillFileDto> idCardImagesPC = new ArrayList<>();//证件
if (appCarBuyContractImages != null) {
for (String appCarBuyContractImage : appCarBuyContractImages) {
BusBillFileDto busBillFileDto = new BusBillFileDto();
busBillFileDto.setFileUrl(appCarBuyContractImage);
carBuyContractImages.add(busBillFileDto);
}
}
if (customerInvoiceApplyImages != null) {
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
BusBillFileDto busBillFileDto = new BusBillFileDto();
busBillFileDto.setFileUrl(customerInvoiceApplyImage);
khkpsqsApplicationAppendxs.add(busBillFileDto);
}
}
if (invoiceApplyConfirmImages != null) {
for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
BusBillFileDto busBillFileDto = new BusBillFileDto();
busBillFileDto.setFileUrl(invoiceApplyConfirmImage);
kpxxqrsApplicationAppendxs.add(busBillFileDto);
}
}
if (registerContractImages != null) {
for (String registerContractImage : registerContractImages) {
BusBillFileDto busBillFileDto = new BusBillFileDto();
busBillFileDto.setFileUrl(registerContractImage);
cldjhtApplicationAppendxs.add(busBillFileDto);
}
}
if (idCardImages != null) {
for (String idCardImage : idCardImages) {
BusBillFileDto busBillFileDto = new BusBillFileDto();
busBillFileDto.setFileUrl(idCardImage);
idCardImagesPC.add(busBillFileDto);
}
}
busBillApplicationDto.setCarBuyContractImages(carBuyContractImages);
busBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
busBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
busBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
busBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
ResultBean resultBean = busBillApplicationFeign.save(busBillApplicationDto);
return resultBean;
}
public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
ResultBean rb = ResultBean.fireFail();
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();

Loading…
Cancel
Save