退回记录

src/main/java/com/izouma/wenlvju/service/RecordService.java

@@ -1,5 +1,8 @@
 package com.izouma.wenlvju.service;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.wenlvju.domain.Record;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.RecordExcelDTO;
@@ -12,6 +15,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -41,8 +45,17 @@ public class RecordService {
             query.remove("organizer");
         }
 
+        Object examinationTime = query.get("examinationTime");
+        LocalDate date = null;
+        if (examinationTime != null) {
+            date = Convert.toLocalDateTime(examinationTime).toLocalDate();
+            query.remove("examinationTime");
+        }
+
+
         String finalAgency = examinationAgency;
         String finalOrganizer = organizer;
+        LocalDate finalDate = date;
         return recordRepo.findAll((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, Record.class, root, criteriaQuery, criteriaBuilder);
             if (StringUtil.isNotBlank(finalAgency)) {
@@ -51,6 +64,10 @@ public class RecordService {
             if (StringUtil.isNotBlank(finalOrganizer)) {
                 and.add(criteriaBuilder.like(root.get("organizer"), "%" + finalOrganizer + "%"));
             }
+            if (ObjectUtil.isNotEmpty(finalDate)) {
+                and.add(criteriaBuilder.lessThanOrEqualTo(root.get("examinationStartTime"), finalDate));
+                and.add(criteriaBuilder.greaterThanOrEqualTo(root.get("examinationEndTime"), finalDate));
+            }
             return criteriaBuilder.and(and.toArray(new Predicate[0]));
         }, JpaUtils.toPageRequest(pageQuery));
     }

src/main/java/com/izouma/wenlvju/utils/JpaUtils.java

@@ -132,7 +132,7 @@ public class JpaUtils {
                     and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
                 } else {
                     and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
-                            .toLocalDateTime((String) value, "yyyy-MM-dd"))));
+                            .toLocalDate((String) value, "yyyy-MM-dd"))));
                 }
             } else {
                 and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));

src/main/vue/src/plugins/http.js

@@ -5,7 +5,7 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'http://192.168.50.190:8080';
+        // baseUrl = 'http://localhost:8080';
         baseUrl = 'http://wlj.izouma.com';
         break;
     case 'test':

src/main/vue/src/router.js

@@ -170,9 +170,10 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/recordList2',
-                    name: 'RecordList2',
-                    component: () => import(/* webpackChunkName: "recordList" */ '@/views/record/RecordList2.vue'),
+                    path: '/recordRegulationList',
+                    name: 'RecordRegulationList',
+                    component: () =>
+                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordRegulationList.vue'),
                     meta: {
                         title: '监管管理'
                     }

src/main/vue/src/views/rate/RateAuditEdit.vue

@@ -16,7 +16,28 @@
                     </el-form-item>
 
                     <el-form-item label="进度">
-                        <el-input style="width: 400px" type="textarea" v-model="item.remark" readonly></el-input>
+                        <div class="tishi" v-if="item.status == 'REVIEW_DENY'">
+                            <span>市文旅局退回意见：</span>
+                        </div>
+                        <div class="tishi" v-if="item.status == 'FIRST_REVIEW_DENY'">
+                            <span>区文旅局退回意见：</span>
+                        </div>
+                        <el-input
+                            v-if="item.status == 'REVIEW_DENY' || item.status == 'FIRST_REVIEW_DENY'"
+                            style="width: 400px;margin-left: 40px"
+                            type="textarea"
+                            v-model="item.remark"
+                            readonly
+                            autosize
+                        ></el-input>
+                        <el-input
+                            v-else
+                            style="width: 400px;"
+                            type="textarea"
+                            v-model="item.remark"
+                            readonly
+                            autosize
+                        ></el-input>
                     </el-form-item>
                 </el-form>
             </div>
@@ -107,4 +128,9 @@ export default {
     background-color: #ffffff;
     color: #606266;
 }
+.tishi {
+    margin: 0 0 4px 40px;
+    color: #606266;
+    font-size: 14px;
+}
 </style>

src/main/vue/src/views/rate/RateDistrictList.vue

@@ -575,7 +575,7 @@ export default {
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
-                    remark: '区文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateDistrictListDone.vue

@@ -594,7 +594,7 @@ export default {
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
-                    remark: '区文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateDistrictListPending.vue

@@ -570,7 +570,7 @@ export default {
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
-                    remark: '区文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateList.vue

@@ -579,7 +579,7 @@ export default {
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     score: 0,
-                    remark: '市文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateListDone.vue

@@ -503,7 +503,7 @@ export default {
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     score: 0,
-                    remark: '市文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateListPending.vue

@@ -503,7 +503,7 @@ export default {
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     score: 0,
-                    remark: '市文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateListRejected.vue

@@ -413,7 +413,7 @@ export default {
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     score: 0,
-                    remark: '市文旅局退回意见：' + this.reason
+                    remark: this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(3L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(469L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }