车队

VisualInspection/motorcade/view/addcarTask.html

@@ -250,6 +250,10 @@
             "reason":reason
         }  
         if(is_save == 0){
+            data.train_safe = 0;
+            data.service_quality = 0;
+            data.car_capacity = 0;
+            data.travel_arrangements = 0;
             post_common_service('c/task/add', data, function(redata) {
                   window.parent.location.reload();
             });

VisualInspection_server/src/main/java/com/xintong/system/securityTools/WebSecurityConfig.java

@@ -65,7 +65,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                  "/**/*.js"
          ).permitAll()
          // 对于获取token的rest api要允许匿名访问
-         .antMatchers("/user/auth/**","/file/**","/druid/**","/f/**").permitAll()
+         .antMatchers("/user/auth/**","/file/**","/druid/**","/f/**","/c/**").permitAll()
          // 除上面外的所有请求全部需要鉴权认证
          .anyRequest().authenticated();
     	

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CarTask.java

@@ -74,4 +74,8 @@ public class CarTask implements Serializable {
     private String with_man;
 
     private String with_dept;
+
+    private String color;
+
+    private String isEvaluation;
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CarTaskMapper.xml

@@ -50,6 +50,7 @@
         where
           1=1
         <if test="driver != null">and t.driver = #{driver}</if>
+        <if test="customer != null">and t.customer = #{customer}</if>
         <if test="car_id != null">and t.car_id = #{car_id}</if>
         <if test="startTime != null and endTime != null">and t.start_time between #{startTime} and #{endTime}</if>
     </select>

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CarTaskServiceImpl.java

@@ -64,6 +64,12 @@ public class CarTaskServiceImpl implements CarTaskService {
             id = c.getSend_car_people().toString();
             ids = Long.parseLong(id);
            c.setSend_dept(userMap.get(ids).getOrganid());
+           c.setIsEvaluation("未评价");
+           c.setColor("#1298CB");
+           if(c.getTrain_safe() > 0 && c.getService_quality() >0 && c.getTravel_arrangements() > 0 && c.getCar_capacity() >0){
+               c.setIsEvaluation("评价");
+               c.setColor("red");
+           }
         }
         if (!(page.equals(0) && size.equals(0))) {
             return new PageInfo<CarTask>(list);