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
7787cfc7
Commit
7787cfc7
authored
Sep 04, 2023
by
lenovo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
通用转换模块
parent
549b9c0f
Changes
13
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1044 additions
and
17 deletions
+1044
-17
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesConvertroleController.java
...i/system/controller/ActSuppliesConvertroleController.java
+42
-3
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java
...yi/system/controller/ActSuppliesRoleDetailController.java
+0
-1
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesConvertrole.java
.../java/com/ruoyi/system/domain/ActSuppliesConvertrole.java
+120
-3
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/MyListItem.java
...ies/src/main/java/com/ruoyi/system/domain/MyListItem.java
+162
-0
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesConvertroleMapper.java
...com/ruoyi/system/mapper/ActSuppliesConvertroleMapper.java
+7
-0
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesConvertroleService.java
.../ruoyi/system/service/IActSuppliesConvertroleService.java
+7
-0
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesConvertroleServiceImpl.java
...ystem/service/impl/ActSuppliesConvertroleServiceImpl.java
+81
-1
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java
...system/service/impl/ActSuppliesRoleDetailServiceImpl.java
+2
-0
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesConvertMapper.xml
...main/resources/mapper/system/ActSuppliesConvertMapper.xml
+32
-6
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
...n/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
+1
-3
ruoyi-ui/src/api/ActSuppliesConvert/convert.js
ruoyi-ui/src/api/ActSuppliesConvert/convert.js
+25
-0
ruoyi-ui/src/views/ActSuppliesConvert/convert/indexConvert.vue
...-ui/src/views/ActSuppliesConvert/convert/indexConvert.vue
+562
-0
ruoyi-ui/src/views/system/supplies/index.vue
ruoyi-ui/src/views/system/supplies/index.vue
+3
-0
No files found.
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesConvertroleController.java
View file @
7787cfc7
package
com.ruoyi.system.controller
;
import
java.util.List
;
import
com.ruoyi.system.domain.ActSuppliesRole
;
import
com.ruoyi.system.domain.ActSuppliesRoleDetail
;
import
com.ruoyi.system.domain.ActSuppliesTemplate
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
@@ -33,6 +37,20 @@ public class ActSuppliesConvertroleController extends BaseController
@Autowired
private
IActSuppliesConvertroleService
actSuppliesConvertService
;
/**
* 查询模板
*/
@PreAuthorize
(
"@ss.hasPermi('ActSuppliesConvertrole:ActSuppliesConvertrole:listTemp')"
)
@GetMapping
(
"/listTemp"
)
public
TableDataInfo
listTemp
()
{
startPage
();
List
<
ActSuppliesTemplate
>
list
=
actSuppliesConvertService
.
selectActSuppliesConvertListTemp
();
return
getDataTable
(
list
);
}
/**
* 查询通用规则列表
*/
...
...
@@ -49,7 +67,6 @@ public class ActSuppliesConvertroleController extends BaseController
* 导出通用规则列表
*/
@PreAuthorize
(
"@ss.hasPermi('ActSuppliesConvertrole:ActSuppliesConvertrole:export')"
)
@Log
(
title
=
"通用规则"
,
businessType
=
BusinessType
.
EXPORT
)
@GetMapping
(
"/export"
)
public
AjaxResult
export
(
ActSuppliesConvertrole
actSuppliesConvertrole
)
{
...
...
@@ -72,7 +89,6 @@ public class ActSuppliesConvertroleController extends BaseController
* 新增通用规则
*/
@PreAuthorize
(
"@ss.hasPermi('ActSuppliesConvertrole:ActSuppliesConvertrole:add')"
)
@Log
(
title
=
"通用规则"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
public
AjaxResult
add
(
@RequestBody
ActSuppliesConvertrole
actSuppliesConvertrole
)
{
...
...
@@ -83,7 +99,6 @@ public class ActSuppliesConvertroleController extends BaseController
* 修改通用规则
*/
@PreAuthorize
(
"@ss.hasPermi('ActSuppliesConvertrole:ActSuppliesConvertrole:edit')"
)
@Log
(
title
=
"通用规则"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
public
AjaxResult
edit
(
@RequestBody
ActSuppliesConvertrole
actSuppliesConvertrole
)
{
...
...
@@ -100,4 +115,28 @@ public class ActSuppliesConvertroleController extends BaseController
{
return
toAjax
(
actSuppliesConvertService
.
deleteActSuppliesConvertByIds
(
ids
));
}
/**
* 获取通用规则列表
*/
@PreAuthorize
(
"@ss.hasPermi('ActSuppliesConvertrole:ActSuppliesConvertrole:convertRoleList')"
)
@GetMapping
(
value
=
"/convertRoleList/{id}"
)
public
TableDataInfo
convertRoleList
(
@PathVariable
(
"id"
)
Integer
id
)
{
List
<
ActSuppliesConvertrole
>
list
=
actSuppliesConvertService
.
convertRoleList
(
id
);
return
getDataTable
(
list
);
}
/**
* 模板转换页面根据规则ID查询规则详情接口
* */
@PreAuthorize
(
"@ss.hasPermi('ActSuppliesConvertrole:ActSuppliesConvertrole:convertRoleListid')"
)
@GetMapping
(
"/convertRoleListid/{id}"
)
public
TableDataInfo
convertRoleListid
(
@PathVariable
(
"id"
)
Integer
id
){
List
<
ActSuppliesConvertrole
>
list
=
actSuppliesConvertService
.
convertRoleListid
(
id
);
return
getDataTable
(
list
);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java
View file @
7787cfc7
...
...
@@ -117,7 +117,6 @@ public class ActSuppliesRoleDetailController extends BaseController
public
AjaxResult
add
(
@RequestBody
ActSuppliesRoleDetail
actSuppliesRoleDetail
)
{
return
toAjax
(
actSuppliesRoleDetailService
.
insertActSuppliesRoleDetail
(
actSuppliesRoleDetail
));
}
/**
...
...
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesConvertrole.java
View file @
7787cfc7
package
com.ruoyi.system.domain
;
import
com.alibaba.fastjson.JSON
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.ruoyi.common.annotation.Excel
;
import
com.ruoyi.common.core.domain.BaseEntity
;
import
java.util.List
;
/**
* 通用规则对象 act_supplies_convert
*
...
...
@@ -22,6 +25,40 @@ public class ActSuppliesConvertrole extends BaseEntity
@Excel
(
name
=
"模板id"
)
private
Long
tempId
;
/** 模板名称 */
private
String
templateName
;
private
List
<
MyListItem
>
list
;
public
List
<
MyListItem
>
getList
()
{
return
list
;
}
public
void
setList
(
List
<
MyListItem
>
list
)
{
this
.
list
=
list
;
}
/** 导入表行/列/单元格选择 */
private
Long
[]
ze
;
/** 导入表列坐标 */
private
Long
[]
ce
;
/** 导入表行坐标 */
private
Long
[]
re
;
/** 导入表单元格长度 */
private
Long
[]
le
;
/** 模板表行/列/单元格选择*/
private
Long
[]
zt
;
/** 模板表列坐标 */
private
Long
[]
ct
;
/** 模板表行坐标 */
private
Long
[]
rt
;
/** 模板表单元格长度 */
private
Long
[]
lt
;
/** 运算方法 */
private
Long
[]
ys
;
/** 规则名称 */
@Excel
(
name
=
"规则名称"
)
private
String
name
;
...
...
@@ -34,6 +71,14 @@ public class ActSuppliesConvertrole extends BaseEntity
@Excel
(
name
=
"状态"
)
private
Long
status
;
public
String
getTemplateName
()
{
return
templateName
;
}
public
void
setTemplateName
(
String
templateName
)
{
this
.
templateName
=
templateName
;
}
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
...
...
@@ -80,6 +125,78 @@ public class ActSuppliesConvertrole extends BaseEntity
return
status
;
}
public
Long
[]
getZe
()
{
return
ze
;
}
public
void
setZe
(
Long
[]
ze
)
{
this
.
ze
=
ze
;
}
public
Long
[]
getCe
()
{
return
ce
;
}
public
void
setCe
(
Long
[]
ce
)
{
this
.
ce
=
ce
;
}
public
Long
[]
getRe
()
{
return
re
;
}
public
void
setRe
(
Long
[]
re
)
{
this
.
re
=
re
;
}
public
Long
[]
getLe
()
{
return
le
;
}
public
void
setLe
(
Long
[]
le
)
{
this
.
le
=
le
;
}
public
Long
[]
getZt
()
{
return
zt
;
}
public
void
setZt
(
Long
[]
zt
)
{
this
.
zt
=
zt
;
}
public
Long
[]
getCt
()
{
return
ct
;
}
public
void
setCt
(
Long
[]
ct
)
{
this
.
ct
=
ct
;
}
public
Long
[]
getRt
()
{
return
rt
;
}
public
void
setRt
(
Long
[]
rt
)
{
this
.
rt
=
rt
;
}
public
Long
[]
getLt
()
{
return
lt
;
}
public
void
setLt
(
Long
[]
lt
)
{
this
.
lt
=
lt
;
}
public
Long
[]
getYs
()
{
return
ys
;
}
public
void
setYs
(
Long
[]
ys
)
{
this
.
ys
=
ys
;
}
@Override
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
...
...
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/MyListItem.java
0 → 100644
View file @
7787cfc7
package
com.ruoyi.system.domain
;
public
class
MyListItem
{
private
Long
ys
;
private
Long
ze
;
private
Long
re
;
private
Long
ce
;
private
Long
le
;
private
Long
zt
;
private
Long
rt
;
private
Long
ct
;
private
Long
lt
;
// 构造函数
public
MyListItem
()
{
}
public
Long
getYs
()
{
return
ys
;
}
public
void
setYs
(
Long
ys
)
{
this
.
ys
=
ys
;
}
public
Long
getZe
()
{
return
ze
;
}
public
void
setZe
(
Long
ze
)
{
this
.
ze
=
ze
;
}
public
Long
getRe
()
{
return
re
;
}
public
void
setRe
(
Long
re
)
{
this
.
re
=
re
;
}
public
Long
getCe
()
{
return
ce
;
}
public
void
setCe
(
Long
ce
)
{
this
.
ce
=
ce
;
}
public
Long
getLe
()
{
return
le
;
}
public
void
setLe
(
Long
le
)
{
this
.
le
=
le
;
}
public
Long
getZt
()
{
return
zt
;
}
public
void
setZt
(
Long
zt
)
{
this
.
zt
=
zt
;
}
public
Long
getRt
()
{
return
rt
;
}
public
void
setRt
(
Long
rt
)
{
this
.
rt
=
rt
;
}
public
Long
getCt
()
{
return
ct
;
}
public
void
setCt
(
Long
ct
)
{
this
.
ct
=
ct
;
}
public
Long
getLt
()
{
return
lt
;
}
public
void
setLt
(
Long
lt
)
{
this
.
lt
=
lt
;
}
// // Getters 和 Setters
// public String getYs() {
// return ys;
// }
//
// public void setYs(String ys) {
// this.ys = ys;
// }
//
// public String getZe() {
// return ze;
// }
//
// public void setZe(String ze) {
// this.ze = ze;
// }
//
// public String getRe() {
// return re;
// }
//
// public void setRe(String re) {
// this.re = re;
// }
//
// public String getCe() {
// return ce;
// }
//
// public void setCe(String ce) {
// this.ce = ce;
// }
//
// public String getLe() {
// return le;
// }
//
// public void setLe(String le) {
// this.le = le;
// }
//
// public String getZt() {
// return zt;
// }
//
// public void setZt(String zt) {
// this.zt = zt;
// }
//
// public String getRt() {
// return rt;
// }
//
// public void setRt(String rt) {
// this.rt = rt;
// }
//
// public String getCt() {
// return ct;
// }
//
// public void setCt(String ct) {
// this.ct = ct;
// }
//
// public String getLt() {
// return lt;
// }
//
// public void setLt(String lt) {
// this.lt = lt;
// }
}
\ No newline at end of file
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesConvertroleMapper.java
View file @
7787cfc7
...
...
@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
import
java.util.List
;
import
com.ruoyi.system.domain.ActSuppliesConvertrole
;
import
com.ruoyi.system.domain.ActSuppliesTemplate
;
/**
* 通用规则Mapper接口
...
...
@@ -58,4 +59,10 @@ public interface ActSuppliesConvertroleMapper
* @return 结果
*/
public
int
deleteActSuppliesConvertByIds
(
Long
[]
ids
);
List
<
ActSuppliesTemplate
>
selectActSuppliesConvertListTemp
();
List
<
ActSuppliesConvertrole
>
convertRoleList
(
Integer
id
);
List
<
ActSuppliesConvertrole
>
convertRoleListid
(
Integer
id
);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesConvertroleService.java
View file @
7787cfc7
...
...
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
import
java.util.List
;
import
com.ruoyi.system.domain.ActSuppliesConvertrole
;
import
com.ruoyi.system.domain.ActSuppliesTemplate
;
/**
* 通用规则Service接口
...
...
@@ -58,4 +59,10 @@ public interface IActSuppliesConvertroleService
* @return 结果
*/
public
int
deleteActSuppliesConvertById
(
Long
id
);
List
<
ActSuppliesTemplate
>
selectActSuppliesConvertListTemp
();
List
<
ActSuppliesConvertrole
>
convertRoleList
(
Integer
id
);
List
<
ActSuppliesConvertrole
>
convertRoleListid
(
Integer
id
);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesConvertroleServiceImpl.java
View file @
7787cfc7
package
com.ruoyi.system.service.impl
;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.system.domain.ActSuppliesTemplate
;
import
com.ruoyi.system.domain.MyListItem
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.ruoyi.system.mapper.ActSuppliesConvertroleMapper
;
...
...
@@ -29,7 +38,25 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
@Override
public
ActSuppliesConvertrole
selectActSuppliesConvertById
(
Long
id
)
{
return
actSuppliesConvertMapper
.
selectActSuppliesConvertById
(
id
);
ActSuppliesConvertrole
actSuppliesConvertrole
=
actSuppliesConvertMapper
.
selectActSuppliesConvertById
(
id
);
String
content
=
actSuppliesConvertrole
.
getContent
();
ObjectMapper
objectMapper
=
new
ObjectMapper
();
MyListItem
[]
items
=
new
MyListItem
[
0
];
try
{
items
=
objectMapper
.
readValue
(
content
,
MyListItem
[].
class
);
}
catch
(
JsonProcessingException
e
)
{
e
.
printStackTrace
();
}
List
<
MyListItem
>
list
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
items
.
length
;
i
++){
list
.
add
(
items
[
i
]);
}
actSuppliesConvertrole
.
setList
(
list
);
return
actSuppliesConvertrole
;
}
/**
...
...
@@ -53,6 +80,26 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
@Override
public
int
insertActSuppliesConvert
(
ActSuppliesConvertrole
actSuppliesConvertrole
)
{
List
<
String
>
filteredList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
actSuppliesConvertrole
.
getList
().
size
();
i
++){
filteredList
.
add
(
"{\"ce\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getCe
()-
1
)+
"\",\"re\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getRe
()-
1
)+
"\",\"le\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getLe
())+
"\",\"ze\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getZe
())+
"\",\"ct\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getCt
()-
1
)+
"\",\"rt\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getRt
()-
1
)+
"\",\"lt\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getLt
())+
"\",\"zt\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getZt
())+
"\",\"ys\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getYs
())+
"\"}"
)
;
}
// [{"ce": "0", "re": "0", "le": "6","ze": "1", "ct": "0", "rt": "0","lt":"6","zt":"1","ys": "0"}]
String
content
=
String
.
join
(
","
,
filteredList
);
String
content2
=
"["
+
content
+
"]"
;
actSuppliesConvertrole
.
setContent
(
content2
);
SysUser
user
=
SecurityUtils
.
getLoginUser
().
getUser
();
actSuppliesConvertrole
.
setCreateBy
(
user
.
getUserName
());
actSuppliesConvertrole
.
setCreateTime
(
DateUtils
.
getNowDate
());
return
actSuppliesConvertMapper
.
insertActSuppliesConvert
(
actSuppliesConvertrole
);
}
...
...
@@ -66,6 +113,24 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
@Override
public
int
updateActSuppliesConvert
(
ActSuppliesConvertrole
actSuppliesConvertrole
)
{
List
<
String
>
filteredList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
actSuppliesConvertrole
.
getList
().
size
();
i
++){
filteredList
.
add
(
"{\"ce\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getCe
()-
1
)+
"\",\"re\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getRe
()-
1
)+
"\",\"le\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getLe
())+
"\",\"ze\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getZe
())+
"\",\"ct\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getCt
()-
1
)+
"\",\"rt\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getRt
()-
1
)+
"\",\"lt\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getLt
())+
"\",\"zt\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getZt
())+
"\",\"ys\":\""
+(
actSuppliesConvertrole
.
getList
().
get
(
i
).
getYs
())+
"\"}"
)
;
}
// [{"ce": "0", "re": "0", "le": "6","ze": "1", "ct": "0", "rt": "0","lt":"6","zt":"1","ys": "0"}]
String
content
=
String
.
join
(
","
,
filteredList
);
String
content2
=
"["
+
content
+
"]"
;
actSuppliesConvertrole
.
setContent
(
content2
);
SysUser
user
=
SecurityUtils
.
getLoginUser
().
getUser
();
actSuppliesConvertrole
.
setUpdateBy
(
user
.
getUserName
());
actSuppliesConvertrole
.
setUpdateTime
(
DateUtils
.
getNowDate
());
return
actSuppliesConvertMapper
.
updateActSuppliesConvert
(
actSuppliesConvertrole
);
}
...
...
@@ -93,4 +158,19 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
{
return
actSuppliesConvertMapper
.
deleteActSuppliesConvertById
(
id
);
}
@Override
public
List
<
ActSuppliesTemplate
>
selectActSuppliesConvertListTemp
()
{
return
actSuppliesConvertMapper
.
selectActSuppliesConvertListTemp
();
}
@Override
public
List
<
ActSuppliesConvertrole
>
convertRoleList
(
Integer
id
)
{
return
actSuppliesConvertMapper
.
convertRoleList
(
id
);
}
@Override
public
List
<
ActSuppliesConvertrole
>
convertRoleListid
(
Integer
id
)
{
return
actSuppliesConvertMapper
.
convertRoleListid
(
id
);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java
View file @
7787cfc7
...
...
@@ -72,6 +72,8 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
}
// [{"ce": "0", "re": "0","le":"10" , "ze":"1" ,"ct":"1", "rt": "1", "lt": "10", "zt": "2","ys":"1"}]
String
content
=
String
.
join
(
","
,
filteredList
);
String
content2
=
"["
+
content
+
"]"
;
...
...
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesConvertMapper.xml
View file @
7787cfc7
...
...
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"ActSuppliesConvertrole"
id=
"ActSuppliesConvertResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"tempId"
column=
"temp_id"
/>
<result
property=
"templateName"
column=
"template_name"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"content"
column=
"content"
/>
<result
property=
"status"
column=
"status"
/>
...
...
@@ -16,17 +17,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"updateTime"
column=
"update_time"
/>
</resultMap>
<resultMap
type=
"ActSuppliesTemplate"
id=
"SuppliesTemplateResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"detId"
column=
"det_id"
/>
<result
property=
"templateName"
column=
"template_name"
/>
<result
property=
"templateContent"
column=
"template_content"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
</resultMap>
<sql
id=
"selectActSuppliesConvertVo"
>
select id, temp_id, name, content, status, create_by, create_time, update_by, update_time from act_supplies_convert
</sql>
<select
id=
"selectActSuppliesConvertListTemp"
resultMap=
"SuppliesTemplateResult"
>
select id, template_name from act_supplies_template where status = 0;
</select>
<select
id=
"selectActSuppliesConvertList"
parameterType=
"ActSuppliesConvertrole"
resultMap=
"ActSuppliesConvertResult"
>
<include
refid=
"selectActSuppliesConvertVo"
/>
select a.id, a.temp_id,b.template_name, a.name, a.content, a.status from act_supplies_convert a,act_supplies_template b
<where>
<if
test=
"tempId != null "
>
and temp_id = #{tempId}
</if>
<if
test=
"
name != null and name != ''"
>
and name like concat('%', #{name}, '%')
</if>
<if
test=
"
content != null and content != ''"
>
and content = #{content}
</if>
<if
test=
"status != null "
>
and status = #{status}
</if>
a.temp_id = b.id
<if
test=
"
tempId != null "
>
and a.temp_id = #{tempId}
</if>
<if
test=
"
name != null and name != ''"
>
and a.name like concat('%', #{name}, '%')
</if>
<if
test=
"status != null "
>
and
a.
status = #{status}
</if>
</where>
</select>
...
...
@@ -84,4 +101,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<select
id=
"convertRoleList"
parameterType=
"Integer"
resultMap=
"ActSuppliesConvertResult"
>
select id, temp_id, name from act_supplies_convert where status = 0 and temp_id = #{id}
</select>
<select
id=
"convertRoleListid"
parameterType=
"Integer"
resultMap=
"ActSuppliesConvertResult"
>
select id, temp_id, name, content from act_supplies_convert where status = 0 and id = #{id}
</select>
</mapper>
\ No newline at end of file
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
View file @
7787cfc7
...
...
@@ -53,9 +53,6 @@
<select
id=
"saveSidsta"
parameterType=
"com.ruoyi.system.domain.ActSuppliesRole"
resultMap=
"ActSuppliesRoleResult"
>
select id, temp_id, role_name from act_supplies_role where status = 1;
</select>
<!-- <select id="saveOperation" parameterType="ActOperation" resultMap="ActOperationResult">-->
<!-- select id, operation_name, status from act_operation_role where status = 0-->
<!-- </select>-->
<select
id=
"selectActSuppliesRoleDetailList"
parameterType=
"ActSuppliesRoleDetail"
resultMap=
"ActSuppliesRoleDetailResult"
>
select a.id,a.role_id,a.detail_name,a.detail_content,a.convert_status,a.status,b.role_name,b.id detaId from act_supplies_role_detail a,act_supplies_role b
...
...
@@ -140,4 +137,5 @@
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
ruoyi-ui/src/api/ActSuppliesConvert/convert.js
View file @
7787cfc7
...
...
@@ -51,3 +51,28 @@ export function exportConvert(query) {
params
:
query
})
}
// 通用转换页面查询规则列表
export
function
convertRoleList
(
id
)
{
return
request
({
url
:
'
/ActSuppliesConvertrole/ActSuppliesConvertrole/convertRoleList/
'
+
id
,
method
:
'
get
'
})
}
// 通用转换页面查询规则详情
export
function
convertRoleListid
(
id
)
{
return
request
({
url
:
'
/ActSuppliesConvertrole/ActSuppliesConvertrole/convertRoleListid/
'
+
id
,
method
:
'
get
'
})
}
// 查询模板
export
function
listTemp
()
{
return
request
({
url
:
'
/ActSuppliesConvertrole/ActSuppliesConvertrole/listTemp
'
,
method
:
'
get
'
,
})
}
ruoyi-ui/src/views/ActSuppliesConvert/convert/indexConvert.vue
0 → 100644
View file @
7787cfc7
This diff is collapsed.
Click to expand it.
ruoyi-ui/src/views/system/supplies/index.vue
View file @
7787cfc7
...
...
@@ -969,6 +969,9 @@ export default {
let
vll2
=
luckysheet
.
getCellValue
(
rowws
,
parseInt
(
sysRulez
[
0
].
ct
)
+
1
);
luckysheet
.
setCellValue
(
rowws
+
1
,
parseInt
(
sysRulez
[
0
].
ct
)
+
1
,
vll2
);
//输出部门数量金额
luckysheet
.
setCellValue
(
rowws
+
1
,
sysRulez
[
1
].
ct
,
depp
);
for
(
let
i
=
0
;
i
<
sysRules
.
length
;
i
++
)
{
luckysheet
.
setCellValue
(
rowws
+
1
,
sysRules
[
i
].
ct
,
value
[
i
]);
...
...
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