见习之星考核方案优化

2020-09-04 10:46:30 +08:00
parent 5520d5e218
commit d0c0116e6f
11 changed files with 420 additions and 275 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java
@ -32,6 +32,7 @@ public class TsbzJxzxStatisticsController extends BaseController {
    public TableDataInfo list(TsbzJxzxmd tsbzJxzxmd) {
        System.out.println("nf:" + tsbzJxzxmd.getNf());
        System.out.println("faid:" + tsbzJxzxmd.getFaid());
+        System.out.println("name:" + tsbzJxzxmd.getName());
        startPage();
        List<TsbzJxzxmd> list = tsbzJxzxmdService.selectTsbzJxzxmdKhjdList(tsbzJxzxmd);
        return getDataTable(list);
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhfaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhfaController.java
@ -3,6 +3,8 @@ package com.ruoyi.web.controller.jxzxkhgl;
 import java.util.List;

 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhzbx;
+import com.ruoyi.jxzxkhgl.service.ITsbzJxzxkhzbxService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@ -24,24 +26,24 @@ import com.ruoyi.common.core.page.TableDataInfo;

 /**
 * 见习之星考核方案Controller
- * 
+ *
 * @author ruoyi
 * @date 2020-08-29
 */
@RestController
@RequestMapping("/jxzxkhgl/jxzxkhfa")
-public class TsbzJxzxkhfaController extends BaseController
-{
+public class TsbzJxzxkhfaController extends BaseController {
    @Autowired
    private ITsbzJxzxkhfaService tsbzJxzxkhfaService;
+    @Autowired
+    private ITsbzJxzxkhzbxService tsbzJxzxkhzbxService;

    /**
     * 查询见习之星考核方案列表
     */
    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:list')")
    @GetMapping("/list")
-    public TableDataInfo list(TsbzJxzxkhfa tsbzJxzxkhfa)
-    {
+    public TableDataInfo list(TsbzJxzxkhfa tsbzJxzxkhfa) {
        startPage();
        List<TsbzJxzxkhfa> list = tsbzJxzxkhfaService.selectTsbzJxzxkhfaList(tsbzJxzxkhfa);
        return getDataTable(list);
@ -53,8 +55,7 @@ public class TsbzJxzxkhfaController extends BaseController
    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:export')")
    @Log(title = "见习之星考核方案", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
-    public AjaxResult export(TsbzJxzxkhfa tsbzJxzxkhfa)
-    {
+    public AjaxResult export(TsbzJxzxkhfa tsbzJxzxkhfa) {
        List<TsbzJxzxkhfa> list = tsbzJxzxkhfaService.selectTsbzJxzxkhfaList(tsbzJxzxkhfa);
        ExcelUtil<TsbzJxzxkhfa> util = new ExcelUtil<TsbzJxzxkhfa>(TsbzJxzxkhfa.class);
        return util.exportExcel(list, "jxzxkhfa");
@ -65,8 +66,7 @@ public class TsbzJxzxkhfaController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:query')")
    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(tsbzJxzxkhfaService.selectTsbzJxzxkhfaById(id));
    }

@ -76,8 +76,15 @@ public class TsbzJxzxkhfaController extends BaseController
    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:add')")
    @Log(title = "见习之星考核方案", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult add(@RequestBody TsbzJxzxkhfa tsbzJxzxkhfa)
-    {
+    public AjaxResult add(@RequestBody TsbzJxzxkhfa tsbzJxzxkhfa) {
+        //新增的时候 判断是否创建了当前年份方案
+        TsbzJxzxkhfa tsbzJxzxkhfaNew = new TsbzJxzxkhfa();
+        tsbzJxzxkhfaNew.setKhnf(tsbzJxzxkhfa.getKhnf());
+        List<TsbzJxzxkhfa> list = tsbzJxzxkhfaService.selectTsbzJxzxkhfaList(tsbzJxzxkhfaNew);
+        if (list != null && list.size() > 0) {
+            return AjaxResult.error("当前年份的考核方案已创建，不可重复创建");
+        }
+
        tsbzJxzxkhfa.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
        return toAjax(tsbzJxzxkhfaService.insertTsbzJxzxkhfa(tsbzJxzxkhfa));
    }
@ -88,8 +95,7 @@ public class TsbzJxzxkhfaController extends BaseController
    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:edit')")
    @Log(title = "见习之星考核方案", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult edit(@RequestBody TsbzJxzxkhfa tsbzJxzxkhfa)
-    {
+    public AjaxResult edit(@RequestBody TsbzJxzxkhfa tsbzJxzxkhfa) {
        return toAjax(tsbzJxzxkhfaService.updateTsbzJxzxkhfa(tsbzJxzxkhfa));
    }

@ -98,9 +104,19 @@ public class TsbzJxzxkhfaController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:remove')")
    @Log(title = "见习之星考核方案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        //判断方案下是否存在指标项
+        TsbzJxzxkhzbx tsbzJxzxkhzbx = null;
+        for (int i = 0; i < ids.length; i++) {
+            tsbzJxzxkhzbx = new TsbzJxzxkhzbx();
+            tsbzJxzxkhzbx.setFaid(ids[i]);
+
+            List<TsbzJxzxkhzbx> list = tsbzJxzxkhzbxService.selectTsbzJxzxkhzbxList(tsbzJxzxkhzbx);
+            if (list != null && list.size() > 0) {
+                return AjaxResult.error("当前见习之星考核方案下存在指标项，不可删除");
+            }
+        }
        return toAjax(tsbzJxzxkhfaService.deleteTsbzJxzxkhfaByIds(ids));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhzbxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhzbxController.java
@ -38,7 +38,7 @@ public class TsbzJxzxkhzbxController extends BaseController
    /**
     * 查询考核指标项列表
     */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhzbx:list')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:list')")
    @GetMapping("/list")
    public TableDataInfo list(TsbzJxzxkhzbx tsbzJxzxkhzbx)
    {
@ -50,7 +50,7 @@ public class TsbzJxzxkhzbxController extends BaseController
    /**
     * 导出考核指标项列表
     */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhzbx:export')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:export')")
    @Log(title = "考核指标项", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(TsbzJxzxkhzbx tsbzJxzxkhzbx)
@ -63,7 +63,7 @@ public class TsbzJxzxkhzbxController extends BaseController
    /**
     * 获取考核指标项详细信息
     */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhzbx:query')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@ -73,7 +73,7 @@ public class TsbzJxzxkhzbxController extends BaseController
    /**
     * 新增考核指标项
     */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhzbx:add')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:add')")
    @Log(title = "考核指标项", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TsbzJxzxkhzbx tsbzJxzxkhzbx)
@ -85,7 +85,7 @@ public class TsbzJxzxkhzbxController extends BaseController
    /**
     * 修改考核指标项
     */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhzbx:edit')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:edit')")
    @Log(title = "考核指标项", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TsbzJxzxkhzbx tsbzJxzxkhzbx)
@ -96,7 +96,7 @@ public class TsbzJxzxkhzbxController extends BaseController
    /**
     * 删除考核指标项
     */
-    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhzbx:remove')")
+    @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhfa:remove')")
    @Log(title = "考核指标项", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)