diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index 6ba4546..fff4b98 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -131,14 +131,29 @@ public class TAmentPartyAffairsController extends BaseController @ResponseBody public AjaxResult reviewedSave(TAmentPartyAffairs tAmentPartyAffairs) { + TAmentPartyAffairs one = tAmentPartyAffairsService.selectTAmentPartyAffairsById(tAmentPartyAffairs.getId()); TAmentReviewedHis his = new TAmentReviewedHis(); his.setPer(tAmentPartyAffairs.getReviewer()); his.setReviewedTime(new Date()); - his.setScore(tAmentPartyAffairs.getScore()); + int before = 0; + if (null != one && null != one.getNowScore()){ + before = Integer.parseInt(one.getNowScore()); + } + int reviewScore = Integer.parseInt(tAmentPartyAffairs.getNowScore()); + his.setScore(tAmentPartyAffairs.getNowScore()); his.setRemark(tAmentPartyAffairs.getRemark()); reviewedHisService.insertTAmentReviewedHis(his); tAmentPartyAffairs.setReviewedId(his.getId()); tAmentPartyAffairs.setStatus("4"); + tAmentPartyAffairs.setNowScore(String.valueOf(reviewScore+before)); + return toAjax(tAmentPartyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs)); + } + + @GetMapping("/reback") + @ResponseBody + public AjaxResult reback(TAmentPartyAffairs tAmentPartyAffairs) + { + tAmentPartyAffairs.setStatus("3"); return toAjax(tAmentPartyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs)); } diff --git a/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html b/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html index 9e1201d..5d11d17 100644 --- a/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html +++ b/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html @@ -121,10 +121,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('查看图片 '); - actions.push('下载文件 '); - actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看图片 '); + actions.push('下载附件 '); + actions.push('上传附件 '); + // actions.push('查看详情 '); // actions.push('删除'); return actions.join(''); } diff --git a/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html b/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html index 9be8f7a..9f20dcc 100644 --- a/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html +++ b/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html @@ -105,10 +105,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('查看图片 '); - actions.push('下载文件 '); - actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看图片 '); + actions.push('下载附件 '); + actions.push('上传附件 '); + // actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html index a78be16..6c2ae79 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -185,10 +185,6 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('查看图片 '); - actions.push('下载文件 '); - actions.push('上传附件 '); - actions.push('查看详情 '); if (row.status === '1'){ actions.push('上传附件 '); }else if (row.status === '2'){ @@ -199,10 +195,10 @@ }else if (row.status === '4'){ actions.push('已完成 '); } - actions.push('查看详情 '); - - // actions.push('编辑 '); - // actions.push('删除'); + if (row.files && row.status !=='3'){ + actions.push('查看图片 '); + actions.push('下载附件 '); + } return actions.join(''); } }] diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html index 3360b17..6a1365a 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/day.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html @@ -189,13 +189,20 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('查看图片 '); - actions.push('下载文件 '); - actions.push('上传附件 '); - actions.push('查看详情 '); - - // actions.push('编辑 '); - // actions.push('删除'); + if (row.status === '1'){ + actions.push('上传附件 '); + }else if (row.status === '2'){ + actions.push('待审核 '); + }else if(row.status === '3'){ + actions.push('已驳回 '); + actions.push('重新上传附件 '); + }else if (row.status === '4'){ + actions.push('已完成 '); + } + if (row.files && row.status !=='3'){ + actions.push('查看图片 '); + actions.push('下载附件 '); + } return actions.join(''); } }] diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html index 5434b93..8576cd6 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html @@ -186,13 +186,20 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('查看图片 '); - actions.push('下载文件 '); - actions.push('上传附件 '); - actions.push('查看详情 '); - - // actions.push('编辑 '); - // actions.push('删除'); + if (row.status === '1'){ + actions.push('上传附件 '); + }else if (row.status === '2'){ + actions.push('待审核 '); + }else if(row.status === '3'){ + actions.push('已驳回 '); + actions.push('重新上传附件 '); + }else if (row.status === '4'){ + actions.push('已完成 '); + } + if (row.files && row.status !=='3'){ + actions.push('查看图片 '); + actions.push('下载附件 '); + } return actions.join(''); } }] diff --git a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html index 1b57360..6ecba93 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html @@ -58,7 +58,7 @@