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

@@ -11,7 +11,6 @@ import com.zcloud.primeport.api.MkmjApprovalUserServiceI;
 import com.zcloud.primeport.dto.MkmjApprovalUserAddCmd;
 import com.zcloud.primeport.dto.MkmjApprovalUserPageQry;
 import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd;
-import com.zcloud.primeport.dto.clientobject.AvailableResultCO;
 import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -65,12 +64,6 @@ public class MkmjApprovalUserController {
         mkmjApprovalUserService.remove(id);
         return SingleResponse.buildSuccess();
     }
-    @ApiOperation("校验审批人是否已录入")
-    @GetMapping("/checkExistByUserId/{userId}")
-    public SingleResponse<AvailableResultCO> checkExistByUserId(@PathVariable("userId") Long userId) {
-        return mkmjApprovalUserService.checkExistByUserId(userId);
-    }
-
     @ApiOperation("修改")
     @PutMapping("/edit")
     public SingleResponse edit(@Validated @RequestBody MkmjApprovalUserUpdateCmd mkmjApprovalUserUpdateCmd) {

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

@@ -1,12 +1,9 @@
 package com.zcloud.primeport.command;
 
 import com.alibaba.cola.exception.BizException;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zcloud.primeport.domain.gateway.MkmjApprovalUserGateway;
 import com.zcloud.primeport.domain.model.MkmjApprovalUserE;
 import com.zcloud.primeport.dto.MkmjApprovalUserAddCmd;
-import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
-import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -23,17 +20,9 @@ import org.springframework.transaction.annotation.Transactional;
 @AllArgsConstructor
 public class MkmjApprovalUserAddExe {
     private final MkmjApprovalUserGateway mkmjApprovalUserGateway;
-    private final MkmjApprovalUserRepository mkmjApprovalUserRepository;
 
     @Transactional(rollbackFor = Exception.class)
     public boolean execute(MkmjApprovalUserAddCmd cmd) {
-        QueryWrapper<MkmjApprovalUserDO> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id", cmd.getUserId());
-        wrapper.eq("delete_enum", "FALSE");
-        MkmjApprovalUserDO exist = mkmjApprovalUserRepository.getOne(wrapper);
-        if (exist != null) {
-            throw new BizException("该审批人已录入，不可重复添加");
-        }
         MkmjApprovalUserE examTypeE = new MkmjApprovalUserE();
         BeanUtils.copyProperties(cmd, examTypeE);
         boolean res = false;
@@ -48,3 +37,4 @@ public class MkmjApprovalUserAddExe {
         return true;
     }
 }
+

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

@@ -73,13 +73,6 @@ public class MkmjApprovalUserQueryExe {
         return mkmjApprovalUserCoConvertor.converDOToCO(byId);
     }
 
-    public MkmjApprovalUserDO getByUserId(Long userId) {
-        QueryWrapper<MkmjApprovalUserDO> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id", userId);
-        wrapper.eq("delete_enum", "FALSE");
-        return mkmjApprovalUserRepository.getOne(wrapper);
-    }
-
     public static void main(String[] args) {
 
         for (int i = 0; i < 30; i++) {

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

@@ -10,7 +10,6 @@ import com.zcloud.primeport.command.query.MkmjApprovalUserQueryExe;
 import com.zcloud.primeport.dto.MkmjApprovalUserAddCmd;
 import com.zcloud.primeport.dto.MkmjApprovalUserPageQry;
 import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd;
-import com.zcloud.primeport.dto.clientobject.AvailableResultCO;
 import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -70,17 +69,5 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI {
     public MkmjApprovalUserCO getInfoById(Long id) {
         return mkmjApprovalUserQueryExe.getInfoById(id);
     }
-
-    @Override
-    public SingleResponse<AvailableResultCO> checkExistByUserId(Long userId) {
-        AvailableResultCO result = new AvailableResultCO();
-        if (mkmjApprovalUserQueryExe.getByUserId(userId) != null) {
-            result.setAvailable(false);
-            result.setAvailableMessage("该审批人已录入，不可重复添加");
-        } else {
-            result.setAvailable(true);
-        }
-        return SingleResponse.of(result);
-    }
 }
 

web-client/src/main/java/com/zcloud/primeport/api/MkmjApprovalUserServiceI.java

@@ -7,7 +7,6 @@ import com.zcloud.primeport.dto.MkmjApprovalUserPageQry;
 import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd;
 import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO;
 
-import com.zcloud.primeport.dto.clientobject.AvailableResultCO;
 import java.util.Collection;
 import java.util.List;
 
@@ -31,7 +30,5 @@ public interface MkmjApprovalUserServiceI {
     List<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry);
 
     MkmjApprovalUserCO getInfoById(Long id);
-
-    SingleResponse<AvailableResultCO> checkExistByUserId(Long userId);
 }
 

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

@@ -34,11 +34,11 @@ public class MkmjApprovalUserAddCmd extends Command {
     @NotEmpty(message = "审批人部门名称不能为空")
     private String deptName;
     @ApiModelProperty(value = "审批人岗位Id")
-//    @NotNull(message = "审批人岗位Id不能为空")
+    @NotNull(message = "审批人岗位Id不能为空")
     private Long postId;
     //审批人岗位名称
     @ApiModelProperty(value = "审批人岗位名称")
-//    @NotEmpty(message = "审批人岗位名称不能为空")
+    @NotEmpty(message = "审批人岗位名称不能为空")
     private String postName;
     @ApiModelProperty(value = "审批人id", name = "userId", required = true)
     @NotNull(message = "审批人id不能为空")

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

@@ -1,13 +0,0 @@
-package com.zcloud.primeport.dto.clientobject;
-
-import com.alibaba.cola.dto.ClientObject;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class AvailableResultCO extends ClientObject {
-    @ApiModelProperty(value = "是否可用(true可用/false不可用)")
-    private Boolean available;
-    @ApiModelProperty(value = "不可用原因")
-    private String availableMessage;
-}

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

@@ -26,7 +26,5 @@ public interface MkmjApprovalUserGateway {
     Boolean deletedMkmjApprovalUserById(Long id);
 
     Boolean deletedMkmjApprovalUserByIds(Long[] id);
-
-    MkmjApprovalUserE getByUserId(Long userId);
 }
 

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

@@ -1,6 +1,5 @@
 package com.zcloud.primeport.gatewayimpl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zcloud.primeport.domain.gateway.MkmjApprovalUserGateway;
 import com.zcloud.primeport.domain.model.MkmjApprovalUserE;
 import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
@@ -47,18 +46,5 @@ public class MkmjApprovalUserGatewayImpl implements MkmjApprovalUserGateway {
     public Boolean deletedMkmjApprovalUserByIds(Long[] ids) {
         return mkmjApprovalUserRepository.removeByIds(Collections.singletonList(ids));
     }
+}
 
-    @Override
-    public MkmjApprovalUserE getByUserId(Long userId) {
-        LambdaQueryWrapper<MkmjApprovalUserDO> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MkmjApprovalUserDO::getUserId, userId);
-        wrapper.eq(MkmjApprovalUserDO::getDeleteEnum, "FALSE");
-        MkmjApprovalUserDO d = mkmjApprovalUserRepository.getOne(wrapper);
-        if (d == null) {
-            return null;
-        }
-        MkmjApprovalUserE e = new MkmjApprovalUserE();
-        BeanUtils.copyProperties(d, e);
-        return e;
-    }
-}

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

@@ -63,18 +63,6 @@
         WHERE
             c.delete_enum = 'FALSE'
         and c.type = 3
-        <if test="params.name != null and params.name != ''">
-            AND c.corp_name LIKE CONCAT('%', #{params.name}, '%')
-        </if>
-        <if test="params.projectName != null and params.projectName != ''">
-            AND c.id IN (
-                SELECT apply_corp_id FROM xgf_apply_person
-                WHERE project_name LIKE CONCAT('%', #{params.projectName}, '%') AND delete_enum = 'FALSE' AND person_belong_type = 3
-                UNION
-                SELECT vehicle_corp_id FROM vehicle_apply
-                WHERE project_name LIKE CONCAT('%', #{params.projectName}, '%') AND delete_enum = 'FALSE' AND vehicle_belong_type = 5 AND vehicle_corp_id IS NOT NULL
-            )
-        </if>
         GROUP BY
             c.id
     </select>

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>
@@ -75,9 +76,6 @@
         <if test="params.employeeVehicleUserId != null">
             AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}
         </if>
-        <if test="params.gateLevelAuthAreaId != null and params.gateLevelAuthAreaId != ''">
-            AND JSON_CONTAINS(f.gate_level_auth_area, JSON_OBJECT('bianma', #{params.gateLevelAuthAreaId}), '$.area')
-        </if>
         order by f.id desc
     </select>
     <select id="fgsCount" resultType="com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto">

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

@@ -150,6 +150,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