更新查询是否黑名单功能

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentBlacklistDTO.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * 黑名单表
@@ -34,6 +36,7 @@ public class RentBlacklistDTO implements Serializable {
     /**
      * 身份证
      */
+    @NotBlank(message = "身份证不能为空")
 	private String idCard;
 
     /**

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java

@@ -197,4 +197,8 @@ public class RentContractInfoDTO implements Serializable {
     @NotEmpty
     private List<RentContractFileDTO> fileList;
 
+    /**
+     * 是否黑名单
+     */
+    private String isBlack;
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/dao/RentContractInfoDao.java

@@ -1,9 +1,13 @@
 package com.epmet.plugin.power.modules.rent.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.rent.RentContractInfoDTO;
 import com.epmet.plugin.power.modules.rent.entity.RentContractInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 合同表
  *
@@ -12,5 +16,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface RentContractInfoDao extends BaseDao<RentContractInfoEntity> {
-	
+
+    /**
+     * 获取合同列表
+     *
+     * @param params
+     * @return java.util.List<com.epmet.plugin.power.dto.rent.RentContractInfoDTO>
+     * @author zhy
+     * @date 2022/4/24 17:18
+     */
+    List<RentContractInfoDTO> getContractInfoList(Map<String, Object> params);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.rent.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -48,13 +50,13 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
         return ConvertUtils.sourceToTarget(entityList, RentBlacklistDTO.class);
     }
 
-    private QueryWrapper<RentBlacklistEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-        String name = (String)params.get("name");
-        String idCard = (String)params.get("idCard");
-        String mobile = (String)params.get("mobile");
-        String startTime = (String)params.get("startTime");
-        String endTime = (String)params.get("endTime");
+    private QueryWrapper<RentBlacklistEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String name = (String) params.get("name");
+        String idCard = (String) params.get("idCard");
+        String mobile = (String) params.get("mobile");
+        String startTime = (String) params.get("startTime");
+        String endTime = (String) params.get("endTime");
 
         QueryWrapper<RentBlacklistEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -76,6 +78,12 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(RentBlacklistDTO dto) {
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("idCard", dto.getIdCard());
+        if (!list(params).isEmpty()) {
+            throw new EpmetException("该人员已经在黑名单");
+        }
+
         RentBlacklistEntity entity = ConvertUtils.sourceToTarget(dto, RentBlacklistEntity.class);
         insert(entity);
     }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java

@@ -6,7 +6,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetException;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.plugin.power.dto.rent.RentContractFileDTO;
@@ -50,11 +49,10 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
     @Override
     public PageData<RentContractInfoDTO> page(Map<String, Object> params) {
-        IPage<RentContractInfoEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, RentContractInfoDTO.class);
+        IPage<RentContractInfoDTO> page = getPage(params);
+        List<RentContractInfoDTO> list = baseDao.getContractInfoList(params);
+        return new PageData<>(list, page.getTotal());
+
     }
 
     @Override

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml

@@ -33,5 +33,13 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="getContractInfoList" resultType="com.epmet.plugin.power.dto.rent.RentContractInfoDTO">
+    SELECT
+        i.*,
+    IF
+        ( b.id IS NULL, '否', '是' ) AS isBlack
+    FROM
+        pli_rent_contract_info i
+        LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD
+    </select>
 </mapper>