删除成绩

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/FuncSetting.java

@@ -26,6 +26,8 @@ public class FuncSetting {
     private Integer banner;
     @ApiModelProperty(value = "里程开关，小程序成绩提交页面")
     private int mileage;
+
+    private Integer customer;
     @ApiModelProperty(value = "成绩自动审核开关，后台成绩审核页面")
     private Integer switchScoreReview;
     @JsonIgnore

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

@@ -58,4 +58,8 @@ public interface CmptScoreRuleMapper {
     List<UserScoreExcelBean> getRoadStatisticByCmptIdAndRoadId(@Param("cmptId") Integer cmptId,@Param("roadId") String roadId);
 
     Integer getCmptScoreRulesMapByMarkNoAndScoreId(@Param("markNo") String markNo,@Param("scoreItemId")  Integer scoreItemId);
+
+    int countByStartAndEnd(@Param("cmptId") int cmptId,@Param("start") String start,@Param("end") String end);
+
+    int deleteBatch(@Param("cmptId") int cmptId,@Param("start") String start,@Param("end")  String end);
 }

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

@@ -134,4 +134,16 @@
         from gk_cmpt_score_rule_map
         where mark_no =#{markNo} and score_item_id=#{scoreItemId}
     </select>
+
+    <select id="countByStartAndEnd" resultType="int">
+        select count(1)
+        from gk_cmpt_score_rule_scoreinfo
+        where cmptId=#{cmptId} and insertTime >= #{start}  and #{end} >= insertTime and isDelete=0
+    </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>
 </mapper>
\ No newline at end of file

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

@@ -3,8 +3,10 @@
 <mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.FuncSettingMapper">
 
     <insert id="saveSetting">
-        insert into gk_cmpt_func(cmpt_id,switch_mobile,switch_countdown,switch_news,switch_banner,switch_mileage,switch_scoreReview,create_date)
-        values (#{setting.cmptId},#{setting.mobile},#{setting.countDown},#{setting.news},#{setting.banner},#{setting.mileage},#{setting.switchScoreReview},now())
+        insert into gk_cmpt_func(cmpt_id,switch_mobile,switch_countdown,switch_news,
+        switch_banner,switch_mileage,switch_scoreReview,create_date)
+        values (#{setting.cmptId},#{setting.mobile},#{setting.countDown},#{setting.news},
+        #{setting.banner},#{setting.mileage},#{setting.switchScoreReview},now())
     </insert>
 
 
@@ -29,6 +31,9 @@
             <if test="setting.mileage != null">
                 switch_mileage=#{setting.mileage},
             </if>
+            <if test="setting.mileage != null">
+                switch_customer=#{setting.customer},
+            </if>
             <if test="setting.switchScoreReview != null">
                 switch_scoreReview=#{setting.switchScoreReview},
             </if>
@@ -38,7 +43,7 @@
 
     <select id="getSettingByCmptId" resultType="com.dlbridge.jadp.plugins.cmpt.bean.FuncSetting">
         select cmpt_id cmptId,switch_mobile mobile,
-        switch_countdown countdown,
+        switch_countdown countdown,switch_customer customer,
         switch_news news,switch_banner banner,news_alias newsAlias,switch_mileage mileage,switch_scoreReview switchScoreReview
         from gk_cmpt_func
         where cmpt_id=#{cmptId}

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

@@ -91,5 +91,11 @@ public class CmptScoreRuleService {
     }
 
 
+    public int countByStartAndEnd(int cmptId, String start, String end) {
+        return cmptScoreRuleMapper.countByStartAndEnd(cmptId,start,end);
+    }
 
+    public int deleteBatch(int cmptId, String start, String end) {
+        return cmptScoreRuleMapper.deleteBatch(cmptId,start,end);
+    }
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/PageFactory.java

@@ -11,13 +11,14 @@ public class PageFactory {
     public static <T> Page setContent(List<T> content, Pageable pageable, long total) {
         Page page = new Page();
         page.setContent(content);
-        page.setCurrent(content.size());
+        page.setCurrent(pageable.getPageSize()*pageable.getPageNumber());
         page.setTotal(total);
+        page.setSize(content.size());
         double max = Math.ceil(total / pageable.getPageSize());
         if (pageable.getPageNumber() == 0 ) {
             page.setFirst(true);
             page.setLast(false);
-        } else if (max >= pageable.getPageNumber()) {
+        } else if (max <= pageable.getPageNumber()) {
             page.setFirst(false);
             page.setLast(true);
         } else {

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

 package com.dlbridge.jadp.plugins.cmpt.web;
 
 import com.dlbridge.jadp.plugins.cmpt.bean.Banner;
+import com.dlbridge.jadp.plugins.cmpt.bean.Customer;
 import com.dlbridge.jadp.plugins.cmpt.bean.FuncSetting;
 import com.dlbridge.jadp.plugins.cmpt.service.BannerService;
+import com.dlbridge.jadp.plugins.cmpt.service.CustomerService;
 import com.dlbridge.jadp.plugins.cmpt.service.FuncSettingService;
 import com.neusoft.www.utils.web.Result;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +25,8 @@ public class FuncSettingController {
 
     @Resource
     private FuncSettingService funcSettingService;
+    @Resource
+    private CustomerService customerService;
 
     @Resource
     BannerService bannerService;
@@ -40,6 +45,12 @@ public class FuncSettingController {
                 return Result.fail().setCode(-201).setMsg("未设置广告");
             }
         }
+        if(setting.getCustomer() != null && setting.getCustomer() == 1){
+            Customer customer = customerService.getCusomerServiceInfo(setting.getCmptId());
+            if(customer == null || StringUtils.isBlank(customer.getMobile())){
+                return Result.fail().setCode(-301).setMsg("未设置客服");
+            }
+        }
         FuncSetting settingByCmptId = funcSettingService.getSettingByCmptId(setting.getCmptId());
         if (settingByCmptId == null) {
             funcSettingService.saveSetting(setting);

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

@@ -252,8 +252,13 @@ public class MicroApiController {
             @ApiResponse(code = 200, message = "成功", response = Result.class, responseContainer = "List")})
     public Result getCustomer(@PathVariable("cmptId") Integer cmptId) {
         Customer customer = customerService.getCusomerServiceInfo(cmptId);
+        FuncSetting setting = funcSettingService.getSettingByCmptId(cmptId);
         Map<String,String> result = new HashMap<>();
+        if(setting == null || setting.getCustomer() == null || setting.getCustomer() != 1){
+            result.put("mobile","");
+        }else{
             result.put("mobile",customer == null ? "" : customer.getMobile());
+        }
         return Result.success().setContent(result);
     }
 

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

@@ -21,6 +21,7 @@ import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -430,6 +431,27 @@ public class ScoreController {
 
     }
 
+    @RequestMapping("getScoreCount/{cmptId}")
+    @ResponseBody
+    public Result getScoreCount(@PathVariable("cmptId") int cmptId, HttpServletRequest request){
+        String start = request.getParameter("start");
+        String end = request.getParameter("end");
+        int count = cmptScoreRuleService.countByStartAndEnd(cmptId,start,end);
+        return Result.success().setContent(count);
+    }
+
+    @RequestMapping("deleteBatch/{cmptId}")
+    @ResponseBody
+    public Result deleteBatch(@PathVariable("cmptId") int cmptId, HttpServletRequest request){
+        if(cmptId <= 0){
+            return Result.fail();
+        }
+        String start = request.getParameter("start");
+        String end = request.getParameter("end");
+        int count = cmptScoreRuleService.deleteBatch(cmptId,start,end);
+        return Result.success().setContent(count);
+    }
+
     public static void main(String[] args) {
         System.out.println(String.format("%.4f",102.102918110f)+"KM");
     }

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

@@ -177,7 +177,24 @@
                     </div>
                     <div class="b">
                         <div class="radio status ${setting.banner == 1?'checked':'unchecked'}" data-attr="banner">
-                            <span class="txt">${setting.news == 1?'启动':'未启动'}</span>
+                            <span class="txt">${setting.banner == 1?'启动':'未启动'}</span>
+                            <span class="dot"></span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="wzm-content-item blue" data-id="">
+                    <div class="t">
+                        <div class="content">
+                            <img src="/static/images/arrow.png" alt="" class="arrow">
+                            <div class="t-i">
+                                <span>赛事客服</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="b">
+                        <div class="radio status ${setting.customer == 1?'checked':'unchecked'}" data-attr="customer">
+                            <span class="txt">${setting.customer == 1?'启动':'未启动'}</span>
                             <span class="dot"></span>
                         </div>
                     </div>

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

@@ -89,6 +89,21 @@
             <span class="export">名单导出</span>
             <div id="container"></div>
         </div>
+
+        <div class="section">
+            <div style="display: flex;justify-content: space-between">
+                <h3 class="title">批量删除</h3>
+                <div class="search-group" style="display: flex;align-items: center;justify-content: center;">
+                    <input type="text" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm'})" class="time-input start" placeholder="起始时间">
+                    <span>~</span>
+                    <input type="text" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm'})" class="time-input end" placeholder="终止时间">
+                </div>
+                <div class="deleteBtn">
+                    <span>删除</span>
+                </div>
+            </div>
+
+        </div>
         <div class="section" >
             <div style="display: flex;justify-content: space-between">
                 <h3 class="title">成绩管理</h3>
@@ -96,6 +111,7 @@
                     <input type="text" class="search" placeholder="请输入号码牌">
                     <span id="search" class="search-btn">查询</span>
                 </div>
+
             </div>
             <table id="data" style="width: 100%;display: none">
                 <colgroup>
@@ -132,7 +148,6 @@
                 <span>+</span>
                 <span>添加照片项</span>
             </div>
-
         </div>
 
         <div style="margin-top: -10px;margin-bottom: 50px">

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

@@ -368,7 +368,7 @@
                     <span v-text="score.name"></span>
                     <span v-text="score.markNo"></span>
                     <span>{{score.updateTime | substr(10)}}</span>
-                    <span>{{score.subsectionTime | substr(10)}}</span>
+                    <span>{{score.subsectionTime | substrDate(10)}}</span>
                     <span>{{Number(score.subsectionMileage/1000).toFixed(3)}}</span>
                     <span>{{score.subsectionscore | date_format}}</span>
                     <span>{{score.cmptPace | pace(Number(score.subsectionMileage/1000).toFixed(3),score.subsectionscore) }}</span>

src/main/webapp/static/cmpt/score.css

@@ -80,7 +80,7 @@ tbody tr td{
     color:#333;
     font-weight: 400;
 }
-.add-btn{
+.add-btn {
     width: 146px;
     height: 40px;
     background: rgba(206,57,57,1);
@@ -94,6 +94,17 @@ tbody tr td{
     align-items: center;
     cursor: pointer;
 }
+.deleteBtn{
+    width: 146px;
+    height: 40px;
+    background: rgba(206,57,57,1);
+    border-radius: 4px;
+    color: white;
+    justify-content: center;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+}
 .rule-field{
     background: white;
 }

src/main/webapp/static/js/cmptSetting.js

@@ -24,6 +24,8 @@ $(function () {
                 console.log(data);
                 if(data.code == -201){
                     window.location.href="/gk/banner/index/"+getCmptId()+"?"+window.location.search;
+                }else if(data.code == -301){
+                    window.location.href="/gk/customer/index/"+getCmptId()+"?"+window.location.search;
                 }
             }
         })

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

@@ -23,6 +23,35 @@ $(document).ready(function () {
         })
     })
 
+    $('.deleteBtn').click(function () {
+        if(!$('.start').val()){
+           layer.msg("开始时间必须填写");
+           return ;
+        }
+
+        if(!$('.end').val()){
+            layer.msg("结束时间必须填写");
+            return ;
+        }
+
+        $.ajax({
+            url : "/gk/score/getScoreCount/"+getCId(),
+            data:{'start':$('.start').val()+":00",'end':$('.end').val()+":00"},
+            success:function (data) {
+                if(data.status){
+                    layer.confirm("共查询到"+data.content+"条数据，请确认是否要全部删除",function () {
+                        $.ajax({
+                            url : "/gk/score/deleteBatch/"+getCId(),
+                            data:{'start':$('.start').val()+":00",'end':$('.end').val()+":00"},
+                            success:function () {
+                                layer.msg("删除成功！");
+                            }
+                        });
+                    });
+                }
+            }
+        })
+    })
 
    $('#search').click(function () {
        var param = $('.search').val();
@@ -274,7 +303,7 @@ $(document).ready(function () {
             qikoo.dialog.confirm('确认要删除？',
                 function () {
                     $.ajax({
-                        url : '/gk/score/delScore/'+$('.search').val()+'/'+id,
+                        url : '/gk/score/delScore/'+getCId()+'/'+$('.search').val()+'/'+id,
                         type:'post',
                         success:function (data) {
                             if(data.status){

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

@@ -32,6 +32,11 @@ var score = new Vue({
             if(!value || value.length < 18) return "";
             return value.substr(5,5)+" "+value.substr(11,5);
         },
+        substrDate:function(value,length){
+            if(!value || value.length < 18) return "";
+            return value.substr(0,10);
+        }
+        ,
         date_format: function (value) {
             if (!value) return ''
             var hour = parseInt((value / 3600));