成绩审核js交互

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleMapper.xml

@@ -79,8 +79,7 @@
     <select id="getRoadStatistic" resultType="int">
         select count(1)
         from gksite.gk_cmpt_score_rule rule
-        inner join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id
-        inner join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id
+        inner join gk_cmpt_score_rule_scoreinfo score on rule.id = score.rule_id
         inner join geerunner.cmpt_enroll enroll on rule.cmpt_id=enroll.cmpt_id and rulemap.mark_no=enroll.nick_id and enroll.del_flg=0
         where rule.cmpt_id=#{cmptId} and rule.id=#{ruleId}
               and enroll.cmpt_item=#{roadId}
@@ -112,17 +111,15 @@
 
     <select id="getRoadStatisticByCmptIdAndRoadId" resultMap="userMap">
         select enroll.enroll_id user_enroll_id,enroll.member_name user_memberName,enroll.sex user_sex,item.item_name user_itemName,
-                enroll.nick_id user_markNo,rulemap.rule_id score_ruleId,
+                enroll.nick_id user_markNo,score.rule_id score_ruleId,
                score.id score_scoreId,score.subsectionscore score_duration,score.subsectionTime score_date,
                fv.id score_field_fvid, fv.scoreFieldValue score_field_scoreFieldValue,fv.scoreFieldName score_field_scoreFieldName
         from  geerunner.cmpt_enroll enroll
-			  left  join gksite.gk_cmpt_score_rule rule on rule.cmpt_id=enroll.cmpt_id
-              LEFT join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id and enroll.nick_id=rulemap.mark_no
-              left join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id
-              left join geerunner.cmpt_item item on item.item_id = enroll.cmpt_item
-			   left join gksite.gk_cmpt_score_field_value fv on fv.rule_id=rule.id  and fv.markNo=enroll.nick_id and fv.isDelete=0
-        where enroll.cmpt_id=#{cmptId}
-              and enroll.cmpt_item=#{roadId} and enroll.del_flg=0
+        left  join gksite.gk_cmpt_score_rule rule on rule.cmpt_id=enroll.cmpt_id
+                    left join gk_cmpt_score_rule_scoreinfo score on rule.id = score.rule_id and score.mark_no = enroll.nick_id
+                    left join geerunner.cmpt_item item on item.item_id = enroll.cmpt_item
+         left join gksite.gk_cmpt_score_field_value fv on fv.rule_id=rule.id  and fv.markNo=enroll.nick_id and fv.isDelete=0
+        where enroll.cmpt_id=#{cmptId} and enroll.cmpt_item=#{roadId} and enroll.del_flg=0
     </select>
 
     <select id="getCmptScoreRulesMapByMarkNoAndScoreId" resultType="java.lang.Integer">

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleService.java

