Merge remote-tracking branch 'origin/koumen' into koumen

2、部门车辆录入字段补充
3、移除黑名单补充名称&违规状态补充
4、车牌号唯一性校验增加非驳回条件
5、审批&申请记录按时间倒排

web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java

@@ -48,6 +48,7 @@ public class VehicleViolationsAddExe {
         }
 
         VehicleViolationsE examTypeE = new VehicleViolationsE();
+        examTypeE.setViolationProcessingStatus(2);
         BeanUtils.copyProperties(cmd, examTypeE);
         boolean res = false;
         try {

web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java

@@ -82,6 +82,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
         queryWrapper.eq("licence_no", licenceNo);
         queryWrapper.in("vehicle_belong_type", 1,2,3,4,8,9);
         queryWrapper.eq("delete_enum", "false");
+        queryWrapper.ne("audit_flag", 3);
         if (id != null) {
             queryWrapper.ne("id", id);
         }

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyInspectAddCmd.java

@@ -23,8 +23,11 @@ import java.util.List;
 @AllArgsConstructor
 public class VehicleApplyInspectAddCmd extends Command {
     @ApiModelProperty(value = "名称", name = "remarks")
-    @NotEmpty(message = "名称")
+//    @NotEmpty(message = "名称")
     private String remarks;
+    @ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName")
+    @NotEmpty(message = "检查部门名称")
+    private String checkDepartmentName;
     @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆", name = "vehicleBelongType", required = true)
     @NotEmpty(message = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆不能为空")
     private String vehicleBelongType;
@@ -45,6 +48,10 @@ public class VehicleApplyInspectAddCmd extends Command {
         private String vehicleTypeName;
         @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true)
         private String licenceNo;
+        @ApiModelProperty(value = "访问开始时间", name = "visitStartTime", required = true)
+        private String visitStartTime;
+        @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
+        private String visitEndTime;
     }
 
 }

web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml

@@ -26,6 +26,7 @@
         WHERE
             dic.parent_id = ( SELECT id FROM `jjb-saas-config`.`conf_dict_tree` dicp WHERE dicp.dict_value = 'HG_AUTH_AREA' AND dicp.delete_enum = 'FALSE' )
           AND dic.delete_enum = 'FALSE'
+          AND dic.dict_value != 'QHD_GQ_DXGQ'
         ORDER BY dic.id
     </select>
     <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaDO">

web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml

@@ -42,6 +42,7 @@
         u.delete_enum = 'FALSE'
         AND u.main_corp_flag = 0
         AND u.corpinfo_id = #{params.corpinfoId}
+        AND u.rz_flag = 1
         <if test="params.deptId != null">
             AND u.department_id = #{params.deptId}
         </if>

web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml

@@ -48,6 +48,7 @@
             LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id AND a.delete_enum = 'FALSE' AND a.audit_status = 1
         WHERE
             f.delete_enum = 'FALSE'
+            AND f.audit_flag != 3
         <if test="params.remarks != null and params.remarks != ''">
             AND f.remarks like  CONCAT('%', #{params.remarks}, '%')
         </if>

web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml

@@ -6,7 +6,7 @@
 
     <select id="getInfoById" resultType="com.zcloud.primeport.persistence.dataobject.VehicleBlackDO">
         SELECT
-            b.id
+            b.id,
             b.licence_no
         FROM
             vehicle_black b

web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml

@@ -108,6 +108,8 @@
         <if test="params.applyCorpName != null and params.applyCorpName != ''">
             AND p.apply_corp_name like  CONCAT('%', #{params.applyCorpName}, '%')
         </if>
+        ORDER BY
+        p.create_time DESC
     </select>
     <select id="personnelVehicleManagementList"
             resultType="com.zcloud.primeport.persistence.dataobject.PersonCountDto">
@@ -128,7 +130,7 @@
             pa.id apply_person_id,
             pa.xgf_apply_person_id,
             IFNULL( tmp.vehicle_count, 0 ) vehicle_count,
-            IFNULL( pa.mkmj_permission, 2 ) mkmj_permission,
+            IFNULL( pa.mkmj_permission, 1 ) mkmj_permission,
             u.user_avatar_url user_face_url
         FROM
             USER u
@@ -145,6 +147,7 @@
                     vehicle_apply va
                 WHERE
                     va.delete_enum = 'FALSE'
+                  AND va.audit_flag = 2
                   AND va.employee_vehicle_user_id != ''
 		AND va.employee_vehicle_user_id IS NOT NULL
                 GROUP BY