bug修改

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

@@ -142,8 +142,9 @@
     </select>
 
     <update id="deleteBatch">
-        update gk_cmpt_score_rule_scoreinfo
-        set isDelete=1,updateTime=now()
-        where cmptId=#{cmptId} and insertTime >= #{start}  and #{end} >= insertTime
+        update  gk_cmpt_score_rule_scoreinfo a
+				left join gk_cmpt_score_field_value b on a.cmptId=b.cmptId and a.mark_no=b.markNo and a.rule_id=b.rule_id
+        set  a.isDelete=1, a.updateTime=now(),b.isDelete=1,b.updateTime=now()
+        where a.cmptId=#{cmptId} and a.insertTime >= #{start}  and #{end} >= a.insertTime
     </update>
 </mapper>
\ No newline at end of file

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

@@ -42,9 +42,10 @@
     </update>
 
     <select id="getSettingByCmptId" resultType="com.dlbridge.jadp.plugins.cmpt.bean.FuncSetting">
-        select cmpt_id cmptId,switch_mobile mobile,
-        switch_countdown countdown,switch_customer customer,
-        switch_news news,switch_banner banner,news_alias newsAlias,switch_mileage mileage,switch_scoreReview switchScoreReview
+        select cmpt_id cmptId,ifnull(switch_mobile,0) mobile,
+        ifnull(switch_countdown,0) countdown,ifnull(switch_customer,0) customer,
+        ifnull(switch_news ,0) news,ifnull(switch_banner,0) banner,ifnull(news_alias,0) newsAlias,
+        ifnull(switch_mileage,0) mileage,ifnull(switch_scoreReview,0) switchScoreReview
         from gk_cmpt_func
         where cmpt_id=#{cmptId}
     </select>

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

@@ -220,7 +220,7 @@ public class RemoteService {
 
     public List<EnrollUser> getAllEnrollUser(Integer cmptId) {
         ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "getMarkNo.do?cmptId="
-                + cmptId, String.class);
+                + cmptId+"&appId=02001_1.0", String.class);
         if (forEntity.getStatusCode() == HttpStatus.OK) {
             String resultString = forEntity.getBody();
             JSONObject object = JSONObject.parseObject(resultString);

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

@@ -909,8 +909,11 @@ public class MicroApiController {
                 .setSubsectionscore(score.getScore().getDuration()).setSubsectionMileage(mileage).setCmptPace(cmptPace)
                 .setSubsectionTime(subsectionTime)
                 .setCmptId(score.getCmptId()).setRuleId(rule.getId()).setMarkNo(score.getMarkNo()).setCheckStatus(0);
+        if(settingByCmptId.getSwitchScoreReview() == null){
+            settingByCmptId.setSwitchScoreReview(0);
+        }
         //如果自动审核开启的话，进行单条成绩的审核处理
-        if(settingByCmptId.getSwitchScoreReview()==1){
+        if(settingByCmptId.getSwitchScoreReview() != null && settingByCmptId.getSwitchScoreReview()==1){
            //配速小于2"27不能通过审核
             if(cmptPace<=(float)147/1000){
                 cmptScoreRuleScoreInfo.setCheckStatus(2);

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

@@ -7,6 +7,7 @@ import com.dlbridge.jadp.plugins.cmpt.service.*;
 import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
 import com.neusoft.www.utils.web.Result;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -448,7 +449,11 @@ public class ScoreController {
         }
         String start = request.getParameter("start");
         String end = request.getParameter("end");
+        if(StringUtils.isBlank(start) || StringUtils.isBlank(end)){
+            return Result.fail().setMsg("请选择删除数据的时间范围！");
+        }
         int count = cmptScoreRuleService.deleteBatch(cmptId,start,end);
+        log.info("共删除"+count);
         return Result.success().setContent(count);
     }
 

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

@@ -102,7 +102,6 @@
                     <span>删除</span>
                 </div>
             </div>
-
         </div>
         <div class="section" >
             <div style="display: flex;justify-content: space-between">

src/main/webapp/static/js/score.js

@@ -68,10 +68,10 @@ $(document).ready(function () {
         url : "/gk/score/getScore/"+getCId()+"/"+param,
           success:function (data) {
             var result = data.content;
-            if(!result.user){
-                layer.msg("未查到人员信息");
           $('#data thead').hide();
           $('#score-body').empty();
+            if(!result.user){
+                layer.msg("未查到人员信息");
                 return;
             }
               if(result.scores.length > 0){
@@ -212,8 +212,8 @@ $(document).ready(function () {
             return ;
         }
         var value = $(this).val();
-        if(value > 10){
-            layer.msg('最多只能设置9次！');
+        if(value >= 61){
+            layer.msg('最多只能设置60次！');
             return ;
         }
         if(value <= 0){

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

@@ -160,6 +160,10 @@ var reviewPage = {
                     score.$data.reviewCount.nopass = data.total;
                 }
                 reviewPage.getStatistic();
+                $.each($('input:checked'),function (i,e) {
+                    e.checked=false
+                })
+
             },
             complete:function () {
                 layer.closeAll();
@@ -172,7 +176,6 @@ var reviewPage = {
                     score.$data.selectedRoadId
                     +'&ruleId='+ score.$data.selectedRuleId,
                 success:function (data) {
-                    console.log(data);
                     var result = data.content;
                     score.$data.reviewCount.waiting = result.Unprocessed;
                     score.$data.reviewCount.pass = result.pass;
@@ -204,7 +207,6 @@ var reviewPage = {
         var param = {cmptId : getCId(),'checkstatus':score.$data.param.checkstatus,
             roadId: score.$data.selectedRoadId, ruleId : score.$data.selectedRuleId,
             passedIds:passedIds.join(','),noPassedIds:noPassedIds.join(',')};
-        console.log(JSON.stringify(param))
         $.ajax({
             url : '/gk/scoreReview/uploadCmptScoreRuleScoreInfo',
             data: param,
@@ -213,7 +215,7 @@ var reviewPage = {
             },
             success:function (data) {
                  reviewPage.reloadPage();
-                 score.$data.checked = !score.$data.checked
+
             },
             complete:function () {
                 layer.closeAll();
@@ -239,7 +241,6 @@ $(document).ready(function () {
             url: "/setting/upSwitchScoreReview/"+getCmptId()+"/" + status,
             type: 'post',
             success: function (data) {
-                console.log(data);
 
             }
         });

src/test/java/com/dlbridge/jadp/ContextTest.java

@@ -98,7 +98,7 @@ public class ContextTest {
 
     @Test
     public void testA(){
-        List<EnrollUser> allEnrollUser = remoteService.getAllEnrollUser(12);
+        remoteService.getAllEnrollUser(12);
         cmptScoreRuleScoreInfoService.scoreReviewByMarkNo(14923,"A",1);
     }