@@ -22,7 +22,7 @@ public class CmptScoreRuleService {
      * @param cmptScoreRules
      * @return
      */
-    public   int saveOrUpdate(List<CmptScoreRule> cmptScoreRules){
+    public int saveOrUpdate(List<CmptScoreRule> cmptScoreRules){
         for(CmptScoreRule cmptScoreRule:cmptScoreRules){
             if(cmptScoreRule.getId()==0){
                 cmptScoreRuleMapper.save(cmptScoreRule);

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -850,7 +850,7 @@ public class MicroApiController {
         if(rule == null) return Result.fail().setMsg("未找到规则");
         //判断此条规则是否提交过成绩
 
-        Integer scoreId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(score.getCmptId(),score.getMarkNo(),rule.getId());
+        Integer scoreId = 1;//cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(score.getCmptId(),score.getMarkNo(),rule.getId());
         if(scoreId != null){
             return Result.fail().setMsg("已经上传过成绩！");
         }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreReviewController.java

 package com.dlbridge.jadp.plugins.cmpt.web;
 
+import com.dlbridge.jadp.common.interceptor.PageView;
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
+import com.dlbridge.jadp.plugins.cmpt.bean.FuncSetting;
+import com.dlbridge.jadp.plugins.cmpt.bean.Road;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleService;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
+import com.dlbridge.jadp.plugins.cmpt.service.FuncSettingService;
+import com.dlbridge.jadp.plugins.cmpt.service.RoadService;
+import com.neusoft.www.utils.web.Result;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 成绩审核功能
  */
 @Controller
 @Log4j2
-@RequestMapping("gk/scoreReview/")
+@RequestMapping("gk/review/")
 @ApiIgnore
 public class ScoreReviewController {
 
+    @Resource
+    private CmptService cmptService;
+
+    @Resource
+    private FuncSettingService funcSettingService;
+
+    @Resource
+    private RoadService roadService;
+
+    @Resource
+    CmptScoreRuleService cmptScoreRuleService;
+
+    @RequestMapping("index/{cmptId}")
+    @PageView
+    public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
+        Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
+        FuncSetting settingByCmptId = funcSettingService.getSettingByCmptId(cmptId);
+        mv.addObject("setting",settingByCmptId);
+        mv.setViewName("cmpt/score_review");
+        mv.addObject("cmpt", cmpt);
+        return mv;
+    }
+
+    @RequestMapping("roads/{cmptId}")
+    @ResponseBody
+    public Result roads(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
+        List<Road> list = roadService.queryRoads(cmptId);
+        return Result.success().setContent(list);
+    }
+
+    @RequestMapping("rules/{cmptId}")
+    @ResponseBody
+    public Result rules(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
+        List<CmptScoreRule> cmptScoreRules = cmptScoreRuleService.getCmptScoreRulesByCmptId(cmptId);
+        return Result.success().setContent(cmptScoreRules);
+    }
+
+
+
 }

src/main/webapp/WEB-INF/views/cmpt/score_review.jsp

@@ -297,8 +297,8 @@
         <div class="section">
             <div class="switch">
                 <h3 class="title">自动审核</h3>
-                <div class="radio status ${setting.mileage == 1?'checked':'unchecked'}"  >
-                    <span class="txt">${setting.mileage == 1?'启动':'未启动'}</span>
+                <div class="radio status ${setting.switchScoreReview == 1?'checked':'unchecked'}"  >
+                    <span class="txt">${setting.switchScoreReview == 1?'启动':'未启动'}</span>
                     <span class="dot"></span>
                 </div>
             </div>
@@ -317,7 +317,7 @@
                         <label>项目</label>
                         <div style="position: relative;">
                             <select class="select " name="">
-                                <option value="">sfdasf</option>
+                                <option v-for="road in roads"  v-text="road.name" :data-roadId="road.roadId"></option>
                             </select>
                             <span class="down-arrow"></span>
                         </div>
@@ -326,7 +326,7 @@
                         <label>成绩</label>
                         <div style="position: relative;">
                             <select class="select " name="">
-                                <option value="" v-for="road in roads"  v-text="road.roadName" :data-roadId="road.roadId"></option>
+                                <option value="" v-for="rule in rules" :data-ruleId="rule.id" v-text="'第'+(rule.index+1)+'次成绩'"> </option>
                             </select>
                             <span class="down-arrow"></span>
                         </div>

src/main/webapp/static/js/score_review.js

@@ -8,7 +8,8 @@ var score = new Vue({
         previewImg: '',
         dialog: false,
         count: 1000,
-        roads: [{roadId: 12, roadName: 'test'}]
+        roads: [],
+        rules: []
     },
     methods:{
         closeDialog:function(){
@@ -24,8 +25,32 @@ var score = new Vue({
         checkAll:function () {
             score.$data.checked = !score.$data.checked
         }
+
     }
-})
+});
+var reviewPage = {
+    getRoads:function () {
+        $.ajax({
+            url:"/gk/review/roads/"+getCId(),
+            success:function (data) {
+                if(data.status == 1){
+                    score.$data.roads = data.content
+                }
+            }
+        });
+    },
+    getRules : function () {
+        $.ajax({
+            url:"/gk/review/rules/"+getCId(),
+            success:function (data) {
+                if(data.status == 1){
+                    score.$data.rules = data.content
+                }
+            }
+        });
+    }
+
+}
 $(document).ready(function () {
     $('body').on('click', '.status', function () {
         var checked = $(this).hasClass('checked');
@@ -39,5 +64,17 @@ $(document).ready(function () {
             $(this).addClass("checked");
             $(this).find('.txt').text('启动')
         }
+
+        $.ajax({
+            url: "/setting/upSwitchScoreReview/"+getCmptId()+"/"+status,
+            type: 'post',
+            success: function (data) {
+                console.log(data);
+
+            }
+        });
     })
+
+    reviewPage.getRoads();
+    reviewPage.getRules();
 });
\ No newline at end of file