年度比赛项目忽然出现到待审核AND比赛名称重复

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java

@@ -198,6 +198,71 @@ public class AnnualCompPointController extends JeecgController<AnnualCompPoint,
         return Result.OK(pageList);
     }
 
+    /**
+     * 组委会 待审核
+     * @param annualCompPoint
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return {@link Result}<{@link IPage}<{@link AnnualCompPoint}>>
+     */
+    @GetMapping(value = "/listdsh")
+    public Result<IPage<AnnualCompPoint>> listdsh(AnnualCompPoint annualCompPoint,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        QueryWrapper<AnnualCompPoint> queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
+        queryWrapper.eq("annual_comp_state","1");
+        Page<AnnualCompPoint> page = new Page<AnnualCompPoint>(pageNo, pageSize);
+        IPage<AnnualCompPoint> pageList = annualCompPointService.page(page, queryWrapper);
+
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 组委会 已审核
+     * @param annualCompPoint
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return {@link Result}<{@link IPage}<{@link AnnualCompPoint}>>
+     */
+    @GetMapping(value = "/listysh")
+    public Result<IPage<AnnualCompPoint>> listysh(AnnualCompPoint annualCompPoint,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        QueryWrapper<AnnualCompPoint> queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
+        queryWrapper.eq("annual_comp_state","2");
+        Page<AnnualCompPoint> page = new Page<AnnualCompPoint>(pageNo, pageSize);
+        IPage<AnnualCompPoint> pageList = annualCompPointService.page(page, queryWrapper);
+
+        return Result.OK(pageList);
+    }
+
+
+    /**
+     *
+     * 组委会 带驳回
+     * @param annualCompPoint
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return {@link Result}<{@link IPage}<{@link AnnualCompPoint}>>
+     */
+    @GetMapping(value = "/listdbh")
+    public Result<IPage<AnnualCompPoint>> listdbh(AnnualCompPoint annualCompPoint,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        QueryWrapper<AnnualCompPoint> queryWrapper = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
+        queryWrapper.eq("annual_comp_state","3");
+        Page<AnnualCompPoint> page = new Page<AnnualCompPoint>(pageNo, pageSize);
+        IPage<AnnualCompPoint> pageList = annualCompPointService.page(page, queryWrapper);
+
+        return Result.OK(pageList);
+    }
+
 
     /**
      * 专家 显示所有

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java

@@ -205,6 +205,11 @@ public class CompController extends JeecgController<Comp, ICompService> {
         Integer compOrder = comp.getCompOrder();
         String departIds = comp.getCompOrgan();
 
+        List<Comp> compListsss = compService.query().eq("comp_name",comp.getCompName()).list();
+        if (compListsss.size()>0){
+            return Result.error("这个比赛名称已存在，请确定比赛名称是否正确");
+        }
+
 
         List<String> list = Arrays.asList(comp.getCompAdmin().split(","));
        /* List list1 = new ArrayList<>();
@@ -266,7 +271,7 @@ public class CompController extends JeecgController<Comp, ICompService> {
                 System.out.println(compList.get(i).getCompOrder());
                 int rankold = insertAndRank(parlint, String.valueOf(compList.get(i).getCompOrder()));
                 int scoreold = (int) (( rankold+1) * b + compTypeService.getById(comp.getCompTypeId()).getScorel());
-                compService.updatedate(compList.get(i).getId(),scoreold);
+                compService.updatedatework(compList.get(i).getId(),scoreold);
             }
         }
         /*--------------------------王家东添加开始============================*/

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/mapper/CompMapper.java

@@ -30,5 +30,5 @@ public interface CompMapper extends BaseMapper<Comp> {
     List<Comp> getAllCompByType(String compTypeId);
 
     @Update("UPDATE comp SET compweight = #{scoreold} WHERE id=#{id}")
-    void updatedate(String id, int scoreold);
+    void updatedatework(String id, int scoreold);
 }

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/service/ICompService.java

@@ -22,5 +22,5 @@ public interface ICompService extends IService<Comp> {
 
     List<Comp> getAllCompByType(String compTypeId);
 
-    void updatedate(String id, int scoreold);
+    void updatedatework(String id, int scoreold);
 }

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/service/impl/CompServiceImpl.java

@@ -42,7 +42,7 @@ public class CompServiceImpl extends ServiceImpl<CompMapper, Comp> implements IC
     }
 
     @Override
