Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
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
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
474e8bd7
Commit
474e8bd7
authored
Feb 17, 2023
by
weixin_42327055
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备变更审批,app接口更改。
parent
a08a4e0b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
2 deletions
+29
-2
TChangeApplyApproval.java
...n/java/com/zehong/system/domain/TChangeApplyApproval.java
+10
-0
TChangeApplyApproverMapper.java
.../com/zehong/system/mapper/TChangeApplyApproverMapper.java
+2
-0
TChangeApplyApproverServiceImpl.java
.../system/service/impl/TChangeApplyApproverServiceImpl.java
+10
-1
TChangeApplyApprovalMapper.xml
...in/resources/mapper/system/TChangeApplyApprovalMapper.xml
+2
-1
TChangeApplyApproverMapper.xml
...in/resources/mapper/system/TChangeApplyApproverMapper.xml
+5
-0
No files found.
danger-manage-system/src/main/java/com/zehong/system/domain/TChangeApplyApproval.java
View file @
474e8bd7
...
@@ -59,6 +59,16 @@ public class TChangeApplyApproval extends BaseEntity
...
@@ -59,6 +59,16 @@ public class TChangeApplyApproval extends BaseEntity
private
Long
approvalPerson
;
private
Long
approvalPerson
;
private
String
approvalSign
;
public
String
getApprovalSign
()
{
return
approvalSign
;
}
public
void
setApprovalSign
(
String
approvalSign
)
{
this
.
approvalSign
=
approvalSign
;
}
public
Long
getApprovalPerson
()
{
public
Long
getApprovalPerson
()
{
return
approvalPerson
;
return
approvalPerson
;
}
}
...
...
danger-manage-system/src/main/java/com/zehong/system/mapper/TChangeApplyApproverMapper.java
View file @
474e8bd7
...
@@ -66,4 +66,6 @@ public interface TChangeApplyApproverMapper
...
@@ -66,4 +66,6 @@ public interface TChangeApplyApproverMapper
* @return
* @return
*/
*/
int
batchInsertTChangeApplyApprover
(
List
<
TChangeApplyApprover
>
changeApplyApproverList
);
int
batchInsertTChangeApplyApprover
(
List
<
TChangeApplyApprover
>
changeApplyApproverList
);
List
<
TChangeApplyApprover
>
selectSignList
(
Long
changeApplyId
);
}
}
danger-manage-system/src/main/java/com/zehong/system/service/impl/TChangeApplyApproverServiceImpl.java
View file @
474e8bd7
...
@@ -71,7 +71,16 @@ public class TChangeApplyApproverServiceImpl implements ITChangeApplyApproverSer
...
@@ -71,7 +71,16 @@ public class TChangeApplyApproverServiceImpl implements ITChangeApplyApproverSer
@Override
@Override
public
int
updateTChangeApplyApprover
(
TChangeApplyApprover
tChangeApplyApprover
)
public
int
updateTChangeApplyApprover
(
TChangeApplyApprover
tChangeApplyApprover
)
{
{
return
tChangeApplyApproverMapper
.
updateTChangeApplyApprover
(
tChangeApplyApprover
);
int
a
=
tChangeApplyApproverMapper
.
updateTChangeApplyApprover
(
tChangeApplyApprover
);
List
<
TChangeApplyApprover
>
list
=
tChangeApplyApproverMapper
.
selectSignList
(
tChangeApplyApprover
.
getApprovalPerson
());
if
(
list
.
size
()==
0
){
TChangeApplyApproval
approval
=
tChangeApplyApprovalMapper
.
selectTChangeApplyApprovalById
(
tChangeApplyApprover
.
getChangeApplyId
());
if
(
approval
.
getChangeApplyStatus
().
equals
(
"1"
)){
approval
.
setChangeApplyStatus
(
"2"
);
tChangeApplyApprovalMapper
.
updateTChangeApplyApproval
(
approval
);
}
}
return
a
;
}
}
/**
/**
...
...
danger-manage-system/src/main/resources/mapper/system/TChangeApplyApprovalMapper.xml
View file @
474e8bd7
...
@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"isDel"
column=
"is_del"
/>
<result
property=
"isDel"
column=
"is_del"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"approvalPerson"
column=
"approvalPerson"
/>
<result
property=
"approvalPerson"
column=
"approvalPerson"
/>
<result
property=
"approvalSign"
column=
"approvalSign"
/>
</resultMap>
</resultMap>
<sql
id=
"selectTChangeApplyApprovalVo"
>
<sql
id=
"selectTChangeApplyApprovalVo"
>
...
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY enter_time DESC
ORDER BY enter_time DESC
</select>
</select>
<select
id=
"selectTChangeApplyApprovalListApp"
parameterType=
"TChangeApplyApproval"
resultMap=
"TChangeApplyApprovalResult"
>
<select
id=
"selectTChangeApplyApprovalListApp"
parameterType=
"TChangeApplyApproval"
resultMap=
"TChangeApplyApprovalResult"
>
SELECT a.* FROM t_change_apply_approver r
SELECT a.*
,r.approval_sign as approvalSign
FROM t_change_apply_approver r
LEFT JOIN t_change_apply_approval a ON a.`change_apply_id` = r.`change_apply_id`
LEFT JOIN t_change_apply_approval a ON a.`change_apply_id` = r.`change_apply_id`
<where>
<where>
<if
test=
"changeUnit != null and changeUnit != ''"
>
and a.change_unit = #{changeUnit}
</if>
<if
test=
"changeUnit != null and changeUnit != ''"
>
and a.change_unit = #{changeUnit}
</if>
...
...
danger-manage-system/src/main/resources/mapper/system/TChangeApplyApproverMapper.xml
View file @
474e8bd7
...
@@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include
refid=
"selectTChangeApplyApproverVo"
/>
<include
refid=
"selectTChangeApplyApproverVo"
/>
where change_apply_approver_id = #{changeApplyApproverId}
where change_apply_approver_id = #{changeApplyApproverId}
</select>
</select>
<select
id=
"selectSignList"
parameterType=
"Long"
resultMap=
"TChangeApplyApproverResult"
>
<include
refid=
"selectTChangeApplyApproverVo"
/>
where change_apply_id = #{changeApplyId}
</select>
<insert
id=
"insertTChangeApplyApprover"
parameterType=
"TChangeApplyApprover"
useGeneratedKeys=
"true"
keyProperty=
"changeApplyApproverId"
>
<insert
id=
"insertTChangeApplyApprover"
parameterType=
"TChangeApplyApprover"
useGeneratedKeys=
"true"
keyProperty=
"changeApplyApproverId"
>
insert into t_change_apply_approver
insert into t_change_apply_approver
...
...
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