c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
那些花儿
2025-09-08 14:45:47 +08:00
parent eaf1748cf9
commit eb493d2881
9 changed files with 497 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java
+7
View File
@@ -59,6 +59,13 @@ public class ProposalDelegationController {
public void index() {
}
@At("/platform/h5/proposal/delegation")
@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html")
@SaCheckPermission("proposal.delegation")
public void h5Index() {
}
@At
@SaCheckPermission("proposal.delegation")
@ApiOperation("分页列表")
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
-7
View File
@@ -68,13 +68,6 @@ public class ProposalSecondedController {
public void h5Index() {
}
@At(value = "/platform/h5/proposal/seconded/approval",top = true)
@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/approval.html")
@SaCheckPermission("proposal.seconded")
public void h5Approval(){
}
@At
@SaCheckPermission("proposal.seconded")
public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java
+13 -3
View File
@@ -25,6 +25,7 @@ import org.nutz.mvc.annotation.Ok;
import javax.validation.Valid;
import java.util.List;
import java.util.stream.Stream;
@IocBean
@At("/platform/proposal/unitReply")
@@ -44,6 +45,12 @@ public class ProposalUnderTakeReplyController {
public void index() {
}
@At(value = "/platform/h5/proposal/unitReply",top = true)
@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html")
@SaCheckPermission("proposal.unitReply")
public void h5Index() {
}
@At
@SaCheckPermission("proposal.unitReply")
@ApiOperation("分页列表")
@@ -105,10 +112,13 @@ public class ProposalUnderTakeReplyController {
List<NutMap> list = pagination.getList();
for (NutMap row : list) {
if (row.getInt("taskIsMaster") == 0) {
boolean b = List.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d", "04ecf80c-a9d0-4986-8aac-231758d6a7af").stream()
if (row.getInt("taskIsMaster") == 1) {
boolean b = Stream.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d", "04ecf80c-a9d0-4986-8aac-231758d6a7af")
.anyMatch(a -> row.getString("curTaskKey").contains(a));
row.setv("canRevoke",b);
row.setv("canRevoke",b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
}else{
boolean b = Stream.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d").anyMatch(a -> row.getString("curTaskKey").contains(a));
row.setv("canRevoke",b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
}
}
pagination.setList(list);