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
fe5e539a
Commit
fe5e539a
authored
Jul 09, 2024
by
刘_震
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据入库
parent
54d1749b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
115 additions
and
49 deletions
+115
-49
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesMaterialController.java
...uoyi/system/controller/ActSuppliesMaterialController.java
+10
-1
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java
...a/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java
+50
-0
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialInfo.java
...java/com/ruoyi/system/domain/ActSuppliesMaterialInfo.java
+6
-30
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesMaterialMapper.java
...va/com/ruoyi/system/mapper/ActSuppliesMaterialMapper.java
+7
-1
ruoyi-supplies/src/main/java/com/ruoyi/system/service/ActSuppliesMaterialService.java
.../com/ruoyi/system/service/ActSuppliesMaterialService.java
+8
-1
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesMaterialServiceImpl.java
...i/system/service/impl/ActSuppliesMaterialServiceImpl.java
+6
-2
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesMaterialMapper.xml
...ain/resources/mapper/system/ActSuppliesMaterialMapper.xml
+28
-14
No files found.
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesMaterialController.java
View file @
fe5e539a
package
com.ruoyi.system.controller
;
package
com.ruoyi.system.controller
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.system.domain.ActSuppliesMaterialDetails
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
com.ruoyi.system.service.ActSuppliesMaterialService
;
import
com.ruoyi.system.service.ActSuppliesMaterialService
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
/**
* @author haiwe
* @author haiwe
* @date 2024/7/8
* @date 2024/7/8
...
@@ -22,7 +25,13 @@ public class ActSuppliesMaterialController {
...
@@ -22,7 +25,13 @@ public class ActSuppliesMaterialController {
@PostMapping
(
"/save"
)
@PostMapping
(
"/save"
)
public
AjaxResult
saveInfo
(
@RequestBody
ActSuppliesMaterialInfo
actSuppliesMaterialInfo
){
public
AjaxResult
saveInfo
(
@RequestBody
ActSuppliesMaterialInfo
actSuppliesMaterialInfo
){
actSuppliesMaterialService
.
save
(
actSuppliesMaterialInfo
);
System
.
out
.
println
(
actSuppliesMaterialInfo
);
List
<
ActSuppliesMaterialDetails
>
materials
=
actSuppliesMaterialInfo
.
getMaterials
();
Boolean
saved
=
actSuppliesMaterialService
.
save
(
materials
);
if
(!
saved
)
{
return
AjaxResult
.
error
(
"插入失败,请重新尝试"
);
}
return
AjaxResult
.
success
();
return
AjaxResult
.
success
();
}
}
...
...
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java
0 → 100644
View file @
fe5e539a
package
com.ruoyi.system.domain
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.apache.poi.hpsf.Decimal
;
import
java.math.BigDecimal
;
/**
* @author haiwe
* @date 2024/7/8
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
ActSuppliesMaterialDetails
{
//主键id
private
String
id
;
//物料名称
private
String
nameColumn
;
//材料编码
private
String
codeColumn
;
//部门
private
String
departmentColumn
;
//数量
private
Long
numberColumn
;
//单价
private
BigDecimal
moneyColumn
;
//总额
private
BigDecimal
money
;
//计量单位
private
String
unit
;
//型号
private
String
model
;
//所属矿名
private
String
mineName
;
//矿id
private
String
mineId
;
//费用来源
private
String
sourceColumn
;
//一级材料类别
private
String
oneLevel
;
//二级材料类别
private
String
twoLevel
;
//日期
private
String
dateColumn
;
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialInfo.java
View file @
fe5e539a
package
com.ruoyi.system.domain
;
package
com.ruoyi.system.domain
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.apache.poi.hpsf.Decimal
;
import
org.springframework.jmx.export.annotation.ManagedNotifications
;
import
javax.annotation.security.DenyAll
;
import
java.util.List
;
/**
/**
* @author haiwe
* @author haiwe
...
@@ -13,34 +17,6 @@ import org.apache.poi.hpsf.Decimal;
...
@@ -13,34 +17,6 @@ import org.apache.poi.hpsf.Decimal;
@AllArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
public
class
ActSuppliesMaterialInfo
{
public
class
ActSuppliesMaterialInfo
{
//id
private
String
id
;
//物料名称
private
String
nameColumn
;
//材料编码
private
String
codeColumn
;
//部门
private
String
departmentColumn
;
//数量
private
Long
numberColumn
;
//单价
private
Decimal
moneyColumn
;
//总额
private
Decimal
money
;
//计量单位
private
String
unit
;
//型号
private
String
model
;
//所属矿名
private
String
mineName
;
//费用来源
private
String
sourceColumn
;
//一级材料类别
private
String
oneLevel
;
//二级材料类别
private
String
twoLevel
;
//日期
private
String
dateColumn
;
private
List
<
ActSuppliesMaterialDetails
>
materials
;
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesMaterialMapper.java
View file @
fe5e539a
package
com.ruoyi.system.mapper
;
package
com.ruoyi.system.mapper
;
import
com.ruoyi.system.domain.ActSuppliesMaterialDetails
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
/**
* @author haiwe
* @author haiwe
* @date 2024/7/8
* @date 2024/7/8
*/
*/
public
interface
ActSuppliesMaterialMapper
{
public
interface
ActSuppliesMaterialMapper
{
void
save
(
ActSuppliesMaterialInfo
actSuppliesMaterialInfo
);
Boolean
save
(
@Param
(
"accList"
)
List
<
ActSuppliesMaterialDetails
>
materials
);
//void save(ActSuppliesMaterialInfo actSuppliesMaterialInfo);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/ActSuppliesMaterialService.java
View file @
fe5e539a
package
com.ruoyi.system.service
;
package
com.ruoyi.system.service
;
import
com.ruoyi.system.domain.ActSuppliesMaterialDetails
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
/**
* @author haiwe
* @author haiwe
* @date 2024/7/8
* @date 2024/7/8
*/
*/
@Repository
public
interface
ActSuppliesMaterialService
{
public
interface
ActSuppliesMaterialService
{
void
save
(
ActSuppliesMaterialInfo
actSuppliesMaterialInfo
);
Boolean
save
(
List
<
ActSuppliesMaterialDetails
>
materials
);
// void save(ActSuppliesMaterialInfo actSuppliesMaterialInfo);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesMaterialServiceImpl.java
View file @
fe5e539a
package
com.ruoyi.system.service.impl
;
package
com.ruoyi.system.service.impl
;
import
com.ruoyi.system.domain.ActSuppliesMaterialDetails
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
com.ruoyi.system.domain.ActSuppliesMaterialInfo
;
import
com.ruoyi.system.mapper.ActSuppliesMaterialMapper
;
import
com.ruoyi.system.mapper.ActSuppliesMaterialMapper
;
import
com.ruoyi.system.service.ActMaterialService
;
import
com.ruoyi.system.service.ActMaterialService
;
...
@@ -8,6 +9,8 @@ import lombok.RequiredArgsConstructor;
...
@@ -8,6 +9,8 @@ import lombok.RequiredArgsConstructor;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
java.util.List
;
/**
/**
* @author haiwe
* @author haiwe
* @date 2024/7/8
* @date 2024/7/8
...
@@ -17,8 +20,9 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -17,8 +20,9 @@ import org.springframework.web.bind.annotation.RequestBody;
public
class
ActSuppliesMaterialServiceImpl
implements
ActSuppliesMaterialService
{
public
class
ActSuppliesMaterialServiceImpl
implements
ActSuppliesMaterialService
{
private
final
ActSuppliesMaterialMapper
actSuppliesMaterialMapper
;
private
final
ActSuppliesMaterialMapper
actSuppliesMaterialMapper
;
@Override
@Override
public
void
save
(
ActSuppliesMaterialInfo
actSuppliesMaterialInfo
)
{
public
Boolean
save
(
List
<
ActSuppliesMaterialDetails
>
materials
)
{
actSuppliesMaterialMapper
.
save
(
actSuppliesMaterialInfo
);
return
actSuppliesMaterialMapper
.
save
(
materials
);
}
}
}
}
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesMaterialMapper.xml
View file @
fe5e539a
...
@@ -4,20 +4,34 @@
...
@@ -4,20 +4,34 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.ruoyi.system.mapper.ActSuppliesMaterialMapper"
>
<mapper
namespace=
"com.ruoyi.system.mapper.ActSuppliesMaterialMapper"
>
<resultMap
type=
"com.ruoyi.system.domain.ActSuppliesMaterialInfo"
id=
"ActSuppliesResult"
>
<resultMap
type=
"com.ruoyi.system.domain.ActSuppliesMaterialDetails"
id=
"ActSuppliesMaterialDetailsResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"id"
column=
"id"
/>
<result
property=
"oneLevel"
column=
"one_level"
/>
<result
property=
"nameColumn"
column=
"name_column"
/>
<result
property=
"twoLevel"
column=
"two_level"
/>
<result
property=
"codeColumn"
column=
"code_column"
/>
<result
property=
"threeLevel"
column=
"three_level"
/>
<result
property=
"departmentColumn"
column=
"department_column"
/>
<result
property=
"suppliesName"
column=
"supplies_name"
/>
<result
property=
"numberColumn"
column=
"number_column"
/>
<result
property=
"orderNum"
column=
"order_num"
/>
<result
property=
"moneyColumn"
column=
"money_column"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"money"
column=
"money"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"unit"
column=
"unit"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"model"
column=
"model"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"mineName"
column=
"mine_name"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"mineId"
column=
"mine_id"
/>
<result
property=
"oneLevel"
column=
"one_level"
/>
<result
property=
"twoLevel"
column=
"two_level"
/>
<result
property=
"dateColumn"
column=
"date_column"
/>
</resultMap>
</resultMap>
<insert
id=
"save"
parameterType=
"com.ruoyi.system.domain.ActSuppliesMaterialInfo"
>
<insert
id=
"save"
>
INSERT INTO act_supplies_material_info
(name_column, code_column, department_column, number_column, money_column, money, unit, model, mine_name,
mine_id, one_level, two_level, date_column,source_column)
VALUES
<foreach
collection=
"accList"
item=
"list"
separator=
","
>
(#{list.nameColumn}, #{list.codeColumn}, #{list.departmentColumn}, #{list.numberColumn}, #{list.moneyColumn}, #{list.money}, #{list.unit},
#{list.model}, #{list.mineName}, #{list.mineId}, #{list.oneLevel}, #{list.twoLevel}, #{list.dateColumn},#{list.sourceColumn})
</foreach>
</insert>
</insert>
</mapper>
\ No newline at end of file
</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