Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
位宇华
klck
Commits
0d89e9d8
Commit
0d89e9d8
authored
May 15, 2024
by
PUPPET17
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工资历史数据curd
parent
47d02e44
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
242 additions
and
29 deletions
+242
-29
ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java
...om/ruoyi/system/controller/WagesConversionController.java
+38
-8
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesConversionMapper.java
...n/java/com/ruoyi/system/mapper/WagesConversionMapper.java
+10
-2
ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dao/WagesConversionData.java
...com/ruoyi/system/model/wages/dao/WagesConversionData.java
+81
-0
ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dto/WagesConversionDataDto.java
.../ruoyi/system/model/wages/dto/WagesConversionDataDto.java
+13
-13
ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/vo/WagesConversionDataVO.java
...om/ruoyi/system/model/wages/vo/WagesConversionDataVO.java
+30
-0
ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesConversionService.java
...java/com/ruoyi/system/service/WagesConversionService.java
+12
-2
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesConversionServiceImpl.java
...ruoyi/system/service/impl/WagesConversionServiceImpl.java
+24
-2
ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml
...rc/main/resources/mapper/system/WagesConversionMapper.xml
+34
-2
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java
View file @
0d89e9d8
package
com.ruoyi.system.controller
;
package
com.ruoyi.system.controller
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.system.model.wages.dto.WagesConversionDataDto
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.system.model.wages.dao.WagesConversionData
;
import
com.ruoyi.system.model.wages.vo.WagesConversionDataVO
;
import
com.ruoyi.system.service.WagesConversionService
;
import
com.ruoyi.system.service.WagesConversionService
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.slf4j.Logger
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
/**
* 2024/5/11
* 2024/5/11
...
@@ -13,14 +18,39 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -13,14 +18,39 @@ import org.springframework.web.bind.annotation.RestController;
*/
*/
@RestController
@RestController
@RequestMapping
(
"/conversion"
)
@RequestMapping
(
"/conversion"
)
public
class
WagesConversionController
{
public
class
WagesConversionController
extends
BaseController
{
public
Logger
logger
=
LoggerFactory
.
getLogger
(
WagesConversionController
.
class
);
private
WagesConversionService
wagesConversionService
;
private
WagesConversionService
wagesConversionService
;
private
WagesConversionController
(
WagesConversionService
wagesConversionService
)
{
private
WagesConversionController
(
WagesConversionService
wagesConversionService
)
{
this
.
wagesConversionService
=
wagesConversionService
;
this
.
wagesConversionService
=
wagesConversionService
;
}
}
@RequestMapping
(
"/save"
)
@PostMapping
(
"/save"
)
public
AjaxResult
save
(
WagesConversionDataDto
wagesConversionDataDto
)
{
public
AjaxResult
save
(
@RequestBody
WagesConversionDataVO
wagesConversionDataVO
)
{
wagesConversionService
.
save
(
wagesConversionDataDto
);
wagesConversionService
.
save
(
wagesConversionDataVO
);
return
new
AjaxResult
(
200
,
"成功"
);
return
new
AjaxResult
(
200
,
"成功"
);
}
}
@GetMapping
(
"/getWagesData"
)
public
TableDataInfo
getWagesDataList
()
{
startPage
();
List
<
WagesConversionData
>
wagesConversionData
=
wagesConversionService
.
selectWagesConversionDataList
();
TableDataInfo
dataTable
=
getDataTable
(
wagesConversionData
);
logger
.
info
(
dataTable
.
getRows
().
toString
());
return
getDataTable
(
wagesConversionData
);
}
@PostMapping
(
"/update"
)
public
AjaxResult
update
(
@RequestBody
WagesConversionData
wagesConversionData
)
{
wagesConversionService
.
update
(
wagesConversionData
);
return
new
AjaxResult
(
200
,
"成功"
);
}
@GetMapping
(
"/getWagesDataById/{id}"
)
public
WagesConversionData
getWagesDataById
(
@PathVariable
(
"id"
)
int
id
)
{
return
wagesConversionService
.
selectWagesConversionDataById
(
id
);
}
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/WagesConversionMapper.java
View file @
0d89e9d8
package
com.ruoyi.system.mapper
;
package
com.ruoyi.system.mapper
;
import
com.ruoyi.system.model.wages.d
to.WagesConversionDataDto
;
import
com.ruoyi.system.model.wages.d
ao.WagesConversionData
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
/**
* 2024/5/11
* 2024/5/11
*/
*/
@Repository
@Repository
public
interface
WagesConversionMapper
{
public
interface
WagesConversionMapper
{
void
save
(
@Param
(
"dto"
)
WagesConversionDataDto
wagesConversionDataDto
);
void
save
(
@Param
(
"jsonData"
)
String
jsonData
,
@Param
(
"yearMonth"
)
String
yearMonth
);
List
<
WagesConversionData
>
selectWagesConversionDataList
();
void
update
(
@Param
(
"id"
)
int
id
,
@Param
(
"jsonData"
)
String
jsonData
);
WagesConversionData
selectWagesConversionDataById
(
int
id
);
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dao/WagesConversionData.java
0 → 100644
View file @
0d89e9d8
package
com.ruoyi.system.model.wages.dao
;
import
java.util.Date
;
/**
* @author xyx
* @date 2024/5/13
*/
public
class
WagesConversionData
{
private
int
id
;
private
String
jsonData
;
private
String
ifGenerateVoucher
;
private
Date
createTime
;
private
Date
updateTime
;
private
String
yearMonth
;
@Override
public
String
toString
()
{
return
"WagesConversionData{"
+
"id='"
+
id
+
'\''
+
", jsonData="
+
jsonData
+
", ifGenerateVoucher='"
+
ifGenerateVoucher
+
'\''
+
", createTime="
+
createTime
+
", updateTime="
+
updateTime
+
", yearMonth='"
+
yearMonth
+
'\''
+
'}'
;
}
public
int
getId
()
{
return
id
;
}
public
void
setId
(
int
id
)
{
this
.
id
=
id
;
}
public
String
getJsonData
()
{
return
jsonData
;
}
public
void
setJsonData
(
String
jsonData
)
{
this
.
jsonData
=
jsonData
;
}
public
String
getIfGenerateVoucher
()
{
return
ifGenerateVoucher
;
}
public
void
setIfGenerateVoucher
(
String
ifGenerateVoucher
)
{
this
.
ifGenerateVoucher
=
ifGenerateVoucher
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
String
getYearMonth
()
{
return
yearMonth
;
}
public
void
setYearMonth
(
String
yearMonth
)
{
this
.
yearMonth
=
yearMonth
;
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dto/WagesConversionDataDto.java
View file @
0d89e9d8
package
com.ruoyi.system.model.wages.dto
;
package
com.ruoyi.system.model.wages.dto
;
import
com.alibaba.fastjson.JSON
;
public
class
WagesConversionDataDto
{
public
class
WagesConversionDataDto
{
private
JSON
jsonData
;
private
String
jsonData
;
private
String
year
Month
;
private
String
wage
Month
;
public
JSON
getJsonData
()
{
public
String
getJsonData
()
{
return
jsonData
;
return
jsonData
;
}
}
public
void
setJsonData
(
JSON
jsonData
)
{
public
void
setJsonData
(
String
jsonData
)
{
this
.
jsonData
=
jsonData
;
this
.
jsonData
=
jsonData
;
}
}
public
String
get
Year
Month
()
{
public
String
get
Wage
Month
()
{
return
year
Month
;
return
wage
Month
;
}
}
public
void
set
YearMonth
(
String
year
Month
)
{
public
void
set
WageMonth
(
String
wage
Month
)
{
this
.
yearMonth
=
year
Month
;
this
.
wageMonth
=
wage
Month
;
}
}
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/vo/WagesConversionDataVO.java
0 → 100644
View file @
0d89e9d8
package
com.ruoyi.system.model.wages.vo
;
import
com.fasterxml.jackson.databind.JsonNode
;
/**
* @author xyx
* @date 2024/5/13
*/
public
class
WagesConversionDataVO
{
private
String
jsonData
;
private
String
yearMonth
;
public
String
getJsonData
()
{
return
jsonData
;
}
public
void
setJsonData
(
String
jsonData
)
{
this
.
jsonData
=
jsonData
;
}
public
String
getYearMonth
()
{
return
yearMonth
;
}
public
void
setYearMonth
(
String
yearMonth
)
{
this
.
yearMonth
=
yearMonth
;
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/WagesConversionService.java
View file @
0d89e9d8
package
com.ruoyi.system.service
;
package
com.ruoyi.system.service
;
import
com.ruoyi.system.model.wages.dto.WagesConversionDataDto
;
import
com.ruoyi.system.model.wages.dao.WagesConversionData
;
import
com.ruoyi.system.model.wages.vo.WagesConversionDataVO
;
import
java.util.List
;
/**
/**
* 2024/5/11
* 2024/5/11
*/
*/
public
interface
WagesConversionService
{
public
interface
WagesConversionService
{
void
save
(
WagesConversionDataDto
wagesConversionDataDto
);
void
save
(
WagesConversionDataVO
wagesConversionDataVO
);
List
<
WagesConversionData
>
selectWagesConversionDataList
();
void
update
(
WagesConversionData
wagesConversionData
);
WagesConversionData
selectWagesConversionDataById
(
int
id
);
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesConversionServiceImpl.java
View file @
0d89e9d8
package
com.ruoyi.system.service.impl
;
package
com.ruoyi.system.service.impl
;
import
com.ruoyi.system.mapper.WagesConversionMapper
;
import
com.ruoyi.system.mapper.WagesConversionMapper
;
import
com.ruoyi.system.model.wages.dao.WagesConversionData
;
import
com.ruoyi.system.model.wages.dto.WagesConversionDataDto
;
import
com.ruoyi.system.model.wages.dto.WagesConversionDataDto
;
import
com.ruoyi.system.model.wages.vo.WagesConversionDataVO
;
import
com.ruoyi.system.service.WagesConversionService
;
import
com.ruoyi.system.service.WagesConversionService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
/**
* 2024/5/11
* 2024/5/11
*/
*/
...
@@ -15,7 +19,25 @@ public class WagesConversionServiceImpl implements WagesConversionService {
...
@@ -15,7 +19,25 @@ public class WagesConversionServiceImpl implements WagesConversionService {
this
.
wagesConversionMapper
=
wagesConversionMapper
;
this
.
wagesConversionMapper
=
wagesConversionMapper
;
}
}
@Override
@Override
public
void
save
(
WagesConversionDataDto
wagesConversionDataDto
)
{
public
void
save
(
WagesConversionDataVO
wagesConversionDataVO
)
{
wagesConversionMapper
.
save
(
wagesConversionDataDto
);
wagesConversionMapper
.
save
(
wagesConversionDataVO
.
getJsonData
(),
wagesConversionDataVO
.
getYearMonth
());
}
@Override
public
List
<
WagesConversionData
>
selectWagesConversionDataList
()
{
return
wagesConversionMapper
.
selectWagesConversionDataList
();
}
@Override
public
void
update
(
WagesConversionData
wagesConversionData
)
{
String
jsonData
=
wagesConversionData
.
getJsonData
();
int
id
=
wagesConversionData
.
getId
();
wagesConversionMapper
.
update
(
id
,
jsonData
);
}
@Override
public
WagesConversionData
selectWagesConversionDataById
(
int
id
)
{
return
wagesConversionMapper
.
selectWagesConversionDataById
(
id
);
}
}
}
}
ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml
View file @
0d89e9d8
...
@@ -3,8 +3,40 @@
...
@@ -3,8 +3,40 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.ruoyi.system.mapper.WagesConversionMapper"
>
<mapper
namespace=
"com.ruoyi.system.mapper.WagesConversionMapper"
>
<resultMap
id=
"WagesConversionData"
type=
"com.ruoyi.system.model.wages.dao.WagesConversionData"
>
<id
property=
"id"
column=
"id"
/>
<result
property=
"jsonData"
column=
"json_data"
/>
<result
property=
"ifGenerateVoucher"
column=
"if_generate_voucher"
/>
<result
property=
"createTime"
column=
"create_date"
/>
<result
property=
"updateTime"
column=
"update_date"
/>
<result
property=
"yearMonth"
column=
"wage_month"
/>
</resultMap>
<insert
id=
"save"
>
<insert
id=
"save"
>
insert into wages_conversion_data (json_data, if_generate_voucher,
year
_month)
insert into wages_conversion_data (json_data, if_generate_voucher,
wage
_month)
values (#{
dto.jsonData}, 0, #{dto.
yearMonth})
values (#{
jsonData}, 0, #{
yearMonth})
</insert>
</insert>
<select
id=
"selectWagesConversionDataList"
resultMap=
"WagesConversionData"
>
select id , json_data, if_generate_voucher , wage_month ,create_date , update_date
from wages_conversion_data
where
if_generate_voucher = 0
</select>
<select
id=
"selectWagesConversionDataById"
parameterType=
"integer"
resultMap=
"WagesConversionData"
>
select id , json_data, if_generate_voucher , wage_month ,create_date , update_date
from wages_conversion_data
where id = #{id}
</select>
<update
id=
"update"
>
update wages_conversion_data
<trim
prefix=
"SET"
suffixOverrides=
","
>
update_date = now(),
<if
test=
"jsonData != null"
>
json_data = #{jsonData}
</if>
</trim>
where id = #{id}
</update>
</mapper>
</mapper>
\ No newline at end of file
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