Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
776bddeb
Commit
776bddeb
authored
May 06, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
251780d2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
17 deletions
+5
-17
EXPersonUser.java
.../yeejoin/amos/boot/module/jxiop/api/dto/EXPersonUser.java
+1
-1
StationBasicMapper.xml
...xiop-api/src/main/resources/mapper/StationBasicMapper.xml
+1
-1
PrivilegeController.java
...boot/module/jxiop/biz/controller/PrivilegeController.java
+0
-12
StationBasicController.java
...t/module/jxiop/biz/controller/StationBasicController.java
+2
-2
StationBasicServiceImpl.java
...odule/jxiop/biz/service/impl/StationBasicServiceImpl.java
+1
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/EXPersonUser.java
View file @
776bddeb
...
@@ -115,7 +115,7 @@ public class EXPersonUser {
...
@@ -115,7 +115,7 @@ public class EXPersonUser {
@ExcelProperty
(
value
=
"是否特殊工种"
,
index
=
21
)
@ExcelProperty
(
value
=
"是否特殊工种"
,
index
=
21
)
@ExplicitConstraint
(
indexNum
=
21
,
source
=
{
"是"
,
"否"
})
//固定下拉内容
@ExplicitConstraint
(
indexNum
=
21
,
source
=
{
"是"
,
"否"
})
//固定下拉内容
@ApiModelProperty
(
value
=
"是否特殊工种"
)
@ApiModelProperty
(
value
=
"是否特殊工种"
)
private
Integer
isSpecialWork
;
private
String
isSpecialWork
;
@ExcelProperty
(
value
=
"技能鉴定工种"
,
index
=
22
)
@ExcelProperty
(
value
=
"技能鉴定工种"
,
index
=
22
)
@ExplicitConstraint
(
indexNum
=
22
,
sourceClass
=
CommonExplicitConstraint
.
class
,
type
=
"JNDDGZ"
)
//固定下拉内容
@ExplicitConstraint
(
indexNum
=
22
,
sourceClass
=
CommonExplicitConstraint
.
class
,
type
=
"JNDDGZ"
)
//固定下拉内容
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml
View file @
776bddeb
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
</where>
</where>
</select>
</select>
<delete
id=
"deleteList"
parameterType=
"int"
>
<delete
id=
"deleteList"
>
delete from station_basic where sequence_nbr = #{id};
delete from station_basic where sequence_nbr = #{id};
delete from station_coordinate where station_id = #{id}
delete from station_coordinate where station_id = #{id}
</delete>
</delete>
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java
View file @
776bddeb
...
@@ -140,17 +140,5 @@ public class PrivilegeController extends BaseController{
...
@@ -140,17 +140,5 @@ public class PrivilegeController extends BaseController{
}
}
// public List<ListCompanyModel> getdata(Collection<CompanyModel> datas){
// List<ListCompanyModel> list =new ArrayList<>();
// for (CompanyModel companyModel : datas) {
// ListCompanyModel companyModeld = new ListCompanyModel();
// companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
// companyModeld.setCompanyName(companyModel.getCompanyName());
// companyModeld.setChildren(getdata(companyModel.getChildren()));
// list.add(companyModeld);
// }
// return list;
// }
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java
View file @
776bddeb
...
@@ -53,7 +53,7 @@ public class StationBasicController extends BaseController {
...
@@ -53,7 +53,7 @@ public class StationBasicController extends BaseController {
stationBasicServiceImpl
.
add
(
model
);
stationBasicServiceImpl
.
add
(
model
);
return
ResponseHelper
.
buildResponse
(
null
);
return
ResponseHelper
.
buildResponse
(
null
);
}
catch
(
InnerInvokException
e
)
{
}
catch
(
InnerInvokException
e
)
{
return
this
.
buildResponseFalse
(
e
.
getMessage
());
return
this
.
buildResponseFalse
(
e
.
getMessage
()
.
replace
(
"公司"
,
"场站"
)
);
}
}
}
}
...
@@ -84,7 +84,7 @@ public class StationBasicController extends BaseController {
...
@@ -84,7 +84,7 @@ public class StationBasicController extends BaseController {
stationBasicServiceImpl
.
update
(
model
);
stationBasicServiceImpl
.
update
(
model
);
return
ResponseHelper
.
buildResponse
(
null
);
return
ResponseHelper
.
buildResponse
(
null
);
}
catch
(
InnerInvokException
e
)
{
}
catch
(
InnerInvokException
e
)
{
return
this
.
buildResponseFalse
(
e
.
getMessage
());
return
this
.
buildResponseFalse
(
e
.
getMessage
()
.
replace
(
"公司"
,
"场站"
)
);
}
}
}
}
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java
View file @
776bddeb
...
@@ -197,7 +197,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
...
@@ -197,7 +197,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
@Transactional
public
void
update
(
StationBasic
stationBasic
)
{
public
void
update
(
StationBasic
stationBasic
)
{
//场站坐标信息
//场站坐标信息
...
...
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