Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
蒋勇
zhichan
Commits
0e92e131
Commit
0e92e131
authored
Dec 15, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 代码格式规范
parent
da31e9e6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
11 deletions
+13
-11
icp-deliver/.eslintrc.js
+2
-0
icp-deliver/app/base/controller/impl/common/appCtl.js
+4
-4
icp-deliver/app/base/db/impl/common/cacheManager.js
+4
-4
icp-deliver/app/base/db/impl/delivery/deliverDao.js
+2
-2
icp-deliver/app/base/service/impl/delivery/deliverSve.js
+1
-1
No files found.
icp-deliver/.eslintrc.js
View file @
0e92e131
module
.
exports
=
{
module
.
exports
=
{
root
:
true
,
root
:
true
,
extends
:
[
extends
:
[
// 'plugin:vue/essential',
'@tencent/eslint-config-tencent'
,
'@tencent/eslint-config-tencent'
,
// '@vue/standard'
],
],
rules
:
{
rules
:
{
// allow async-await
// allow async-await
...
...
icp-deliver/app/base/controller/impl/common/appCtl.js
View file @
0e92e131
...
@@ -63,10 +63,10 @@ class AppCtl extends CtlBase {
...
@@ -63,10 +63,10 @@ class AppCtl extends CtlBase {
const
rtn
=
await
this
.
service
.
saveFuncTree
(
p
);
const
rtn
=
await
this
.
service
.
saveFuncTree
(
p
);
return
system
.
getResult
(
rtn
);
return
system
.
getResult
(
rtn
);
}
}
async
create
(
pobj
,
queryobj
,
req
)
{
//
async create(pobj, queryobj, req) {
pobj
.
creator_id
=
pobj
.
userid
;
// 设置创建者
//
pobj.creator_id = pobj.userid;// 设置创建者
return
super
.
create
(
pobj
,
queryobj
,
req
);
//
return super.create(pobj, queryobj, req);
}
//
}
async
update
(
pobj
,
queryobj
,
req
)
{
async
update
(
pobj
,
queryobj
,
req
)
{
return
super
.
update
(
pobj
,
queryobj
,
req
);
return
super
.
update
(
pobj
,
queryobj
,
req
);
}
}
...
...
icp-deliver/app/base/db/impl/common/cacheManager.js
View file @
0e92e131
...
@@ -12,13 +12,13 @@ class CacheManager {
...
@@ -12,13 +12,13 @@ class CacheManager {
const
files
=
fs
.
readdirSync
(
cachePath
);
const
files
=
fs
.
readdirSync
(
cachePath
);
if
(
files
)
{
if
(
files
)
{
files
.
forEach
((
r
)
=>
{
files
.
forEach
((
r
)
=>
{
const
c
lassObj
=
require
(
`
${
cachePath
}
/
${
r
}
`
);
const
C
lassObj
=
require
(
`
${
cachePath
}
/
${
r
}
`
);
self
[
classObj
.
name
]
=
new
c
lassObj
();
self
[
ClassObj
.
name
]
=
new
C
lassObj
();
const
refTmp
=
self
[
c
lassObj
.
name
];
const
refTmp
=
self
[
C
lassObj
.
name
];
if
(
refTmp
.
prefix
)
{
if
(
refTmp
.
prefix
)
{
self
.
doc
[
refTmp
.
prefix
]
=
refTmp
.
desc
;
self
.
doc
[
refTmp
.
prefix
]
=
refTmp
.
desc
;
}
else
{
}
else
{
console
.
log
(
`请在
${
c
lassObj
.
name
}
缓存中定义prefix`
);
console
.
log
(
`请在
${
C
lassObj
.
name
}
缓存中定义prefix`
);
}
}
});
});
}
}
...
...
icp-deliver/app/base/db/impl/delivery/deliverDao.js
View file @
0e92e131
...
@@ -26,7 +26,7 @@ class DeliverDao extends Dao {
...
@@ -26,7 +26,7 @@ class DeliverDao extends Dao {
const
{
search
:
{
productCode
}
}
=
qobj
;
const
{
search
:
{
productCode
}
}
=
qobj
;
if
(
productCode
)
{
if
(
productCode
)
{
delete
qc
.
where
.
productCode
delete
qc
.
where
.
productCode
;
}
}
qc
.
raw
=
true
;
qc
.
raw
=
true
;
const
type
=
qobj
.
bizpath
.
split
(
'/'
)[
1
];
const
type
=
qobj
.
bizpath
.
split
(
'/'
)[
1
];
...
@@ -80,7 +80,7 @@ class DeliverDao extends Dao {
...
@@ -80,7 +80,7 @@ class DeliverDao extends Dao {
$or
:
[{
$eq
:
null
},
{
$eq
:
''
}],
$or
:
[{
$eq
:
null
},
{
$eq
:
''
}],
}
}
}]
}]
})
})
;
break
;
break
;
case
'/deliveryManagement/all'
:
case
'/deliveryManagement/all'
:
break
;
break
;
...
...
icp-deliver/app/base/service/impl/delivery/deliverSve.js
View file @
0e92e131
...
@@ -398,7 +398,7 @@ class DeliverService extends ServiceBase {
...
@@ -398,7 +398,7 @@ class DeliverService extends ServiceBase {
},
{
},
{
id
:
material
.
id
,
id
:
material
.
id
,
});
});
return
"SUCCESS"
return
"SUCCESS"
;
// return this.db.transaction(async (t) => {
// return this.db.transaction(async (t) => {
// await this.materialDao.updateByWhere({
// await this.materialDao.updateByWhere({
...
...
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