Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
37601696
Commit
37601696
authored
Apr 23, 2020
by
Administrator
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wdz' into 'develop'
Wdz See merge request 8timerv2/8timerapiv200!41
parents
9e8a7094
17db9816
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
288 additions
and
69 deletions
+288
-69
src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java
+24
-9
src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java
+8
-2
src/main/java/cn/timer/api/bean/qyzx/QyzxInvoiceUsual.java
+115
-0
src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java
+6
-1
src/main/java/cn/timer/api/config/enums/Regular.java
+3
-1
src/main/java/cn/timer/api/controller/LoginController.java
+1
-0
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
+1
-0
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
+87
-53
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+0
-0
src/main/java/cn/timer/api/dao/qyzx/QyzxEntInfoMMapper.java
+3
-0
src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java
+3
-1
src/main/java/cn/timer/api/dao/qyzx/QyzxInvoiceUsualMapper.java
+23
-0
src/main/java/cn/timer/api/dao/qyzx/QyzxSuggestionFeebackMapper.java
+3
-1
src/main/resources/mapping/qyzx/QyzxEntInfoMMapper.xml
+11
-1
No files found.
src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java
View file @
37601696
...
...
@@ -37,28 +37,34 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
@Id
@GeneratedValue
@TableId
(
type
=
IdType
.
AUTO
)
@ApiModelProperty
(
value
=
"组织机构代码 组织机构代码"
,
example
=
"
101
"
)
@ApiModelProperty
(
value
=
"组织机构代码 组织机构代码"
,
example
=
"
4
"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"企业名称 "
,
example
=
"
企业名称
"
)
@ApiModelProperty
(
value
=
"企业名称 "
,
example
=
"
优领人才
"
)
private
String
name
;
@ApiModelProperty
(
value
=
"企业简介 企业简介"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"认证名 "
,
example
=
"广东优领人才科技服务有限公司"
)
private
String
attestName
;
@ApiModelProperty
(
value
=
"简介"
,
example
=
"公司福利好"
)
private
String
intro
;
@ApiModelProperty
(
value
=
"法人 "
,
example
=
"刘德华"
)
private
String
operName
;
@ApiModelProperty
(
value
=
"企业规模 10人以下、10-19人、20-99人、100-500人、500人以上"
,
example
=
"
101
"
)
@ApiModelProperty
(
value
=
"企业规模 10人以下、10-19人、20-99人、100-500人、500人以上"
,
example
=
"
3
"
)
private
Integer
size
;
@ApiModelProperty
(
value
=
"电话号码 "
,
example
=
"18712345678"
)
private
String
phone
;
@ApiModelProperty
(
value
=
"办公地址 "
,
example
=
" 省/市/区 例:广东省/广州市/白云区"
)
@ApiModelProperty
(
value
=
"所在地区"
,
example
=
"440111"
)
private
Integer
area
;
@ApiModelProperty
(
value
=
"办公地址 "
,
example
=
"广从一路5号柏曼酒店3楼"
)
private
String
workAddress
;
@ApiModelProperty
(
value
=
"企业
编码
"
,
example
=
" 例:YLZYCS(YL:优领简写;ZY:版本;CS:账户公司简称)"
)
@ApiModelProperty
(
value
=
"企业
简写
"
,
example
=
" 例:YLZYCS(YL:优领简写;ZY:版本;CS:账户公司简称)"
)
private
String
codes
;
@ApiModelProperty
(
value
=
"企业LOGO "
,
example
=
"企业LOGO"
)
...
...
@@ -70,13 +76,13 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
@ApiModelProperty
(
value
=
"开通渠道 1直属、2总代理、3独家代理、4一般代理商、5区域代理商"
,
example
=
"101"
)
private
Integer
openChannel
;
@ApiModelProperty
(
value
=
"联系人
"
,
example
=
"刘德华"
)
@ApiModelProperty
(
value
=
"联系人"
,
example
=
"刘德华"
)
private
String
linkMan
;
@ApiModelProperty
(
value
=
"联系人电话 "
,
example
=
"18712345678"
)
private
String
linkManPhone
;
@ApiModelProperty
(
value
=
"统一社会信用代码 "
,
example
=
"
统一社会信用代码"
)
@ApiModelProperty
(
value
=
"统一社会信用代码 "
,
example
=
"统一社会信用代码"
)
private
String
creditCode
;
@ApiModelProperty
(
value
=
"是否上市 0:否 1:是"
,
example
=
"101"
)
...
...
@@ -86,7 +92,16 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
@ApiModelProperty
(
value
=
"企业注册时间 "
,
example
=
"企业注册时间"
)
private
Date
registerTime
;
@ApiModelProperty
(
value
=
"到期时间 "
,
example
=
"到期时间"
)
@ApiModelProperty
(
value
=
"营业执照 "
,
example
=
"营业执照url "
)
private
String
licenseUrl
;
@ApiModelProperty
(
value
=
"认证状态 "
,
example
=
"1 认证中,2已认证,3认证失败 "
)
private
Integer
attestStatus
;
@ApiModelProperty
(
value
=
"认证时间 "
,
example
=
"2019-12-12 08:00:00"
)
private
Date
attestTime
;
@ApiModelProperty
(
value
=
"到期时间 "
,
example
=
"2039-12-12 08:00:00"
)
private
Date
endTime
;
@ApiModelProperty
(
value
=
"企业版本,0试用,1标准,2专业, "
,
example
=
"0"
)
...
...
src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java
View file @
37601696
package
cn
.
timer
.
api
.
bean
.
qyzx
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin.QyzxEmpLoginBuilder
;
import
cn.timer.api.dto.login.QysDto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -21,10 +25,12 @@ import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
(
toBuilder
=
true
)
@Table
(
name
=
"qyzx_feeback_accessory"
)
@ApiModel
(
"反馈附件表"
)
public
class
QyzxFeebackAccessory
extends
Model
<
QyzxFeebackAccessory
>
{
...
...
src/main/java/cn/timer/api/bean/qyzx/QyzxInvoiceUsual.java
0 → 100644
View file @
37601696
/**
* <p>Title: QyzxInvoiceData.java</p>
* <p>Description: </p>
* @author dsc
* @date 2020年4月21日
* @version 1.0
*/
package
cn
.
timer
.
api
.
bean
.
qyzx
;
import
java.util.Date
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* <p>Title: QyzxInvoiceData.java</p>
* <p>Description: </p>
* @author dsc
* @date 2020年4月21日
* @version 1.0
*/
@Entity
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Table
(
name
=
"qyzx_invoice_data"
)
@ApiModel
(
"发票资料表"
)
public
class
QyzxInvoiceUsual
extends
Model
<
QyzxInvoiceUsual
>{
private
static
final
long
serialVersionUID
=
2890357568571822258L
;
@Id
@GeneratedValue
@TableId
(
type
=
IdType
.
AUTO
)
@ApiModelProperty
(
value
=
"主键"
,
example
=
"1"
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"发票抬头"
,
example
=
"广东优领"
)
private
String
invoiceTitle
;
@ApiModelProperty
(
value
=
"税号"
,
example
=
"915345164"
)
private
String
dutyParagraph
;
@ApiModelProperty
(
value
=
"公司地址"
,
example
=
"广东省"
)
private
String
companyAddress
;
@ApiModelProperty
(
value
=
"电话号码"
,
example
=
"18152456464"
)
private
String
companyPhone
;
@ApiModelProperty
(
value
=
"开户行"
,
example
=
"中信银行广州白云支行"
)
private
String
bankName
;
@ApiModelProperty
(
value
=
"银行账号"
,
example
=
"8110901011900785029"
)
private
String
bankAccount
;
@ApiModelProperty
(
value
=
"发票类型"
,
example
=
"0-普通 1-专用"
)
private
Integer
invoiceType
;
@ApiModelProperty
(
value
=
"收货人"
,
example
=
"翁🐻"
)
private
String
consignee
;
@ApiModelProperty
(
value
=
"收货人电话"
,
example
=
"13144400255"
)
private
String
consigneePhone
;
@ApiModelProperty
(
value
=
"邮箱"
,
example
=
"13144400255@163.com"
)
private
String
email
;
@ApiModelProperty
(
value
=
"收货地址"
,
example
=
"白云东平伯曼酒店"
)
private
String
shippingAddress
;
@ApiModelProperty
(
value
=
"邮编"
,
example
=
"510080"
)
private
String
zipCode
;
@ApiModelProperty
(
value
=
"企业"
,
example
=
"117"
)
private
Integer
orgCode
;
@ApiModelProperty
(
value
=
"模块状态"
,
example
=
"默认0-开启,1-关闭"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"是否删除"
,
example
=
"默认0-未删除,1-删除"
)
private
Integer
isDelete
;
@TableField
(
fill
=
FieldFill
.
INSERT
)
@ApiModelProperty
(
value
=
"创建时间 "
,
example
=
""
)
private
Date
createTime
;
@ApiModelProperty
(
value
=
"创建人 "
,
example
=
""
)
private
Integer
createUser
;
@TableField
(
fill
=
FieldFill
.
UPDATE
)
@ApiModelProperty
(
value
=
"修改时间 "
,
example
=
""
)
private
Date
modifyTime
;
@ApiModelProperty
(
value
=
"修改人 "
,
example
=
""
)
private
Integer
modifyUser
;
}
src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java
View file @
37601696
package
cn
.
timer
.
api
.
bean
.
qyzx
;
import
java.util.Date
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
...
...
@@ -16,10 +19,12 @@ import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
(
toBuilder
=
true
)
@Table
(
name
=
"qyzx_suggestion_feeback"
)
@ApiModel
(
"意见反馈表"
)
public
class
QyzxSuggestionFeeback
extends
Model
<
QyzxSuggestionFeeback
>
{
...
...
src/main/java/cn/timer/api/config/enums/Regular.java
View file @
37601696
...
...
@@ -40,7 +40,9 @@ public enum Regular {
* 强密码
*/
SHPW
(
"SHPW"
,
"^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,10}$"
),
//纯汉字输入
/**
* 纯汉字输入
*/
CHINESE
(
"CHINESE"
,
"[\\u4E00-\\u9FA5]*"
),
/**
* 邮箱
...
...
src/main/java/cn/timer/api/controller/LoginController.java
View file @
37601696
...
...
@@ -28,6 +28,7 @@ import cn.hutool.core.util.StrUtil;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.zzgl.ZzglAuth
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
...
...
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
View file @
37601696
...
...
@@ -36,6 +36,7 @@ import cn.timer.api.bean.dzht.DzhtAssoHtwj;
import
cn.timer.api.bean.dzht.DzhtAssoQyrz
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
...
...
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
View file @
37601696
...
...
@@ -34,6 +34,7 @@ import cn.timer.api.bean.qyzx.QyzxEmpLogin;
import
cn.timer.api.bean.qyzx.QyzxEntAuth
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.qyzx.QyzxFeebackAccessory
;
import
cn.timer.api.bean.qyzx.QyzxInvoiceUsual
;
import
cn.timer.api.bean.qyzx.QyzxLogBuy
;
import
cn.timer.api.bean.qyzx.QyzxPayServe
;
import
cn.timer.api.bean.qyzx.QyzxSuggestionFeeback
;
...
...
@@ -48,6 +49,7 @@ import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
import
cn.timer.api.dao.qyzx.QyzxEntAuthMapper
;
import
cn.timer.api.dao.qyzx.QyzxEntInfoMMapper
;
import
cn.timer.api.dao.qyzx.QyzxFeebackAccessoryMapper
;
import
cn.timer.api.dao.qyzx.QyzxInvoiceUsualMapper
;
import
cn.timer.api.dao.qyzx.QyzxLogBuyMapper
;
import
cn.timer.api.dao.qyzx.QyzxPayServeMapper
;
import
cn.timer.api.dao.qyzx.QyzxSuggestionFeebackMapper
;
...
...
@@ -105,6 +107,9 @@ public class QyzxController {
@Autowired
private
QyzxFeebackAccessoryMapper
qyzxFeebackAccessoryMapper
;
@Autowired
private
QyzxInvoiceUsualMapper
qyzxInvoiceUsualMapper
;
/**
* 获取企业信息
*
...
...
@@ -121,6 +126,23 @@ public class QyzxController {
}
/**
* 添加/修改企业信息
*
* @param
* @return
*/
@PostMapping
(
value
=
"/ent"
)
@ApiOperation
(
value
=
"添加/修改企业信息"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxEntInfoM
>
addent
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxEntInfoM
qyzxEntInfoM
)
{
qyzxEntInfoM
.
setId
(
userBean
.
getOrgCode
());
QyzxEntInfoM
q
=
new
LambdaQueryChainWrapper
<
QyzxEntInfoM
>(
qyzxEntInfoMMapper
).
eq
(
QyzxEntInfoM:
:
getId
,
userBean
.
getOrgCode
()).
one
();
qyzxEntInfoM
.
setRegisterTime
(
q
.
getRegisterTime
());
qyzxEntInfoM
.
insertOrUpdate
();
return
ResultUtil
.
data
(
qyzxEntInfoM
,
"添加/修改企业"
);
}
/**
* 企业认证-申请
*
* @param qyzxEntAuth
...
...
@@ -128,14 +150,13 @@ public class QyzxController {
*/
@PostMapping
(
value
=
"/entauth"
)
@ApiOperation
(
value
=
"企业认证"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxEnt
Auth
>
entauth
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxEntAuth
qyzxEntAuth
)
{
public
Result
<
QyzxEnt
InfoM
>
entauth
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxEntInfoM
qyzxEntInfoM
)
{
// 设置审核状态
qyzxEntAuth
.
setAuthType
(
CommonEnum
.
AUTH_TYPE_UNDEREVIEW
.
getType
());
qyzxEntAuth
.
setId
(
userBean
.
getOrgCode
());
// 插入数据
qyzxEntAuth
.
insert
();
qyzxEntInfoM
.
setAttestStatus
(
CommonEnum
.
AUTH_TYPE_UNDEREVIEW
.
getType
());
qyzxEntInfoM
.
setId
(
userBean
.
getOrgCode
());
qyzxEntInfoM
.
updateById
();
// }
return
ResultUtil
.
data
(
qyzxEnt
Auth
,
"申请企业认证中"
);
return
ResultUtil
.
data
(
qyzxEnt
InfoM
,
"申请企业认证中"
);
}
/**
...
...
@@ -144,22 +165,18 @@ public class QyzxController {
* @param qyzxEntAuth
* @return
*/
@PostMapping
(
value
=
"/entauthcheck"
)
@ApiOperation
(
value
=
"企业认证-审核-通过/未通过"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxEntAuth
>
entauthcheck1
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxEntAuth
qyzxEntAuth
)
{
Integer
id
=
qyzxEntAuth
.
getId
();
Integer
authType
=
qyzxEntAuth
.
getAuthType
();
if
(
id
==
null
||
authType
==
null
)
{
return
ResultUtil
.
error
(
"参数缺少/异常"
);
}
QyzxEntAuth
entAuth
=
QyzxEntAuth
.
builder
().
id
(
id
).
authType
(
authType
).
build
();
boolean
b
=
entAuth
.
updateById
();
if
(
b
)
{
return
ResultUtil
.
data
(
qyzxEntAuth
,
"企业认证-审批成功"
);
}
else
{
return
ResultUtil
.
error
(
"企业认证-审批失败"
);
}
}
/*
* @PostMapping(value = "/entauthcheck")
*
* @ApiOperation(value = "企业认证-审核-通过/未通过", httpMethod = "POST", notes =
* "接口发布说明") public Result<QyzxEntAuth> entauthcheck1(@CurrentUser UserBean
* userBean, @RequestBody QyzxEntAuth qyzxEntAuth) { Integer id =
* qyzxEntAuth.getId(); Integer authType = qyzxEntAuth.getAuthType(); if (id ==
* null || authType == null) { return ResultUtil.error("参数缺少/异常"); } QyzxEntAuth
* entAuth = QyzxEntAuth.builder().id(id).authType(authType).build(); boolean b
* = entAuth.updateById(); if (b) { return ResultUtil.data(qyzxEntAuth,
* "企业认证-审批成功"); } else { return ResultUtil.error("企业认证-审批失败"); } }
*/
/**
* 运营管理 企业认证-审核-通过/不通过(weng)
...
...
@@ -169,19 +186,51 @@ public class QyzxController {
*/
@PostMapping
(
value
=
"/entauthpass"
)
@ApiOperation
(
value
=
"企业认证-审核-通过"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
String
>
entauthpass
(
@RequestBody
EntauthDto
entauthDto
)
{
//
2未通过,3通过
String
msg
=
"企业
认证不通过"
;
public
Result
<
String
>
entauthpass
(
@RequestBody
EntauthDto
entauthDto
)
{
//
2未通过,3通过
String
msg
=
"企业
未认证"
;
Integer
type
=
entauthDto
.
getAuthType
();
if
(
type
!=
2
)
{
type
=
3
;
if
(
type
==
CommonEnum
.
AUTH_TYPE_SUCCESS
.
getType
())
{
msg
=
"企业认证成功"
;
}
boolean
b
=
new
LambdaUpdateChainWrapper
<
QyzxEntAuth
>(
qyzxEntAuthMapper
)
.
eq
(
QyzxEntAuth:
:
getId
,
entauthDto
.
getOrgCode
()).
set
(
QyzxEntAuth:
:
getAuthType
,
type
).
update
();
if
(
b
)
{
if
(
type
==
CommonEnum
.
AUTH_TYPE_FAILURE
.
getType
())
{
msg
=
"企业认证失败"
;
}
boolean
b
=
new
LambdaUpdateChainWrapper
<
QyzxEntInfoM
>(
qyzxEntInfoMMapper
).
eq
(
QyzxEntInfoM:
:
getId
,
entauthDto
.
getOrgCode
())
.
set
(
QyzxEntInfoM:
:
getAttestStatus
,
type
).
update
();
if
(
b
){
return
ResultUtil
.
data
(
msg
);
}
return
ResultUtil
.
error
(
"企业认证未通过"
);
return
ResultUtil
.
data
(
"企业认证流程有误"
);
}
/**
* 新增/编辑常用企业开票资料
*
* @param QyzxInvoiceUsual
* @return
*/
@PostMapping
(
value
=
"/invoiceusual"
)
@ApiOperation
(
value
=
"新增/编辑常用企业开票资料"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxInvoiceUsual
>
invoiceusual
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxInvoiceUsual
qyzxInvoiceUsual
)
{
qyzxInvoiceUsual
.
setOrgCode
(
userBean
.
getOrgCode
());
qyzxInvoiceUsual
.
setModifyUser
(
userBean
.
getEmpNum
());
boolean
tof
=
qyzxInvoiceUsual
.
insertOrUpdate
();
if
(
tof
)
{
return
ResultUtil
.
data
(
qyzxInvoiceUsual
,
"常用企业开票资料已修改"
);
}
return
ResultUtil
.
error
(
"开票资料修改无效"
);
}
/**
* 显示常用的企业开票资料
*
* @param QyzxInvoiceUsual
* @return
*/
@SuppressWarnings
(
"deprecation"
)
@GetMapping
(
value
=
"/invoiceusual"
)
@ApiOperation
(
value
=
"显示常用的企业开票资料"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxInvoiceUsual
>
invoiceusual
(
@CurrentUser
UserBean
userBean
)
{
QyzxInvoiceUsual
one
=
new
LambdaQueryChainWrapper
<
QyzxInvoiceUsual
>(
qyzxInvoiceUsualMapper
).
eq
(
QyzxInvoiceUsual:
:
getOrgCode
,
userBean
.
getOrgCode
()).
one
();
return
ResultUtil
.
data
(
one
,
"企业超管头像和电话号码"
);
}
/**
...
...
@@ -447,11 +496,14 @@ public class QyzxController {
* 意见反馈
*/
@PostMapping
(
value
=
"/feedback"
)
@ApiOperation
(
value
=
"意见反馈)"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxLogBuy
>
feedback
(
@CurrentUser
UserBean
userBean
,
@RequestParam
(
required
=
false
)
String
moudle
,
@RequestParam
(
required
=
false
)
String
opinionText
,
@Param
(
"files"
)
List
<
MultipartFile
>
files
)
{
@ApiOperation
(
value
=
"意见反馈"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxSuggestionFeeback
>
feedback
(
@CurrentUser
UserBean
userBean
,
@RequestParam
(
required
=
false
)
String
opinionText
,
@RequestParam
(
required
=
false
)
String
moudle
,
@Param
(
"files"
)
List
<
MultipartFile
>
files
)
{
String
url
=
null
;
List
<
String
>
list
=
new
ArrayList
<
String
>();
if
(
files
!=
null
)
{
for
(
MultipartFile
file
:
files
)
{
String
path
=
"8timer2.0/"
+
userBean
.
getOrgCode
()
+
"/"
+
moudle
+
"/"
+
file
.
getOriginalFilename
();
if
(
file
==
null
||
file
.
getSize
()
<=
0
)
{
...
...
@@ -465,6 +517,7 @@ public class QyzxController {
}
}
}
}
QyzxSuggestionFeeback
feeback
=
new
QyzxSuggestionFeeback
();
feeback
.
setEmpNum
(
userBean
.
getEmpNum
());
feeback
.
setOpinionText
(
opinionText
);
...
...
@@ -588,26 +641,7 @@ public class QyzxController {
return
ResultUtil
.
data
(
page
,
logBuyDto
,
"查询成功"
);
}
/**
* 添加/修改企业
*
* @param
* @return
*/
@PostMapping
(
value
=
"/ent"
)
@ApiOperation
(
value
=
"添加/修改企业"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxEntInfoM
>
addent
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxEntInfoM
qyzxEntInfoM
)
{
qyzxEntInfoM
.
insertOrUpdate
();
Integer
count
=
qyzxEmpEntAssoMapper
.
selectCount
(
new
QueryWrapper
<
QyzxEmpEntAsso
>()
.
eq
(
"emp_num"
,
userBean
.
getEmpNum
()).
eq
(
"org_code"
,
qyzxEntInfoM
.
getId
()));
if
(
count
==
null
||
count
<=
0
)
QyzxEmpEntAsso
.
builder
().
empNum
(
userBean
.
getEmpNum
()).
orgCode
(
qyzxEntInfoM
.
getId
()).
userType
(
1
).
status
(
1
)
.
build
().
insert
();
// 添加关联表
QyzxEmpEntAsso
.
builder
().
empNum
(
userBean
.
getEmpNum
()).
orgCode
(
qyzxEntInfoM
.
getId
()).
userType
(
1
).
build
()
.
insertOrUpdate
();
return
ResultUtil
.
data
(
qyzxEntInfoM
,
"添加/修改企业"
);
}
/**
* 账号管理 获取账号
...
...
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
37601696
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/qyzx/QyzxEntInfoMMapper.java
View file @
37601696
...
...
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
/**
* 企业信息
* @author Tang 2019-11-11
...
...
src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java
View file @
37601696
...
...
@@ -5,12 +5,14 @@ import org.springframework.stereotype.Repository;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.bean.qyzx.QyzxFeebackAccessory
;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public
interface
QyzxFeebackAccessoryMapper
extends
BaseMapper
<
QyzxFeebackAccessory
Mapper
>
{
public
interface
QyzxFeebackAccessoryMapper
extends
BaseMapper
<
QyzxFeebackAccessory
>
{
}
src/main/java/cn/timer/api/dao/qyzx/QyzxInvoiceUsualMapper.java
0 → 100644
View file @
37601696
/**
* <p>Title: QyzxInvoiceDataMapper.java</p>
* <p>Description: </p>
* @author dsc
* @date 2020年4月21日
* @version 1.0
*/
package
cn
.
timer
.
api
.
dao
.
qyzx
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.bean.qyzx.QyzxInvoiceUsual
;
/**
* <p>Title: QyzxInvoiceDataMapper.java</p>
* <p>Description: </p>
* @author dsc
* @date 2020年4月21日
* @version 1.0
*/
public
interface
QyzxInvoiceUsualMapper
extends
BaseMapper
<
QyzxInvoiceUsual
>{
}
src/main/java/cn/timer/api/dao/qyzx/QyzxSuggestionFeebackMapper.java
View file @
37601696
...
...
@@ -5,12 +5,14 @@ import org.springframework.stereotype.Repository;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.bean.qyzx.QyzxSuggestionFeeback
;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public
interface
QyzxSuggestionFeebackMapper
extends
BaseMapper
<
QyzxSuggestionFeeback
Mapper
>
{
public
interface
QyzxSuggestionFeebackMapper
extends
BaseMapper
<
QyzxSuggestionFeeback
>
{
}
src/main/resources/mapping/qyzx/QyzxEntInfoMMapper.xml
View file @
37601696
...
...
@@ -21,6 +21,11 @@
<result
column=
"is_on_stock"
property=
"isOnStock"
/>
<result
column=
"level"
property=
"level"
/>
<result
column=
"register_time"
property=
"registerTime"
/>
<result
column=
"license_url"
property=
"licenseUrl"
/>
<result
column=
"area"
property=
"area"
/>
<result
column=
"attest_name"
property=
"attestName"
/>
<result
column=
"attest_status"
property=
"attestStatus"
/>
<result
column=
"attest_time"
property=
"attestTime"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -40,7 +45,12 @@
credit_code,
is_on_stock,
level,
register_time
register_time,
license_url,
area,
attest_name,
attest_status,
attest_time
</sql>
<!--
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment