积分优化

renren-admin/src/main/java/io/renren/modules/qmjz/service/impl/ScoreStuServiceImpl.java

@@ -85,7 +85,7 @@ public class ScoreStuServiceImpl extends ServiceImpl<ScoreStuMapper, ScoreStu> i
                 infoDateStr = null;
             }
             Integer count = this.queryCountDayTask(infoDateStr, stuId, queryTaskType);
-            if (count < taskNum) {
+            if (taskNum != null && count < taskNum) {
                 return true;
             }
             return false;

renren-admin/src/main/resources/statics/js/modules/qmgz/taskManage.js

@@ -32,7 +32,6 @@ $(function () {
         datatype: "json",
         colModel: [
             { label: 'id', name: 'id', index: 'id', width: 50, key: true ,hidden: true},
-            { label: '任务名称', name: 'taskName', index: 'taskName', width: 70 },
             { label: '任务标题', name: 'taskTitle', index: 'taskTitle', width: 70 },
             { label: '任务类型', name: 'taskType', index: 'taskType', width: 60, sortable: false,formatter: function (cellvalue, options, rowdata) {
                     for (const item of vm.type) {
@@ -88,7 +87,7 @@ var vm = new Vue({
     el:'#rrapp',
     data:{
         q:{
-            taskName: '',
+            taskTitle: '',
             taskScore:'',
             taskStatus:''
         },
@@ -157,7 +156,7 @@ var vm = new Vue({
             }
 
             $("#jqGrid").jqGrid('setGridParam',{
-                postData:{'taskName': vm.q.taskName,'taskScore':vm.q.taskScore,'taskStatus': vm.q.taskStatus},
+                postData:{'taskTitle': vm.q.taskTitle,'taskScore':vm.q.taskScore,'taskStatus': vm.q.taskStatus},
                 page:page
             }).trigger("reloadGrid");
         },

renren-admin/src/main/resources/templates/modules/qmjz/taskManage.html

@@ -27,7 +27,7 @@
         <div class="grid-btn">
             <div>
                 <div class="form-group col-sm-12 div-Gay">
-                    <input type="text" class="form-control" v-model="q.taskName" @keyup.enter="query" placeholder="任务名称">
+                    <input type="text" class="form-control" v-model="q.taskTitle" @keyup.enter="query" placeholder="任务标题">
                     <!--<input type="text" class="form-control" v-model="q.taskScore" @keyup.enter="query" placeholder="任务积分" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">-->
                     <select class="form-control" v-model="q.taskStatus"    @keyup.enter="query">
                         <option value="" disabled hidden>--任务状态--</option>