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
1809b8a6
Commit
1809b8a6
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
acc1e0ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/main/java/cn/timer/api/controller/crm/CrmController.java
+1
-1
src/main/java/cn/timer/api/controller/kqgl/AttController.java
+2
-2
No files found.
src/main/java/cn/timer/api/controller/crm/CrmController.java
View file @
1809b8a6
...
@@ -376,7 +376,7 @@ public class CrmController {
...
@@ -376,7 +376,7 @@ public class CrmController {
public
Result
<
Object
>
addClient
(
@CurrentUser
UserBean
userBean
,
@RequestBody
CrmClientData
crmClientData
)
{
public
Result
<
Object
>
addClient
(
@CurrentUser
UserBean
userBean
,
@RequestBody
CrmClientData
crmClientData
)
{
Integer
empNum
=
getEmpNum
(
userBean
);
Integer
empNum
=
getEmpNum
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
crmClientData
.
setClientStatus
(
1
);
crmClientData
.
setClientStatus
(
0
);
crmClientData
.
setCreateUser
(
empNum
);
crmClientData
.
setCreateUser
(
empNum
);
SysRegion
district
=
getSysRegion
(
crmClientData
.
getDistrictId
());
SysRegion
district
=
getSysRegion
(
crmClientData
.
getDistrictId
());
// crmClientData.setZipCode(district.getZipCode());
// crmClientData.setZipCode(district.getZipCode());
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/AttController.java
View file @
1809b8a6
...
@@ -333,7 +333,7 @@ public class AttController {
...
@@ -333,7 +333,7 @@ public class AttController {
int
qyid
=
userBean
.
getOrgCode
();
//坏小孩【企业id】
int
qyid
=
userBean
.
getOrgCode
();
//坏小孩【企业id】
int
userid
=
userBean
.
getEmpNum
();
//用户id
int
userid
=
userBean
.
getEmpNum
();
//用户id
String
dastr
=
new
SimpleDateFormat
(
"yyyy-MM
-dd
"
).
format
(
new
Date
()).
toString
();
//
String
dastr
=
new
SimpleDateFormat
(
"yyyy-MM"
).
format
(
new
Date
()).
toString
();
//
AttendanceGroup
qttgrop
=
attendancegroupservice
.
selectByPrimaryKey
(
Integer
.
valueOf
(
attass
.
getAttgroupid
()));
AttendanceGroup
qttgrop
=
attendancegroupservice
.
selectByPrimaryKey
(
Integer
.
valueOf
(
attass
.
getAttgroupid
()));
boolean
xiugai
=
true
;
boolean
xiugai
=
true
;
...
@@ -344,7 +344,7 @@ public class AttController {
...
@@ -344,7 +344,7 @@ public class AttController {
String
date
=
String
.
valueOf
(
schedules
[
0
].
getData
());
String
date
=
String
.
valueOf
(
schedules
[
0
].
getData
());
Date
dt
=
new
Date
(
date
);
Date
dt
=
new
Date
(
date
);
SimpleDateFormat
famt
=
new
SimpleDateFormat
(
"yyyy-MM
-dd
"
);
SimpleDateFormat
famt
=
new
SimpleDateFormat
(
"yyyy-MM"
);
System
.
out
.
println
(
famt
.
format
(
dt
));
System
.
out
.
println
(
famt
.
format
(
dt
));
if
(!(
famt
.
format
(
dt
)).
equals
(
dastr
))
{
if
(!(
famt
.
format
(
dt
)).
equals
(
dastr
))
{
...
...
This diff is collapsed.
Click to expand it.
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