diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java index acc36de..11f0ec8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java @@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.dayofficework.article.models.Article; import com.budwk.app.zhgh.dayofficework.article.service.ArticleAnalysisService; import com.budwk.app.zhgh.dayofficework.article.service.ArticleService; import com.budwk.app.zhgh.dayofficework.article.vo.ArticleAnalysisOverviewVO; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleBranchUnionApprovalController.java index 91accc0..bf000d2 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleBranchUnionApprovalController.java @@ -94,7 +94,7 @@ public class ArticleBranchUnionApprovalController { cnd.and(Cnd.likeEX("info.title",pageForm.getTitle())); if(StrUtil.isAllBlank(pageForm.getPageOrderName(),pageForm.getPageOrderBy())){ - cnd.desc("info.createdAt"); + cnd.desc("info.submitTime"); }else{ cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java index e3aaf57..d191ed8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleClubApprovalController.java @@ -93,7 +93,7 @@ public class ArticleClubApprovalController { cnd.and(Cnd.likeEX("info.title",pageForm.getTitle())); if(StrUtil.isAllBlank(pageForm.getPageOrderName(),pageForm.getPageOrderBy())){ - cnd.desc("info.createdAt"); + cnd.desc("info.submitTime"); }else{ cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleExamineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleExamineController.java index 68d7f40..195cdeb 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleExamineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleExamineController.java @@ -97,10 +97,13 @@ public class ArticleExamineController { cnd.andEX("YEAR(info.submitTime)", "=", pageForm.getYear()); cnd.and(Cnd.likeEX("info.title", pageForm.getTitle())); + cnd.andEX("info.unionId","=",pageForm.getUnionId()); + cnd.andEX("info.unitId","=",pageForm.getUnitId()); + cnd.andEX("info.origin","=",pageForm.getOrigin()); - if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.desc("info.createdAt"); - } else { + if(StrUtil.isAllBlank(pageForm.getPageOrderName(),pageForm.getPageOrderBy())){ + cnd.desc("info.submitTime"); + }else{ cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } sql.setCondition(cnd); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java index 7f1a5f4..e1e9b68 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java @@ -97,10 +97,13 @@ public class ArticleFirstExamineController { cnd.andEX("YEAR(info.submitTime)", "=", pageForm.getYear()); cnd.and(Cnd.likeEX("info.title", pageForm.getTitle())); + cnd.andEX("info.unionId","=",pageForm.getUnionId()); + cnd.andEX("info.origin","=",pageForm.getOrigin()); + cnd.andEX("info.unitId","=",pageForm.getUnitId()); - if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.desc("info.createdAt"); - } else { + if(StrUtil.isAllBlank(pageForm.getPageOrderName(),pageForm.getPageOrderBy())){ + cnd.desc("info.submitTime"); + }else{ cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } sql.setCondition(cnd); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleMineController.java index c3bdc96..38a0929 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleMineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleMineController.java @@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.bpm.service.BpmService; import com.budwk.app.web.commons.auth.utils.AuthUtil; @@ -76,6 +75,7 @@ public class ArticleMineController { cnd.andEX("YEAR(info.submitTime)","=",pageForm.getYear()); cnd.and(Cnd.likeEX("info.title",pageForm.getTitle())); + cnd.desc("info.submitTime"); sql.setCondition(cnd); Pagination pageVO = articleService.listPageVO(pageForm, sql, ArticleInfoPageVO.class); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java index 4df8e8b..cc175f9 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; import com.budwk.app.zhgh.dayofficework.article.param.ArticleInfoPageParam; import com.budwk.app.zhgh.dayofficework.article.service.ArticleService; import com.budwk.app.zhgh.dayofficework.article.vo.ArticleInfoPageVO; @@ -62,8 +63,14 @@ public class ArticleQueryController { cnd.andEX("info.unionId", "=", pageForm.getUnionId()); cnd.andEX("info.unitId", "=", pageForm.getUnitId()); cnd.andEX("info.clubId", "=", pageForm.getClubId()); - cnd.andEX("info.mode", "=", pageForm.getMode()); - cnd.desc("info.submitTime"); + cnd.andEX("info.origin","=",pageForm.getOrigin()); + + if(StrUtil.isAllBlank(pageForm.getPageOrderName(),pageForm.getPageOrderBy())){ + cnd.desc("info.submitTime"); + }else{ + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + cnd.groupBy("info.id"); sql.setCondition(cnd); Pagination pageVO = articleService.listPageVO(pageForm, sql, ArticleInfoPageVO.class); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleSchoolUnionApprovalController.java index b5bbe99..389bbe2 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleSchoolUnionApprovalController.java @@ -9,7 +9,6 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; -import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; import com.budwk.app.bpm.param.BpmTaskApprovalParam; import com.budwk.app.bpm.service.BpmService; import com.budwk.app.web.commons.auth.utils.AuthUtil; @@ -93,11 +92,11 @@ public class ArticleSchoolUnionApprovalController { cnd.andEX("YEAR(info.submitTime)","=",pageForm.getYear()); cnd.and(Cnd.likeEX("info.title",pageForm.getTitle())); cnd.andEX("info.unionId","=",pageForm.getUnionId()); - cnd.andEX("info.mode","=",pageForm.getMode()); cnd.andEX("info.unitId","=",pageForm.getUnitId()); + cnd.andEX("info.origin","=",pageForm.getOrigin()); if(StrUtil.isAllBlank(pageForm.getPageOrderName(),pageForm.getPageOrderBy())){ - cnd.desc("info.createdAt"); + cnd.desc("info.submitTime"); }else{ cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } @@ -116,9 +115,6 @@ public class ArticleSchoolUnionApprovalController { approvalParam.getBpmTaskApprovalTypeEnum(); Map variables = BeanUtil.beanToMap(approvalParam); List assignments = new ArrayList<>(); -// if(approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)){ -// -// } // 同意退回都到校工会投稿编辑人 String schoolUnionApprovalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.SCHOOL_UNION_ARTICLE_ADMIN, Cnd.NEW()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java index f322a98..46a56af 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleWriteController.java @@ -120,6 +120,11 @@ public class ArticleWriteController { } else if (prevTask.getProcessTaskNodeCode() == 60) { variables.put("FINAL_EXAMINE_BACK", true); } + + // 重新赋值 + assignments = new ArrayList<>(); + String schoolUnionApprovalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.SCHOOL_UNION_ARTICLE_ADMIN, Cnd.NEW()); + assignments.add(schoolUnionApprovalLoginName); } } } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java index e52eb9a..0c2a27a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/param/ArticleInfoPageParam.java @@ -27,6 +27,7 @@ public class ArticleInfoPageParam extends PageForm
{ @ApiModelProperty("协会") private String clubId; - private String mode; + @ApiModelProperty("稿件来源") + private String origin; } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleService.java index 4f46037..1276fec 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/ArticleService.java @@ -4,10 +4,6 @@ import com.budwk.app.base.service.BaseService; import com.budwk.app.zhgh.dayofficework.article.models.Article; import com.budwk.app.zhgh.dayofficework.article.vo.ArticleVO; -import javax.validation.Valid; -import java.util.List; -import java.util.Map; - public interface ArticleService extends BaseService
{ ArticleVO info(String id); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleServiceImpl.java index ec4da08..fbaeb8b 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/service/impl/ArticleServiceImpl.java @@ -11,7 +11,6 @@ import com.budwk.app.zhgh.dayofficework.article.vo.ArticleVO; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; import java.util.List; diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/common/info.js b/src/main/resources/views/platform/zhgh/dayofficework/article/common/info.js index d4126c6..d3469f3 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/common/info.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/common/info.js @@ -47,6 +47,12 @@ const info = { 需要重新走流程 同意 + + 退回到协会 + + + 退回到分工会 + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/examine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/examine/index.html index 6e3a8d9..f39ecb0 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/examine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/examine/index.html @@ -11,6 +11,21 @@ layout("/layouts/platform.html"){ + + + + + + + + + + + + + + + @@ -120,7 +135,7 @@ layout("/layouts/platform.html"){ doApproval(result) { this.formData.bpmTaskApprovalType = "DYNAMIC" if (result === 'BACK_TO_START') { - this.$confirm('请确认投稿人重新提交后是否需要分工会主席再次审核?', '提示', { + this.$confirm('请确认投稿人重新提交后是否需要重新走审批流程?', '提示', { distinguishCancelAndClose: true, confirmButtonText: '需要', cancelButtonText: '不需要', @@ -180,6 +195,8 @@ layout("/layouts/platform.html"){ } }, created() { + this.$businessTool.listUnit().then((res) => (this.unitOptions = res)) + this.$businessTool.listUnion().then((res) => (this.unionOptions = res)) this.pageData() } }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html index 7094fb5..e35ffd8 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html @@ -12,6 +12,21 @@ layout("/layouts/platform.html"){ + + + + + + + + + + + + + + + @@ -76,7 +91,7 @@ layout("/layouts/platform.html"){ 退回到协会 - 拒绝 + 通过 @@ -123,7 +138,7 @@ layout("/layouts/platform.html"){ this.formData.bpmTaskApprovalType = "DYNAMIC" if (result === 'BACK_TO_START') { - this.$confirm('请确认投稿人重新提交后是否需要分工会主席再次审核?', '提示', { + this.$confirm('请确认投稿人重新提交后是否需要重新走审批流程?', '提示', { distinguishCancelAndClose: true, confirmButtonText: '需要', cancelButtonText: '不需要', @@ -177,6 +192,8 @@ layout("/layouts/platform.html"){ } }, created() { + this.$businessTool.listUnit().then((res) => (this.unitOptions = res)) + this.$businessTool.listUnion().then((res) => (this.unionOptions = res)) this.pageData() } }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html index 46da1ba..a44d6a7 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html @@ -28,7 +28,7 @@ layout("/layouts/platform.html"){ - + @@ -67,7 +67,7 @@ layout("/layouts/platform.html"){