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
2f269595
Commit
2f269595
authored
7 months ago
by
位宇华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
钱家营电--代码提交
parent
1ad81a23
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
260 additions
and
4 deletions
+260
-4
ruoyi-wages/src/main/java/com/ruoyi/system/controller/ConfigSaveController.java
...ava/com/ruoyi/system/controller/ConfigSaveController.java
+37
-0
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/PowerDisplayMapper.java
...main/java/com/ruoyi/system/mapper/PowerDisplayMapper.java
+3
-0
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/SalaryMapper.java
...s/src/main/java/com/ruoyi/system/mapper/SalaryMapper.java
+2
-0
ruoyi-wages/src/main/java/com/ruoyi/system/model/power/FilterModel.java
...c/main/java/com/ruoyi/system/model/power/FilterModel.java
+27
-0
ruoyi-wages/src/main/java/com/ruoyi/system/model/power/PowerCalModel.java
...main/java/com/ruoyi/system/model/power/PowerCalModel.java
+28
-0
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/ImportExpenseSourceServiceImpl.java
...i/system/service/impl/ImportExpenseSourceServiceImpl.java
+1
-2
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
...om/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
+152
-2
ruoyi-wages/src/main/resources/mapper/system/PowerDisplayMapper.xml
...s/src/main/resources/mapper/system/PowerDisplayMapper.xml
+5
-0
ruoyi-wages/src/main/resources/mapper/system/SalaryMapper.xml
...i-wages/src/main/resources/mapper/system/SalaryMapper.xml
+5
-0
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/ConfigSaveController.java
View file @
2f269595
package
com.ruoyi.system.controller
;
import
com.ruoyi.system.mapper.SalaryMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -80,4 +81,40 @@ public class ConfigSaveController {
map
.
forEach
((
k
,
v
)->
salaryMapper
.
insertSourceMap
(
k
,
v
));
}
@PostMapping
(
"/save/filter/str"
)
public
void
saveFilterStr
()
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"洗煤厂"
,
""
);
map
.
put
(
"物资管理中心"
,
""
);
map
.
put
(
"煤管科"
,
"货车队"
);
map
.
put
(
"机采科"
,
""
);
map
.
put
(
"工会"
,
""
);
map
.
put
(
"工业电光"
,
"办公大楼"
);
map
.
put
(
"档案楼"
,
""
);
map
.
put
(
"井运区"
,
""
);
map
.
put
(
"准备队"
,
""
);
map
.
put
(
"救护队"
,
""
);
map
.
put
(
"地测科"
,
""
);
map
.
put
(
"信息科"
,
""
);
map
.
put
(
"教培科"
,
""
);
map
.
put
(
"后勤服务中心"
,
"职工食堂,车队"
);
map
.
put
(
"通风区"
,
""
);
map
.
put
(
"文体中心"
,
""
);
map
.
put
(
"机电科井上部位"
,
""
);
map
.
put
(
"瓦斯区"
,
""
);
map
.
put
(
"皮带区井上部位"
,
""
);
map
.
put
(
"生产压风"
,
""
);
map
.
put
(
"开拓延伸"
,
""
);
map
.
put
(
"保卫部"
,
""
);
map
.
put
(
"采掘小库"
,
""
);
map
.
put
(
"煤质科"
,
""
);
map
.
put
(
"综合办"
,
"宾馆"
);
map
.
put
(
"设备科"
,
""
);
map
.
put
(
"唐钱社区电量"
,
""
);
map
.
put
(
"经贸公司"
,
""
);
map
.
put
(
"开大集团"
,
""
);
map
.
forEach
((
k
,
v
)->
salaryMapper
.
saveDept
(
k
,
v
));
}
}
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/PowerDisplayMapper.java
View file @
2f269595
package
com.ruoyi.system.mapper
;
import
com.ruoyi.system.model.power.FilterModel
;
import
com.ruoyi.system.model.power.PowerConvertSourceModel
;
import
com.ruoyi.system.model.power.PowerSourceModel
;
import
com.ruoyi.system.model.power.dao.PowerClassificationQueryDao
;
...
...
@@ -35,4 +36,6 @@ public interface PowerDisplayMapper {
void
deleteRepeat
(
@Param
(
"month"
)
String
month
,
@Param
(
"minId"
)
String
minId
);
List
<
PowerConvertSourceModel
>
selectConvertSource
(
@Param
(
"number"
)
String
number
);
List
<
FilterModel
>
selectExist
(
@Param
(
"minId"
)
String
minId
);
}
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/SalaryMapper.java
View file @
2f269595
...
...
@@ -40,4 +40,6 @@ public interface SalaryMapper {
List
<
ConfigModel
>
getConfig
();
void
insertSourceMap
(
@Param
(
"k"
)
String
k
,
@Param
(
"v"
)
Object
v
);
void
saveDept
(
@Param
(
"k"
)
String
k
,
@Param
(
"v"
)
Object
v
);
}
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/java/com/ruoyi/system/model/power/FilterModel.java
0 → 100644
View file @
2f269595
package
com.ruoyi.system.model.power
;
import
java.io.Serializable
;
public
class
FilterModel
implements
Serializable
{
private
String
dept
;
private
String
secondDept
;
public
String
getDept
()
{
return
dept
;
}
public
void
setDept
(
String
dept
)
{
this
.
dept
=
dept
;
}
public
String
getSecondDept
()
{
return
secondDept
;
}
public
void
setSecondDept
(
String
secondDept
)
{
this
.
secondDept
=
secondDept
;
}
}
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/java/com/ruoyi/system/model/power/PowerCalModel.java
0 → 100644
View file @
2f269595
package
com.ruoyi.system.model.power
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.List
;
public
class
PowerCalModel
implements
Serializable
{
private
String
keyName
;
private
List
<
BigDecimal
>
bigDecimalList
;
public
String
getKeyName
()
{
return
keyName
;
}
public
void
setKeyName
(
String
keyName
)
{
this
.
keyName
=
keyName
;
}
public
List
<
BigDecimal
>
getBigDecimalList
()
{
return
bigDecimalList
;
}
public
void
setBigDecimalList
(
List
<
BigDecimal
>
bigDecimalList
)
{
this
.
bigDecimalList
=
bigDecimalList
;
}
}
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/ImportExpenseSourceServiceImpl.java
View file @
2f269595
...
...
@@ -36,12 +36,11 @@ public class ImportExpenseSourceServiceImpl implements ImportExpenseSourceServic
@Override
@SneakyThrows
public
AjaxResult
save
(
MultipartFile
multipartFile
)
{
List
<
PowerImportSourceModel
>
powerImportSourceModelList
=
EasyExcelFactory
.
read
(
multipartFile
.
getInputStream
(),
PowerImportSourceModel
.
class
,
new
ExcelListener
<>()).
sheet
(
"Sheet
3
"
).
headRowNumber
(
1
).
doReadSync
();
List
<
PowerImportSourceModel
>
powerImportSourceModelList
=
EasyExcelFactory
.
read
(
multipartFile
.
getInputStream
(),
PowerImportSourceModel
.
class
,
new
ExcelListener
<>()).
sheet
(
"Sheet
4
"
).
headRowNumber
(
1
).
doReadSync
();
powerImportSourceModelList
.
forEach
(
v
->{
v
.
setClassificationName
(
v
.
getClassificationName
().
replaceAll
(
StringUtils
.
SPACE
,
StringUtils
.
EMPTY
));
v
.
setLevelOneClassification
(
v
.
getLevelOneClassification
().
replaceAll
(
StringUtils
.
SPACE
,
StringUtils
.
EMPTY
));
});
System
.
err
.
println
(
JSON
.
toJSONString
(
powerImportSourceModelList
));
importExpenseSourceMapper
.
saveSource
(
powerImportSourceModelList
);
return
AjaxResult
.
success
();
}
...
...
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
View file @
2f269595
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/resources/mapper/system/PowerDisplayMapper.xml
View file @
2f269595
...
...
@@ -124,5 +124,10 @@
from power_source_convert
where org_code = #{number}
</select>
<select
id=
"selectExist"
resultType=
"com.ruoyi.system.model.power.FilterModel"
>
select dept as dept,second_dept as secondDept
from power_filter_table
where org_code = #{minId}
</select>
</mapper>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/resources/mapper/system/SalaryMapper.xml
View file @
2f269595
...
...
@@ -207,9 +207,14 @@
INSERT INTO power_source_convert (need_convert_source, convert_source,org_code)
values (#{k}, #{v},'011701')
</insert>
<select
id=
"getConfig"
resultType=
"com.ruoyi.system.model.salary.ConfigModel"
>
select key_name as keyName,
col_name as colName
from salary_col_config
</select>
<insert
id=
"saveDept"
>
INSERT INTO power_filter_table (dept, second_dept,org_code)
values (#{k}, #{v},'010105')
</insert>
</mapper>
\ No newline at end of file
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