Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
d5739485
Commit
d5739485
authored
Dec 08, 2022
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同步(重庆)
parent
d35d7530
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletions
+19
-1
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkService.java
+5
-0
common/common_utils/src/main/java/com/founder/commonutils/model/vo/response/SkServiceApplyVO.java
+13
-0
common/service_base/src/main/java/com/founder/servicebase/logs/mapper/mysqlMapper/SkServiceApplyMapper.xml
+1
-1
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkService.java
View file @
d5739485
...
@@ -56,6 +56,11 @@ public class SkService extends Model<SkService> {
...
@@ -56,6 +56,11 @@ public class SkService extends Model<SkService> {
private
String
content
;
private
String
content
;
/**
/**
* 服务来源
*/
private
String
fwly
;
/**
* 服务类型
* 服务类型
*/
*/
private
String
servicetypename
;
private
String
servicetypename
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/vo/response/SkServiceApplyVO.java
View file @
d5739485
...
@@ -2,10 +2,14 @@ package com.founder.commonutils.model.vo.response;
...
@@ -2,10 +2,14 @@ package com.founder.commonutils.model.vo.response;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.founder.commonutils.model.newPublicEntity.SkServiceApply
;
import
com.founder.commonutils.model.newPublicEntity.SkServiceApply
;
import
com.founder.commonutils.util.StringUtil
;
import
com.founder.commonutils.util.StringUtil
;
import
lombok.Data
;
import
lombok.Data
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
/**
/**
* @author jlt
* @author jlt
...
@@ -46,6 +50,15 @@ public class SkServiceApplyVO {
...
@@ -46,6 +50,15 @@ public class SkServiceApplyVO {
*/
*/
private
String
content
;
private
String
content
;
/**
* 申请时间
*/
private
String
sqsj
;
/**
* 授权时间
*/
private
String
ssqsj
;
public
SkServiceApplyVO
(){}
public
SkServiceApplyVO
(){}
public
SkServiceApplyVO
(
SkServiceApply
skServiceApply
,
String
name
,
String
ms
){
public
SkServiceApplyVO
(
SkServiceApply
skServiceApply
,
String
name
,
String
ms
){
BeanUtils
.
copyProperties
(
skServiceApply
,
this
);
BeanUtils
.
copyProperties
(
skServiceApply
,
this
);
...
...
common/service_base/src/main/java/com/founder/servicebase/logs/mapper/mysqlMapper/SkServiceApplyMapper.xml
View file @
d5739485
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<select
id=
"findAll"
resultType=
"com.founder.commonutils.model.vo.response.SkServiceApplyVO"
>
<select
id=
"findAll"
resultType=
"com.founder.commonutils.model.vo.response.SkServiceApplyVO"
>
select a.xxzjbh, serviceMs,serviceName,serviceId, applyGs, applyRy, applyUrl, time, token, a.content,
select a.xxzjbh, serviceMs,serviceName,serviceId, applyGs, applyRy, applyUrl, time, token, a.content,
a.isDeleted, sqsj, a.status
a.isDeleted, sqsj,
ssqsj,
a.status
from sk_service_apply a left join sk_service b on a.serviceId=b.xxzjbh
from sk_service_apply a left join sk_service b on a.serviceId=b.xxzjbh
where a.isDeleted='0'
where a.isDeleted='0'
<if
test=
"servicename!= null and servicename!=''"
>
<if
test=
"servicename!= null and servicename!=''"
>
...
...
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