feat：违规与拉黑移除多余信息

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

@@ -92,6 +92,7 @@ public class ClosedAreaCarApplyCO extends ClientObject {
     //申请人员姓名
     @ApiModelProperty(value = "申请人员姓名")
     private String applyPersonUserName;
+    private String applyUserName;
     //申请理由
     @ApiModelProperty(value = "申请理由")
     private String applyReason;

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

@@ -118,6 +118,7 @@ public class ClosedAreaPersonApplyCO extends ClientObject {
     //驳回原因
     @ApiModelProperty(value = "驳回原因")
     private String refusalReason;
+    private String applyUserName;
 
 
     @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit")

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

@@ -50,6 +50,7 @@ public class XgfPersonApplyCO extends ClientObject {
     private String applyCorpName;
     @ApiModelProperty(name = "申请时间", value = "applyTime")
     private String applyTime;
+    private String applyUserName;
 
     @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit")
     private Integer currentUserCanAudit;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaCarApplyDO.java

@@ -1,5 +1,6 @@
 package com.zcloud.primeport.persistence.dataobject;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import io.swagger.annotations.ApiModelProperty;
@@ -142,5 +143,7 @@ public class ClosedAreaCarApplyDO extends BaseDO {
     private String drivingUserId;
     @ApiModelProperty(value = "驾驶人名称")
     private String drivingUserName;
+    @TableField(exist = false)
+    private String applyUserName;
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaPersonApplyDO.java

@@ -1,5 +1,6 @@
 package com.zcloud.primeport.persistence.dataobject;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import io.swagger.annotations.ApiModelProperty;
@@ -116,6 +117,7 @@ public class ClosedAreaPersonApplyDO extends BaseDO {
     //驳回原因
     @ApiModelProperty(value = "驳回原因")
     private String refusalReason;
-
+    @TableField(exist = false)
+    private String applyUserName;
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java

@@ -59,5 +59,7 @@ public class XgfApplyPersonDO extends BaseDO {
     private Integer personApplyCount;
     @TableField(exist = false)
     private String applyTime;
+    @TableField(exist = false)
+    private String applyUserName;
 }
 

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.zcloud.primeport.persistence.mapper.ClosedAreaCarApplyMapper">
 
     <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaCarApplyDO">
-        select * from closed_area_car_apply c
+        select c.*,c.create_name  from closed_area_car_apply c
         where c.delete_enum = 'FALSE'
         <if test="params.processOrRecord != null">
             <if test="params.processOrRecord == 1">
@@ -41,6 +41,7 @@
         <if test="params.licenceNo != null and params.licenceNo != ''">
             AND c.licence_no like CONCAT('%', #{params.licenceNo}, '%')
         </if>
+        order by c.id desc
     </select>
 
 </mapper>

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

@@ -52,7 +52,7 @@
             u.department_id
     </select>
     <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO">
-        select * from closed_area_person_apply c
+        select c.*,c.create_name apply_user_name from closed_area_person_apply c
         where  c.delete_enum = 'FALSE'
         <if test="params.processOrRecord != null">
             <if test="params.processOrRecord == 1">
@@ -82,6 +82,7 @@
         <if test="params.applyPersonUserName != null and params.applyPersonUserName != ''">
             AND c.apply_person_user_name like  CONCAT('%', #{params.applyPersonUserName}, '%')
         </if>
+        order by c.id desc
     </select>
 </mapper>
 

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

@@ -26,6 +26,7 @@
         xap.audit_corp_id,
         xap.audit_corp_name,
         xap.audit_time,
+        xap.create_name apply_user_name,
         pa.person_corp_id,
         pa.person_corp_name,
         pa.person_department_id,
@@ -76,6 +77,7 @@
         SELECT
             p.*,
             p.create_time apply_time,
+            p.create_name apply_user_name,
             tmp.person_apply_count
         FROM
             xgf_apply_person p