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
bf81eba9
Commit
bf81eba9
authored
4 years ago
by
lal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
e056a114
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
134 additions
and
238 deletions
+134
-238
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkmx.java
+18
-0
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+82
-27
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
+0
-0
src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
+7
-0
src/main/resources/mapping/kqmk/KqglAssoDkmxMapper.xml
+11
-210
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
+16
-1
No files found.
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkmx.java
View file @
bf81eba9
...
...
@@ -48,36 +48,54 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> {
@ApiModelProperty
(
value
=
"上班1打卡结果 上班1打卡结果"
,
example
=
"101"
)
private
Integer
sbdk1jg
;
@ApiModelProperty
(
value
=
"打卡途径(1:补卡;2:管理员更改)"
,
example
=
"0"
)
private
Integer
dktj1
;
@ApiModelProperty
(
value
=
"下班1打卡时间 下班1打卡时间"
,
example
=
"101"
)
private
Long
xbdk1
;
@ApiModelProperty
(
value
=
"下班1打卡结果 下班1打卡结果"
,
example
=
"101"
)
private
Integer
xbdk1jg
;
@ApiModelProperty
(
value
=
"打卡途径(1:补卡;2:管理员更改)"
,
example
=
"0"
)
private
Integer
dktj2
;
@ApiModelProperty
(
value
=
"上班2打卡时间 上班2打卡时间"
,
example
=
"101"
)
private
Long
sbdk2
;
@ApiModelProperty
(
value
=
"上班2打卡结果 上班2打卡结果"
,
example
=
"101"
)
private
Integer
sbdk2jg
;
@ApiModelProperty
(
value
=
"打卡途径(1:补卡;2:管理员更改)"
,
example
=
"0"
)
private
Integer
dktj3
;
@ApiModelProperty
(
value
=
"下班2打卡时间 下班2打卡时间"
,
example
=
"101"
)
private
Long
xbdk2
;
@ApiModelProperty
(
value
=
"下班2打卡结果 下班2打卡结果"
,
example
=
"101"
)
private
Integer
xbdk2jg
;
@ApiModelProperty
(
value
=
"打卡途径(1:补卡;2:管理员更改)"
,
example
=
"0"
)
private
Integer
dktj4
;
@ApiModelProperty
(
value
=
"上班3打卡时间 上班3打卡时间"
,
example
=
"101"
)
private
Long
sbdk3
;
@ApiModelProperty
(
value
=
"上班3打卡结果 上班3打卡结果"
,
example
=
"101"
)
private
Integer
sbdk3jg
;
@ApiModelProperty
(
value
=
"打卡途径(1:补卡;2:管理员更改)"
,
example
=
"0"
)
private
Integer
dktj5
;
@ApiModelProperty
(
value
=
"下班3打卡时间 下班3打卡时间"
,
example
=
"101"
)
private
Long
xbdk3
;
@ApiModelProperty
(
value
=
"下班3打卡结果 下班3打卡结果"
,
example
=
"101"
)
private
Integer
xbdk3jg
;
@ApiModelProperty
(
value
=
"打卡途径(1:补卡;2:管理员更改)"
,
example
=
"0"
)
private
Integer
dktj6
;
@ApiModelProperty
(
value
=
"应打卡次数 应打卡次数"
,
example
=
"101"
)
private
Integer
ydkcs
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
bf81eba9
...
...
@@ -2215,6 +2215,10 @@ public class TimeCardController {
@ApiOperation
(
value
=
"更改打卡结果"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
ChangePunchResults
(
@CurrentUser
UserBean
userBean
,
@RequestBody
ChangePunchResultsDto
chpunchr
)
throws
ParseException
{
String
data
=
chpunchr
.
getData
();
//应更改时间yyyy-MMM-dd
Long
startDate
=
DateUtil
.
getStartTime
(
0
,
DateUtil
.
getStringTime
(
data
,
"yyyy-MM-dd"
)).
getTime
();
String
attdate_
=
new
SimpleDateFormat
(
"yy-MM-dd"
).
format
(
Double
.
valueOf
(
startDate
));
//转换打卡时间格式
String
minutes
=
chpunchr
.
getMinutes
();
//更改分钟数
KqglAssoBcsz
dkbc
=
kqglassobcszmapper
.
selectOne
(
new
QueryWrapper
<
KqglAssoBcsz
>().
lambda
().
eq
(
KqglAssoBcsz:
:
getId
,
chpunchr
.
getBcszid
()));
...
...
@@ -2251,61 +2255,112 @@ public class TimeCardController {
long
sbdk1
=
0
,
xbdk1
=
0
,
sbdk2
=
0
,
xbdk2
=
0
,
sbdk3
=
0
,
xbdk3
=
0
;
int
sbdk1jg
=
0
,
xbdk1jg
=
0
,
sbdk2jg
=
0
,
xbdk2jg
=
0
,
sbdk3jg
=
0
,
xbdk3jg
=
0
;
int
dkmxid
=
0
;
//kqgl_asso_dkmx 打卡明细是否存在打卡记录
KqglAssoDkmx
dkmx
=
kqglassodkmxmapper
.
selectOne
(
new
QueryWrapper
<
KqglAssoDkmx
>().
lambda
().
eq
(
KqglAssoDkmx:
:
getData
,
chpunchr
.
getData
()).
eq
(
KqglAssoDkmx:
:
getUserid
,
chpunchr
.
getNum
()).
eq
(
KqglAssoDkmx:
:
getQyid
,
userBean
.
getOrgCode
()));
if
(
dkmx
!=
null
)
{
dkmxid
=
dkmx
.
getId
();
if
(
chpunchr
.
getClocktype
()
==
1
)
{
sbdk1
=
changed_time
;
sbdk1jg
=
results
;
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
sbdk1
(
sbdk1
).
sbdk1jg
(
sbdk1jg
).
dktj1
(
2
).
build
().
updateById
();
}
else
if
(
chpunchr
.
getClocktype
()
==
2
)
{
xbdk1
=
changed_time
;
xbdk1jg
=
results
;
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
xbdk1
(
xbdk1
).
xbdk1jg
(
xbdk1jg
).
dktj2
(
2
).
build
().
updateById
();
}
else
if
(
chpunchr
.
getClocktype
()
==
3
)
{
sbdk2
=
changed_time
;
sbdk2jg
=
results
;
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
sbdk2
(
sbdk2
).
sbdk2jg
(
sbdk2jg
).
dktj3
(
2
).
build
().
updateById
();
}
else
if
(
chpunchr
.
getClocktype
()
==
4
)
{
xbdk2
=
changed_time
;
xbdk2jg
=
results
;
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
xbdk2
(
xbdk2
).
xbdk2jg
(
xbdk2jg
).
dktj4
(
2
).
build
().
updateById
();
}
else
if
(
chpunchr
.
getClocktype
()
==
5
)
{
sbdk3
=
changed_time
;
sbdk3jg
=
results
;
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
sbdk3
(
sbdk3
).
sbdk3jg
(
sbdk3jg
).
dktj5
(
2
).
build
().
updateById
();
}
else
{
xbdk3
=
changed_time
;
xbdk3jg
=
results
;
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
xbdk3
(
xbdk3
).
xbdk3jg
(
xbdk3jg
).
dktj6
(
2
).
build
().
updateById
();
}
}
else
{
KqglAssoDkmx
pcd
=
KqglAssoDkmx
.
builder
().
userid
(
chpunchr
.
getNum
()).
data
(
data
).
qyid
(
userBean
.
getOrgCode
()).
dksj
(
startDate
).
ydkcs
(
dkbc
.
getSxbcs
()*
2
)
.
gzsc
(
0
d
).
build
();
if
(
chpunchr
.
getClocktype
()
==
1
)
{
sbdk1
=
changed_time
;
sbdk1jg
=
results
;
if
(
results
==
0
)
{
sbdk1jg
=
-
1
;
}
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
sbdk1
(
sbdk1
).
sbdk1jg
(
sbdk1jg
).
build
().
updateById
();
pcd
.
setSbdk1
(
sbdk1
);
pcd
.
setSbdk1jg
(
sbdk1jg
);
pcd
.
setDktj1
(
2
);
if
(!
pcd
.
insert
())
{
throw
new
CustomException
(
"打卡明细-新增异常-1"
);
}
}
else
if
(
chpunchr
.
getClocktype
()
==
2
)
{
xbdk1
=
changed_time
;
xbdk1jg
=
results
;
if
(
results
==
0
)
{
xbdk1jg
=
-
1
;
}
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
xbdk1
(
xbdk1
).
xbdk1jg
(
xbdk1jg
).
build
().
updateById
();
pcd
.
setXbdk1
(
xbdk1
);
pcd
.
setXbdk1jg
(
xbdk1jg
);
pcd
.
setDktj2
(
2
);
if
(!
pcd
.
insert
())
{
throw
new
CustomException
(
"打卡明细-新增异常-1"
);
}
}
else
if
(
chpunchr
.
getClocktype
()
==
3
)
{
sbdk2
=
changed_time
;
sbdk2jg
=
results
;
if
(
results
==
0
)
{
sbdk2jg
=
-
1
;
}
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
sbdk2
(
sbdk2
).
sbdk2jg
(
sbdk2jg
).
build
().
updateById
();
pcd
.
setSbdk2
(
sbdk2
);
pcd
.
setSbdk2jg
(
sbdk2jg
);
pcd
.
setDktj3
(
2
);
if
(!
pcd
.
insert
())
{
throw
new
CustomException
(
"打卡明细-新增异常-1"
);
}
}
else
if
(
chpunchr
.
getClocktype
()
==
4
)
{
xbdk2
=
changed_time
;
xbdk2jg
=
results
;
if
(
results
==
0
)
{
xbdk2jg
=
-
1
;
}
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
xbdk2
(
xbdk2
).
xbdk2jg
(
xbdk2jg
).
build
().
updateById
();
pcd
.
setXbdk2
(
xbdk2
);
pcd
.
setXbdk2jg
(
xbdk2jg
);
pcd
.
setDktj4
(
2
);
if
(!
pcd
.
insert
())
{
throw
new
CustomException
(
"打卡明细-新增异常-1"
);
}
}
else
if
(
chpunchr
.
getClocktype
()
==
5
)
{
sbdk3
=
changed_time
;
sbdk3jg
=
results
;
if
(
results
==
0
)
{
sbdk3jg
=
-
1
;
}
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
sbdk3
(
sbdk3
).
sbdk3jg
(
sbdk3jg
).
build
().
updateById
();
pcd
.
setSbdk3
(
sbdk3
);
pcd
.
setSbdk3jg
(
sbdk3jg
);
pcd
.
setDktj5
(
2
);
if
(!
pcd
.
insert
())
{
throw
new
CustomException
(
"打卡明细-新增异常-1"
);
}
}
else
{
xbdk3
=
changed_time
;
xbdk3jg
=
results
;
if
(
results
==
0
)
{
xbdk3jg
=
-
1
;
}
KqglAssoDkmx
.
builder
().
id
(
dkmx
.
getId
()).
xbdk3
(
xbdk3
).
xbdk3jg
(
xbdk3jg
).
build
().
updateById
();
pcd
.
setXbdk3
(
xbdk3
);
pcd
.
setXbdk3jg
(
xbdk3jg
);
pcd
.
setDktj6
(
2
);
if
(!
pcd
.
insert
())
{
throw
new
CustomException
(
"打卡明细-新增异常-1"
);
}
}
dkmxid
=
pcd
.
getId
();
}
//打卡记录表
clock_time_
=
Long
.
valueOf
(
ClockInTool
.
dateToStamp
(
clock_time
));
Long
startDate
=
DateUtil
.
getStartTime
(
0
,
DateUtil
.
getStringTime
(
data
,
"yyyy-MM-dd"
)).
getTime
();
String
attdate_
=
new
SimpleDateFormat
(
"yy-MM-dd"
).
format
(
Double
.
valueOf
(
startDate
));
//转换打卡时间格式
int
type
=
0
;
if
((
chpunchr
.
getClocktype
())%
2
>
0
){
type
=
1
;
...
...
@@ -2314,7 +2369,7 @@ public class TimeCardController {
}
KqglAssoDkjl
pre
=
KqglAssoDkjl
.
builder
().
dktime
(
changed_time
).
results
(
results
).
userId
(
chpunchr
.
getNum
()).
type
(
type
).
status
(
9
).
sort
(
chpunchr
.
getClocktype
())
.
cardType
(
3
).
qyid
(
userBean
.
getOrgCode
()).
attdate
(
attdate_
+
" "
+
ClockInTool
.
dateToWeek2
(
data
)).
attime
(
clock_time_
).
dkmxid
(
dkmx
.
getId
()).
bcid
(
chpunchr
.
getBcszid
()).
remarks
(
"管理员改为正常
"
).
punchmode
(
0
)
.
cardType
(
0
).
qyid
(
userBean
.
getOrgCode
()).
attdate
(
attdate_
+
" "
+
ClockInTool
.
dateToWeek2
(
data
)).
attime
(
clock_time_
).
dkmxid
(
dkmxid
).
bcid
(
chpunchr
.
getBcszid
()).
remarks
(
"管理员更改操作
"
).
punchmode
(
0
)
.
punchequipment
(
""
).
build
();
if
(!
pre
.
insert
())
{
throw
new
CustomException
(
"打卡记录-新增异常"
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
View file @
bf81eba9
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
View file @
bf81eba9
...
...
@@ -38,6 +38,13 @@ public class DailyDetailsDto {
private
String
bcxbdk2
;
private
String
bcsbdk3
;
private
String
bcxbdk3
;
private
Integer
dktj1
;
private
Integer
dktj2
;
private
Integer
dktj3
;
private
Integer
dktj4
;
private
Integer
dktj5
;
private
Integer
dktj6
;
private
String
sbdk1
;
// 上班1打卡时间
private
Integer
sbdk1jg
;
// 上班1打卡结果
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoDkmxMapper.xml
View file @
bf81eba9
...
...
@@ -9,16 +9,27 @@
<result
column=
"data"
property=
"data"
/>
<result
column=
"sbdk1"
property=
"sbdk1"
/>
<result
column=
"sbdk1jg"
property=
"sbdk1jg"
/>
<result
column=
"dktj1"
property=
"dktj1"
/>
<result
column=
"xbdk1"
property=
"xbdk1"
/>
<result
column=
"xbdk1jg"
property=
"xbdk1jg"
/>
<result
column=
"dktj2"
property=
"dktj2"
/>
<result
column=
"sbdk2"
property=
"sbdk2"
/>
<result
column=
"sbdk2jg"
property=
"sbdk2jg"
/>
<result
column=
"dktj3"
property=
"dktj3"
/>
<result
column=
"xbdk2"
property=
"xbdk2"
/>
<result
column=
"xbdk2jg"
property=
"xbdk2jg"
/>
<result
column=
"dktj4"
property=
"dktj4"
/>
<result
column=
"sbdk3"
property=
"sbdk3"
/>
<result
column=
"sbdk3jg"
property=
"sbdk3jg"
/>
<result
column=
"dktj5"
property=
"dktj5"
/>
<result
column=
"xbdk3"
property=
"xbdk3"
/>
<result
column=
"xbdk3jg"
property=
"xbdk3jg"
/>
<result
column=
"dktj6"
property=
"dktj6"
/>
<result
column=
"ydkcs"
property=
"ydkcs"
/>
<result
column=
"gzsc"
property=
"gzsc"
/>
<result
column=
"qyid"
property=
"qyid"
/>
...
...
@@ -35,55 +46,6 @@
<result
column=
"kgcdfzstotal"
property=
"kgcdfzstotal"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
id,
userid,
data,
sbdk1,
sbdk1jg,
xbdk1,
xbdk1jg,
sbdk2,
sbdk2jg,
xbdk2,
xbdk2jg,
sbdk3,
sbdk3jg,
xbdk3,
xbdk3jg,
ydkcs,
gzsc,
qyid,
dksj,
yzcdcs,
yzcdsc,
kgcdfzs
</sql>
<sql
id=
"Base_Column_List_Alias"
>
id KqglAssoDkmx_id,
userid KqglAssoDkmx_userid,
data KqglAssoDkmx_data,
sbdk1 KqglAssoDkmx_sbdk1,
sbdk1jg KqglAssoDkmx_sbdk1jg,
xbdk1 KqglAssoDkmx_xbdk1,
xbdk1jg KqglAssoDkmx_xbdk1jg,
sbdk2 KqglAssoDkmx_sbdk2,
sbdk2jg KqglAssoDkmx_sbdk2jg,
xbdk2 KqglAssoDkmx_xbdk2,
xbdk2jg KqglAssoDkmx_xbdk2jg,
sbdk3 KqglAssoDkmx_sbdk3,
sbdk3jg KqglAssoDkmx_sbdk3jg,
xbdk3 KqglAssoDkmx_xbdk3,
xbdk3jg KqglAssoDkmx_xbdk3jg,
ydkcs KqglAssoDkmx_ydkcs,
gzsc KqglAssoDkmx_gzsc,
qyid KqglAssoDkmx_qyid,
dksj KqglAssoDkmx_dksj,
yzcdcs KqglAssoDkmx_yzcdcs,
yzcdsc KqglAssoDkmx_yzcdsc,
kgcdfzs KqglAssoDkmx_kgcdfzs
</sql>
<select
id=
"subsidiary"
resultMap=
"AttSubsidiary"
>
select SUM(dk.gzsc) as gzsctotalgzsc,
...
...
@@ -124,165 +86,5 @@
WHERE id = #{id}
</update>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkmx">
INSERT INTO kqgl_asso_dkmx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != userid'>
userid,
</if>
<if test ='null != data'>
data,
</if>
<if test ='null != sbdk1'>
sbdk1,
</if>
<if test ='null != sbdk1jg'>
sbdk1jg,
</if>
<if test ='null != xbdk1'>
xbdk1,
</if>
<if test ='null != xbdk1jg'>
xbdk1jg,
</if>
<if test ='null != sbdk2'>
sbdk2,
</if>
<if test ='null != sbdk2jg'>
sbdk2jg,
</if>
<if test ='null != xbdk2'>
xbdk2,
</if>
<if test ='null != xbdk2jg'>
xbdk2jg,
</if>
<if test ='null != sbdk3'>
sbdk3,
</if>
<if test ='null != sbdk3jg'>
sbdk3jg,
</if>
<if test ='null != xbdk3'>
xbdk3,
</if>
<if test ='null != xbdk3jg'>
xbdk3jg,
</if>
<if test ='null != ydkcs'>
ydkcs,
</if>
<if test ='null != gzsc'>
gzsc,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != dksj'>
dksj,
</if>
<if test ='null != yzcdcs'>
yzcdcs,
</if>
<if test ='null != yzcdsc'>
yzcdsc,
</if>
<if test ='null != kgcdfzs'>
kgcdfzs
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != userid'>
#{userid},
</if>
<if test ='null != data'>
#{data},
</if>
<if test ='null != sbdk1'>
#{sbdk1},
</if>
<if test ='null != sbdk1jg'>
#{sbdk1jg},
</if>
<if test ='null != xbdk1'>
#{xbdk1},
</if>
<if test ='null != xbdk1jg'>
#{xbdk1jg},
</if>
<if test ='null != sbdk2'>
#{sbdk2},
</if>
<if test ='null != sbdk2jg'>
#{sbdk2jg},
</if>
<if test ='null != xbdk2'>
#{xbdk2},
</if>
<if test ='null != xbdk2jg'>
#{xbdk2jg},
</if>
<if test ='null != sbdk3'>
#{sbdk3},
</if>
<if test ='null != sbdk3jg'>
#{sbdk3jg},
</if>
<if test ='null != xbdk3'>
#{xbdk3},
</if>
<if test ='null != xbdk3jg'>
#{xbdk3jg},
</if>
<if test ='null != ydkcs'>
#{ydkcs},
</if>
<if test ='null != gzsc'>
#{gzsc},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != dksj'>
#{dksj},
</if>
<if test ='null != yzcdcs'>
#{yzcdcs},
</if>
<if test ='null != yzcdsc'>
#{yzcdsc},
</if>
<if test ='null != kgcdfzs'>
#{kgcdfzs}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_dkmx
WHERE id = #{id}
</delete>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkmx
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkmx
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_dkmx
</select>
-->
</mapper>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
View file @
bf81eba9
...
...
@@ -165,6 +165,13 @@
<result
column=
"bcxbdk2"
property=
"bcxbdk2"
/>
<result
column=
"bcsbdk3"
property=
"bcsbdk3"
/>
<result
column=
"bcxbdk3"
property=
"bcxbdk3"
/>
<result
column=
"dktj1"
property=
"dktj1"
/>
<result
column=
"dktj2"
property=
"dktj2"
/>
<result
column=
"dktj3"
property=
"dktj3"
/>
<result
column=
"dktj4"
property=
"dktj4"
/>
<result
column=
"dktj5"
property=
"dktj5"
/>
<result
column=
"dktj6"
property=
"dktj6"
/>
<result
column=
"attname"
property=
"attname"
/>
<result
column=
"attpbfs"
property=
"attpbfs"
/>
...
...
@@ -463,6 +470,14 @@
IFNULL(rtj.sbdk3jg ,'') sbdk3jg,
IFNULL(rtj.xbdk3,'') xbdk3,
IFNULL(rtj.xbdk3jg ,'') xbdk3jg,
IFNULL(rtj.dktj1,'') dktj1,
IFNULL(rtj.dktj2,'') dktj2,
IFNULL(rtj.dktj3,'') dktj3,
IFNULL(rtj.dktj4,'') dktj4,
IFNULL(rtj.dktj5,'') dktj5,
IFNULL(rtj.dktj6,'') dktj6,
IFNULL(rtj.gzsc ,'') gzsc,
IFNULL(rtj.qyid,'') qyid,
IFNULL(rtj.dksj ,'') dksj,
...
...
@@ -489,7 +504,7 @@
bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3,
dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` ,
dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` ,
dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`
dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`
,dkmx.dktj1,dkmx.dktj2,dkmx.dktj3,dkmx.dktj4,dkmx.dktj5,dkmx.dktj6
from kqgl_asso_dkmx dkmx
LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
...
...
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