feat：黑名单功能完善

web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java

@@ -35,7 +35,7 @@ import java.util.ArrayList;
 public class PersonApplyController {
     private final PersonApplyServiceI personApplyService;
 
-    @ApiOperation("相关方、临时-人员申请-详情")
+    @ApiOperation("相关方-人员申请-详情")
     @GetMapping("/xgfPersonApplyInfoById/{id}")
     public SingleResponse<XgfPersonApplyCO> xgfPersonApplyInfoById(@PathVariable("id") Long id) {
         return SingleResponse.of(personApplyService.xgfPersonApplyInfoById(id));

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

@@ -2,6 +2,7 @@ package com.zcloud.primeport.command;
 
 import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.primeport.domain.gateway.PersonApplyGateway;
 import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway;
 import com.zcloud.primeport.domain.model.PersonApplyE;
@@ -58,6 +59,8 @@ public class PersonApplyAddExe {
                 .auditUserId(cmd.getAuditUserId()).auditUserName(cmd.getAuditUserName())
                 .visitStartTime(cmd.getVisitStartTime())
                 .visitEndTime(cmd.getVisitEndTime())
+                .applyCorpId(cmd.getPersonBelongType() == 4 ? AuthContext.getTenantId() : null)
+                .applyCorpName(cmd.getPersonBelongType() == 4 ? AuthContext.getCurrentUser().getTenantName() : null)
                 .projectId(cmd.getProjectId()).projectName(cmd.getProjectName()).informSignId(cmd.getInformSignId()).build();
         xgfApplyPersonGateway.save(build);
         List<XgfPersonApplyAddCmd.PersonApplyAddCmdExt> personApplyList = cmd.getPersonApplyList();

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

@@ -1,7 +1,9 @@
 package com.zcloud.primeport.command;
 
 import com.alibaba.cola.exception.BizException;
+import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
 import com.zcloud.primeport.domain.gateway.VehicleBlackGateway;
+import com.zcloud.primeport.domain.model.VehicleApplyE;
 import com.zcloud.primeport.domain.model.VehicleBlackE;
 import com.zcloud.primeport.dto.VehicleBlackAddCmd;
 import lombok.AllArgsConstructor;
@@ -20,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 @AllArgsConstructor
 public class VehicleBlackAddExe {
     private final VehicleBlackGateway vehicleBlackGateway;
+    private final VehicleApplyGateway vehicleApplyGateway;
 
     @Transactional(rollbackFor = Exception.class)
     public boolean execute(VehicleBlackAddCmd cmd) {
@@ -28,6 +31,10 @@ public class VehicleBlackAddExe {
         boolean res = false;
         try {
             res = vehicleBlackGateway.add(examTypeE);
+            VehicleApplyE vehicleApplyE = new VehicleApplyE();
+            vehicleApplyE.setBlockedFlag(1);
+            vehicleApplyE.setLicenceNo(cmd.getLicenceNo());
+            vehicleApplyGateway.updateBlackFlag(vehicleApplyE);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

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

@@ -16,17 +16,24 @@ public class VehicleBlackCO extends ClientObject {
     //id
     @ApiModelProperty(value = "id")
     private Long id;
-    //车辆信息表（vehicle_apply）的主键id
-    @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id")
-    private Long vehicleId;
     //车辆所属人姓名（临时车）
-    @ApiModelProperty(value = "车辆所属人姓名（临时车）")
+    @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName")
     private String employeeVehicleUserName;
     //车牌号
-    @ApiModelProperty(value = "车牌号")
+    @ApiModelProperty(value = "车牌号", name = "licenceNo")
     private String licenceNo;
+    @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType")
+    private String licenceType;
+    //车牌类型名称0-白牌  1- 蓝牌   2-黄牌  3-绿牌   4-黑牌
+    @ApiModelProperty(value = "车牌类型名称0-白牌  1- 蓝牌   2-黄牌  3-绿牌   4-黑牌", name = "licenceTypeName")
+    private String licenceTypeName;
+    @ApiModelProperty(value = "车辆类型", name = "vehicleType")
+    private String vehicleType;
+    //车辆类型-名字
+    @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName")
+    private String vehicleTypeName;
     //备注
-    @ApiModelProperty(value = "备注")
+    @ApiModelProperty(value = "备注", name = "remarks")
     private String remarks;
 }
 

web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java

@@ -31,5 +31,7 @@ public interface VehicleApplyGateway {
     VehicleApplyE getById(Long id);
 
     void updateEvehicleBlockedByLicenceNo(String licenceNo, Integer blockedFlag);
+
+    void updateBlackFlag(VehicleApplyE vehicleApplyE);
 }
 

web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java

@@ -38,6 +38,8 @@ public class XgfApplyPersonE extends BaseE {
     private String projectName;
 
     private Long auditCorpId;
+    private Long applyCorpId;
+    private String applyCorpName;
     private String auditCorpName;
     private Long auditDeptId;
     private String auditDeptName;

web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java

@@ -87,5 +87,13 @@ public class VehicleApplyGatewayImpl implements VehicleApplyGateway {
         objectUpdateWrapper.eq("licence_no", licenceNo);
         vehicleApplyRepository.update(objectUpdateWrapper);
     }
+
+    @Override
+    public void updateBlackFlag(VehicleApplyE vehicleApplyE) {
+        UpdateWrapper<VehicleApplyDO> objectUpdateWrapper = new UpdateWrapper<>();
+        objectUpdateWrapper.set("blocked_flag", vehicleApplyE.getBlockedFlag());
+        objectUpdateWrapper.eq("licence_no", vehicleApplyE.getLicenceNo());
+        vehicleApplyRepository.update(objectUpdateWrapper);
+    }
 }
 

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

@@ -26,20 +26,18 @@ public class VehicleBlackDO extends BaseDO {
     private String licenceType;
     private String licenceTypeName;
     @ApiModelProperty(value = "车辆类型")
-//    @TableField(exist = false)
     private String vehicleType;
     //车辆类型-名字
     @ApiModelProperty(value = "车辆类型-名字")
-//    @TableField(exist = false)
     private String vehicleTypeName;
     //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆
     @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆")
     @TableField(exist = false)
     private String vehicleBelongType;
+
     @ApiModelProperty(value = "车辆所属企业ID")
     @TableField(exist = false)
     private Long vehicleCorpId;
-
     //车辆所属企业名称
     @ApiModelProperty(value = "车辆所属企业名称")
     @TableField(exist = false)

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

@@ -45,7 +45,8 @@ public class XgfApplyPersonDO extends BaseDO {
     //项目名称
     @ApiModelProperty(value = "项目名称")
     private String projectName;
-
+    private Long applyCorpId;
+    private String applyCorpName;
     private Long auditCorpId;
     private String auditCorpName;
     private Long auditDeptId;
@@ -54,5 +55,7 @@ public class XgfApplyPersonDO extends BaseDO {
     private String auditUserName;
     private String reasonsRefusal;
     private String reasonVisit;
+    @TableField(exist = false)
+    private Integer personApplyCount;
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java

@@ -19,7 +19,7 @@ import java.util.Map;
 @Mapper
 public interface XgfApplyPersonMapper extends BaseMapper<XgfApplyPersonDO> {
 
-    IPage<VehicleApplyDO> xgfPersonAuditList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
+    IPage<XgfApplyPersonDO> xgfPersonAuditList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
 
     IPage<PersonCountDto> personnelVehicleManagementList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
 }

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java

@@ -43,7 +43,7 @@ public class XgfApplyPersonRepositoryImpl extends BaseRepositoryImpl<XgfApplyPer
         if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
             menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
         }
-        IPage<VehicleApplyDO> result = xgfApplyPersonMapper.xgfPersonAuditList(page, parmas,menuPerms);
+        IPage<XgfApplyPersonDO> result = xgfApplyPersonMapper.xgfPersonAuditList(page, parmas,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

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

@@ -95,6 +95,7 @@
             , ']')
             )
         </if>
+        ORDER BY a.id desc
     </select>
     <select id="carApprovalLogByvehicleApplyIdList"
             resultType="com.zcloud.primeport.persistence.dataobject.VehicleAuditDO">
@@ -129,6 +130,7 @@
         WHERE
             va.delete_enum = 'FALSE' and vap.delete_enum = 'FALSE'
             and va.vehicle_apply_id = #{parmas.vehicleApplyId}
+        ORDER BY va.id desc
     </select>
 </mapper>
 

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

@@ -6,11 +6,12 @@
 
     <select id="getInfoById" resultType="com.zcloud.primeport.persistence.dataobject.VehicleBlackDO">
         SELECT
-            a.licence_type,
+            b.id,
-            a.licence_type_name,
+            b.licence_type,
-            a.licence_no,
+            b.licence_type_name,
-            a.vehicle_type,
+            b.licence_no,
-            a.vehicle_type_name,
+            b.vehicle_type,
+            b.vehicle_type_name,
             a.vehicle_belong_type,
             a.gate_level_auth_area,
             a.vehicle_corp_id,
@@ -37,29 +38,30 @@
     </select>
     <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.VehicleBlackDO">
         SELECT
-            a.licence_type,
+        b.id,
-            a.licence_type_name,
+        b.licence_type,
-            a.licence_no,
+        b.licence_type_name,
-            a.vehicle_type,
+        b.licence_no,
-            a.vehicle_type_name,
+        b.vehicle_type,
-            a.vehicle_belong_type,
+        b.vehicle_type_name,
-            a.gate_level_auth_area,
+        a.vehicle_belong_type,
-            a.vehicle_corp_id,
+        a.gate_level_auth_area,
-            a.vehicle_corp_name,
+        a.vehicle_corp_id,
-            a.vehicle_department_id,
+        a.vehicle_corp_name,
-            a.vehicle_department_name,
+        a.vehicle_department_id,
-            a.employee_vehicle_user_id,
+        a.vehicle_department_name,
-            a.employee_vehicle_user_name,
+        a.employee_vehicle_user_id,
-            a.emission_standards,
+        a.employee_vehicle_user_name,
-            a.emission_standards_name,
+        a.emission_standards,
-            a.driving_license_id,
+        a.emission_standards_name,
-            a.attachment_id,
+        a.driving_license_id,
-            a.inform_sign_id,
+        a.attachment_id,
-            a.project_id,
+        a.inform_sign_id,
-            a.project_name,
+        a.project_id,
-            a.ls_user_idcard,
+        a.project_name,
-            a.ls_user_phone,
+        a.ls_user_idcard,
-            a.mkmj_id
+        a.ls_user_phone,
+        a.mkmj_id
         FROM
             vehicle_black AS b
                 LEFT JOIN vehicle_apply AS a ON b.licence_no = a.licence_no

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

@@ -4,7 +4,7 @@
 
 <mapper namespace="com.zcloud.primeport.persistence.mapper.XgfApplyPersonMapper">
 
-    <select id="xgfPersonAuditList" resultType="com.zcloud.primeport.persistence.dataobject.VehicleApplyDO">
+    <select id="xgfPersonAuditList" resultType="com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO">
         SELECT
             p.*,
             tmp.person_apply_count