server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -69,7 +69,7 @@ @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:membercard:query") //@RequiresPermissions("business:membercard:query") public ApiResponse<PageData<MemberCard>> findPage (@RequestBody PageWrap<MemberCard> pageWrap) { return ApiResponse.success(memberCardService.findPage(pageWrap)); } @@ -87,4 +87,13 @@ public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(memberCardService.findById(id)); } @ApiOperation("根据条件查询可用卡号") @PostMapping("/queryCard") //@RequiresPermissions("business:membercard:query") public ApiResponse<List<MemberCard>> queryCard () { MemberCard card = new MemberCard(); return ApiResponse.success(memberCardService.findList(card)); } } server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -194,6 +194,11 @@ return ApiResponse.success(memberService.findUnusualPage(pageWrap)); } @ApiOperation("根据类型查询人员信息") @PostMapping("/findTypeMemberInfo") //@RequiresPermissions("business:member:query") public ApiResponse<List<Member>> findTypeMemberInfo (@RequestBody Member member) { return ApiResponse.success(memberService.findList(member)); } } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -346,7 +346,50 @@ } /** * 卡状态 */ public enum CardStatus { DISABLE(0, "禁用"), ENABLE(1, "启用"), REFUNDCARD(2, "退卡"), LOSS(3, "挂失"), /** 卡类型 **/ IC(1,"IC卡"), CPU(2,"CPU卡"), YJLCARD(3,"远距离卡"), MCARD(4,"M卡"); // 成员变量 private String name; private int key; // 构造方法 CardStatus(int key, String name ) { this.name = name; this.key = key; } // get set 方法 public String getName() { return name; } public void setName(String name) { this.name = name; } public int getKey() { return key; } public void setKey(int key) { this.key = key; } } }
@@ -62,6 +62,7 @@ public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ; public static final String ERP ="ERP" ; public static final Integer THREE =3 ; public static final Integer FOUR =4 ; public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN"; public static boolean DEALING_HK_SYNCPRIVILEGE= false; public static boolean DEALING_HK_SYNCDEVICE = false; server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -51,7 +51,7 @@ @ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员") private Integer type; @ApiModelProperty(value = "访客名称") @ApiModelProperty(value = "访客名称/内部人员名称") private String name; @ApiModelProperty(value = "性别") server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -79,7 +79,7 @@ @ExcelColumn(name="类型 0劳务访客 1普通访客 2内部人员") private Integer type; @ApiModelProperty(value = "访客名称") @ApiModelProperty(value = "访客名称/内部人员") @ExcelColumn(name="访客名称") private String name;
@@ -92,10 +92,29 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date hkDate; @ApiModelProperty(value = "状态 0禁用 1启用") @ExcelColumn(name="状态 0禁用 1启用") @ApiModelProperty(value = "状态 0禁用 1启用 2退卡 3挂失") @ExcelColumn(name="状态 0禁用 1启用 2退卡 3挂失") private Integer status; @ApiModelProperty(value = "状态 0禁用 1启用 2退卡 3挂失") @TableField(exist = false) private String statusName; @ApiModelProperty(value = "卡类型 1 IC卡 2 CPU卡 3远距离卡 4M卡 -- 前端新增传值写死") @ExcelColumn(name="卡类型 1 IC卡 2 CPU卡 3远距离卡 4M卡") private Integer cardType; @ApiModelProperty(value = "卡类型名称") @TableField(exist = false) private String cardTypeName; @ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员", example = "1") @ExcelColumn(name="类型 0劳务访客 1普通访客 2内部人员") private Integer type; @ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员", example = "1") @ExcelColumn(name="类型 0劳务访客 1普通访客 2内部人员") private String typeName; @ApiModelProperty(value = "关键字") @TableField(exist = false) server/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
@@ -3,6 +3,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.MemberCard; import java.util.List; /** @@ -94,4 +95,5 @@ * @return long */ long count(MemberCard memberCard); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -3,14 +3,19 @@ import cn.hutool.core.lang.PatternPool; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ReUtil; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.admin.response.CarEventDTO; import com.doumee.dao.business.MemberCardMapper; import com.doumee.dao.business.join.MemberCardJoinMapper; import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.Member; import com.doumee.dao.business.model.MemberCard; import com.doumee.dao.business.model.Retention; import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.MemberCardService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -21,8 +26,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; /** * 用户卡片绑定信息表Service实现 @@ -92,6 +98,11 @@ @Override public List<MemberCard> findList(MemberCard memberCard) { QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard); wrapper.lambda().eq(MemberCard::getIsdeleted, Constants.ZERO); wrapper.lambda().eq(MemberCard::getHkStatus, Constants.ONE); // 启用和退卡的卡号 wrapper.lambda().and(param -> param.eq(MemberCard::getStatus,Constants.ZERO). or().eq(MemberCard::getStatus,Constants.TWO)); return memberCardMapper.selectList(wrapper); } @@ -166,6 +177,9 @@ .like(number,Member::getPhone,pageWrap.getModel().getKeyWords()) .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords()); IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper); if(null != memberCardIPage && memberCardIPage.getRecords().size() > 0) { memberCardIPage.setRecords(getDataPackage(memberCardIPage)); } return PageData.from(memberCardIPage); } @@ -174,4 +188,43 @@ QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard); return memberCardMapper.selectCount(wrapper); } private List<MemberCard> getDataPackage(IPage<MemberCard> memberCardIPage) { List<MemberCard> newDataList = new ArrayList<>(); memberCardIPage.getRecords().stream().forEach(obj->{ if(null != obj.getType()) { if(Constants.equalsInteger(obj.getCardType(),Constants.ZERO)) { obj.setTypeName(Constants.Status.LW_FK.getDes()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)){ obj.setTypeName(Constants.Status.PT_FK.getDes()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)){ obj.setTypeName(Constants.Status.NB_FK.getDes()); } } if(null != obj.getCardType()) { if(Constants.equalsInteger(obj.getCardType(),Constants.ZERO)) { obj.setCardTypeName(HKConstants.CardStatus.DISABLE.getName()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)) { obj.setCardTypeName(HKConstants.CardStatus.ENABLE.getName()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)) { obj.setCardTypeName(HKConstants.CardStatus.REFUNDCARD.getName()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.THREE)) { obj.setCardTypeName(HKConstants.CardStatus.LOSS.getName()); } } if(null != obj.getStatus()) { if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)) { obj.setCardTypeName(HKConstants.CardStatus.IC.getName()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)) { obj.setCardTypeName(HKConstants.CardStatus.CPU.getName()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.THREE)) { obj.setCardTypeName(HKConstants.CardStatus.YJLCARD.getName()); }else if(Constants.equalsInteger(obj.getCardType(),Constants.FOUR)) { obj.setCardTypeName(HKConstants.CardStatus.MCARD.getName()); } } newDataList.add(obj); }); return newDataList; } } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -325,6 +325,10 @@ @Override public List<Member> findList(Member member) { QueryWrapper<Member> wrapper = new QueryWrapper<>(member); if(null != member.getType()) { wrapper.lambda().eq(Member::getType,member.getType()); } wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO); return memberMapper.selectList(wrapper); }
