From 01024f24c1793c8b7855e822783ca87d16672876 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 14:24:46 +0800
Subject: [PATCH] update
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/RegisteredCapitalsEnum.java | 10 ++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompany.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/dto/PushCompanyDto.java | 6 +++
ruoyi-common/src/main/java/com/ruoyi/common/utils/QiChaChaUtil.java | 6 +++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java | 43 ++++++++++++++-------
5 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
index a99d72c..91a25fd 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
@@ -165,13 +165,17 @@
return R.fail("该公司已发布");
}
// 判断水母报告和 公司名称是否一致
- String link = dto.getLink();
- String sign = extractSnFromUrl(link);
- boolean b = checkName(dto.getCompanyName(), sign);
- if(b){
- return R.fail("水母报告和公司名称不一致");
+ if(dto.getTaxpayerType()!=3){
+ if(dto.getLink()==null){
+ return R.fail("请上传水母报告");
+ }
+ String link = dto.getLink();
+ String sign = extractSnFromUrl(link);
+ boolean b = checkName(dto.getCompanyName(), sign);
+ if(b){
+ return R.fail("水母报告和公司名称不一致");
+ }
}
-
String companyId = tbCompanyService.pushCompany(dto, userId);
return R.ok(companyId);
}
@@ -224,11 +228,16 @@
return R.fail("订单状态不能修改");
}
// 判断水母报告和 公司名称是否一致
- String link = dto.getLink();
- String sign = extractSnFromUrl(link);
- boolean b = checkName(dto.getCompanyName(), sign);
- if(b){
- return R.fail("水母报告和公司名称不一致");
+ if(dto.getTaxpayerType()!=3){
+ if(dto.getLink()==null){
+ return R.fail("请上传水母报告");
+ }
+ String link = dto.getLink();
+ String sign = extractSnFromUrl(link);
+ boolean b = checkName(dto.getCompanyName(), sign);
+ if(b){
+ return R.fail("水母报告和公司名称不一致");
+ }
}
tbCompanyService.editCompany(dto,company,userId);
return R.ok(dto.getId());
@@ -457,10 +466,16 @@
return R.fail("参数错误");
}
TbCompany company = tbCompanyService.getById(companyId);
+
String link = company.getLink();
- String sign = extractSnFromUrl(link);
- Object report = getReport(sign);
- return R.ok(report);
+ if(link!=null){
+ String sign = extractSnFromUrl(link);
+ Object report = getReport(sign);
+ return R.ok(report);
+ }else {
+ return R.ok(new Object());
+ }
+
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/RegisteredCapitalsEnum.java
similarity index 70%
rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/enums/RegisteredCapitalsEnum.java
index 422c873..a5a4e9e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/RegisteredCapitalsEnum.java
@@ -2,7 +2,7 @@
import lombok.Getter;
-public enum BillTypeEnum {
+public enum RegisteredCapitalsEnum {
Zujin(1,"租金"),
Yajin(2,"押金"),
@@ -30,14 +30,14 @@
this.name = name;
}
- BillTypeEnum(Integer code, String name){
+ RegisteredCapitalsEnum(Integer code, String name){
this.code = code;
this.name = name;
}
- public static BillTypeEnum getByCode(Integer code){
- BillTypeEnum[] values = BillTypeEnum.values();
- for (BillTypeEnum value : values) {
+ public static RegisteredCapitalsEnum getByCode(Integer code){
+ RegisteredCapitalsEnum[] values = RegisteredCapitalsEnum.values();
+ for (RegisteredCapitalsEnum value : values) {
if (value.code==code){
return value;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/QiChaChaUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/QiChaChaUtil.java
index 0992bb7..74924e1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/QiChaChaUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/QiChaChaUtil.java
@@ -71,4 +71,10 @@
}
+ public static void main(String[] args) {
+ Object 成都农夫明道餐饮管理有限责任公司 = getQiChaChaCompanyExceptionCheck("成都易睿博科技有限公司");
+ System.out.println(成都农夫明道餐饮管理有限责任公司);
+ }
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/PushCompanyDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/PushCompanyDto.java
index 644e6a8..bdfcfb2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/PushCompanyDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/PushCompanyDto.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.dto;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TbOpeningBank;
import com.ruoyi.system.model.TbPermit;
import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
@@ -132,6 +134,10 @@
@NotNull(message = "请选择是否高新技术")
@ApiModelProperty("高新技术企业0否1是")
private Integer highTechEnterpriseTechnology;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发证时间")
+ private Date highTechEnterpriseTechnologyTime;
/**
* 社保缴纳0无1有
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompany.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompany.java
index 1a735eb..b9ca92b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompany.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompany.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -133,6 +135,11 @@
*/
@TableField("high_tech_enterprise_technology")
private Integer highTechEnterpriseTechnology;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发证时间")
+ @TableField("high_tech_enterprise_technology_time")
+ private Date highTechEnterpriseTechnologyTime;
/**
* 社保缴纳0无1有
*/
--
Gitblit v1.7.1