-    public void updatedate(String id, int scoreold) {
-        compMapper.updatedate(id,scoreold);
+    public void updatedatework(String id, int scoreold) {
+        compMapper.updatedatework(id,scoreold);
     }
 }

jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPoint.api.ts

@@ -6,6 +6,9 @@ const {createConfirm} = useMessage();
 enum Api {
   listZJ = '/AnnualCompPoint/annualCompPoint/listZJ',
   list = '/AnnualCompPoint/annualCompPoint/listAdmin',
+  listdsh = '/AnnualCompPoint/annualCompPoint/listdsh',
+  listdbh = '/AnnualCompPoint/annualCompPoint/listdbh',
+  listysh = '/AnnualCompPoint/annualCompPoint/listysh',
   save = '/AnnualCompPoint/annualCompPoint/add',
   edit = '/AnnualCompPoint/annualCompPoint/edit',
   deleteOne = '/AnnualCompPoint/annualCompPoint/delete',
@@ -15,6 +18,12 @@ enum Api {
   updatePass = '/AnnualCompPoint/annualCompPoint/updatePass',
 }
 
+//待审核
+export const listdsh = (params) => defHttp.get({ url: Api.listdsh, params });
+//带驳回
+export const listdbh = (params) => defHttp.get({ url: Api.listdbh, params });
+//带已审核
+export const listysh = (params) => defHttp.get({ url: Api.listysh, params });
 /**
  * 导出api
  * @param params

jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPoint.data.ts

@@ -59,6 +59,18 @@ export const columns: BasicColumn[] = [
           return '待驳回';
         case "4":
           return '已驳回';
+        case "5":
+          return '已报名';
+        case "6":
+          return '已选题';
+        case "7":
+          return '已上传作品';
+        case "8":
+          return '已评分';
+        case "9":
+          return '已评奖';
+        case "10":
+          return '积分已汇总';
         default:
           return annualCompState.value;
       }

jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitPass.vue

@@ -63,7 +63,7 @@ import {BasicTable, useTable, TableAction} from '/@/components/Table';
 import {useListPage} from '/@/hooks/system/useListPage';
 import {columns} from './AnnualCompPoint.data';
 import {
-  list,
+  listdsh,
   deleteOne,
   batchDelete,
   getImportUrl,
@@ -87,7 +87,7 @@ const registerModal = ref();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '年度比赛项目管理',
-    api: list,
+    api: listdsh,
     columns,
     canResize: false,
     useSearchForm: false,
@@ -96,7 +96,6 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
       fixed: 'right',
     },
     beforeFetch: (params) => {
-      queryParam.annualCompState=1;
       return Object.assign(params, queryParam);
     },
   },

jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitReject.vue

@@ -64,7 +64,7 @@ import {BasicTable, useTable, TableAction} from '/@/components/Table';
 import {useListPage} from '/@/hooks/system/useListPage';
 import {columns} from './AnnualCompPoint.data';
 import {
-  list,
+  listdbh,
   deleteOne,
   batchDelete,
   getImportUrl,
@@ -90,7 +90,7 @@ const registerModal1 = ref();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '年度比赛项目管理',
-    api: list,
+    api: listdbh,
     columns,
     canResize: false,
     useSearchForm: false,
@@ -99,7 +99,6 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
       fixed: 'right',
     },
     beforeFetch: (params) => {
-      queryParam.annualCompState=3;
       return Object.assign(params, queryParam);
     },
   },

jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue

@@ -63,7 +63,7 @@ import {BasicTable, useTable, TableAction} from '/@/components/Table';
 import {useListPage} from '/@/hooks/system/useListPage';
 import {columns} from './AnnualCompPoint.data';
 import {
-  list,
+  listysh,
   deleteOne,
   batchDelete,
   getImportUrl,
@@ -87,7 +87,7 @@ const registerModal = ref();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '年度比赛项目管理',
-    api: list,
+    api: listysh,
     // api: () => list({ ...params, compStatus: compStatus }),
     columns,
     canResize: false,
@@ -97,7 +97,6 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
       fixed: 'right',
     },
     beforeFetch: (params) => {
-      queryParam.annualCompState=2;
       return Object.assign(params, queryParam);
     },
   },