明树Git Lab
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
J
jt_backend
Project
Project
Details
Activity
Releases
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
zengfanpei
jt_backend
Commits
4934da66
Commit
4934da66
authored
Mar 25, 2026
by
zfp1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
9b71b5eb
Pipeline
#108812
passed with stage
in 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
projectThController.js
controller/projectThController.js
+3
-0
thYyqtzhs.js
db/model/jt/thYyqtzhs.js
+13
-6
No files found.
controller/projectThController.js
View file @
4934da66
...
...
@@ -55,6 +55,9 @@ async function getYyqtzhsInfo(req, res, next) {
if
(
!
(
tzhs
&&
tzhs
.
id
&&
tzhs
.
projectId
))
{
return
res
.
sendError
(
errorMessage
.
resourceNotFound
);
}
let
lastyear
=
moment
().
subtract
(
1
,
'year'
).
format
(
'YYYY'
);
let
lastyeartzhs
=
await
DB
.
ThYyqtzhs
.
findOne
({
where
:
{
projectId
:
tzhs
.
projectId
,
nd
:
lastyear
}});
tzhs
.
lastyeartzhs
=
lastyeartzhs
;
// let yyqtzhss = await DB.ThYyqtzhszb.findAll({ where: { projectId: tzhs.projectId, sourceId: req.body.id }, raw: true });
// tzhs.yyqtzhss = _.values(_.groupBy(yyqtzhss, 'groupBy')) || [[]]
return
res
.
sendData
(
tzhs
);
...
...
db/model/jt/thYyqtzhs.js
View file @
4934da66
...
...
@@ -25,7 +25,7 @@ const ThYyqtzhs = sequelize.define('ThYyqtzhs', {
type
:
DataTypes
.
STRING
,
comment
:
"填报单位名称"
,
},
cwbblx
:
{
cwbblx
:
{
type
:
DataTypes
.
STRING
,
comment
:
"财务报表类型"
,
},
...
...
@@ -58,6 +58,13 @@ const ThYyqtzhs = sequelize.define('ThYyqtzhs', {
comment
:
"下年项目阶段"
,
},
nd
:
{
type
:
DataTypes
.
DATE
,
get
()
{
const
rawValue
=
this
.
getDataValue
(
'nd'
);
return
rawValue
?
moment
(
rawValue
).
format
(
'YYYY'
)
:
''
;
}
},
projectGdxxs
:
{
type
:
DataTypes
.
JSON
,
},
...
...
@@ -96,11 +103,11 @@ const ThYyqtzhs = sequelize.define('ThYyqtzhs', {
type
:
DataTypes
.
JSON
,
},
tzhsjc
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收决策"
},
tzhsjh
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收计划----合并到上一个进去了"
},
tzhswcqkndgx
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收完成情况年度更新"
},
tzhswcqkydgx
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收完成情况月度更新"
},
tzhsjc
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收决策"
},
tzhsjh
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收计划----合并到上一个进去了"
},
tzhswcqkndgx
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收完成情况年度更新"
},
tzhswcqkydgx
:
{
type
:
DataTypes
.
JSON
,
comment
:
"投资回收完成情况月度更新"
},
...
...
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