门禁卡修改

This commit is contained in:
cwchen 2025-03-13 15:55:49 +08:00
parent 341b08c9a9
commit 3cb079d82e
1 changed files with 25 additions and 31 deletions

View File

@ -111,19 +111,16 @@ public class NewCardService {
* @return
*/
public RestResult addCardData(CardVo vo) {
switch (vo.getCardType()) {
case "职工卡":
if(Objects.equals(vo.getCardType(), "职工卡")){
return addEmployeeCard(vo);
case "第三方人员":
}else if(Objects.equals(vo.getCardType(), "第三方人员")){
return addThirdPartyPersonnelCard(vo);
case "VIP贵宾":
}else if(Objects.equals(vo.getCardType(), "VIP贵宾")){
return addVipCard(vo);
case "临时出入证":
}else if(Objects.equals(vo.getCardType(), "临时出入证")){
return addLsCard(vo);
case "施工出入证":
}else if(Objects.equals(vo.getCardType(), "施工出入证")){
return addSgCard(vo);
default:
break;
}
return new RestResult(Constant.FAILED, "操作失败");
}
@ -380,19 +377,25 @@ public class NewCardService {
* @return
*/
public RestResult getDetailInfo(CardVo vo) {
switch (vo.getCardType()) {
case "职工卡":
if(StringUtils.isEmpty(vo.getCardType())){
List<Object> parameter = new ArrayList<Object>();
String sql = "SELECT MAX(CARD_TYPE) AS \"cardType\""
+ " FROM GREEN_CARD WHERE DATA_ID = ? GROUP BY DATA_ID";
parameter.add(vo.getDataId());
List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql,parameter.toArray());
String cardType = list.get(0).get("cardType");
vo.setCardType(cardType);
}
if(Objects.equals(vo.getCardType(), "职工卡")){
return getEmployeeCardDetail(vo);
case "第三方人员":
}else if(Objects.equals(vo.getCardType(), "第三方人员")){
return getThirdPartyPersonnelCardDetail(vo);
case "VIP贵宾":
}else if(Objects.equals(vo.getCardType(), "VIP贵宾")){
return getVipCardDetail(vo);
case "临时出入证":
}else if(Objects.equals(vo.getCardType(), "临时出入证")){
return getLsCardDetail(vo);
case "施工出入证":
}else if(Objects.equals(vo.getCardType(), "施工出入证")){
return getSgCardDetail(vo);
default:
break;
}
return new RestResult(Constant.FAILED, "查询失败");
}
@ -409,7 +412,7 @@ public class NewCardService {
List<CardVo> dataList = new ArrayList<CardVo>();
CardVo cardVo = new CardVo();
List<Object> parameter = new ArrayList<Object>();
String sql = " SELECT gc.DATA_ID AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\",MAX(gc.TYPE_NAME) AS \"typeName\","
String sql = " SELECT gc.DATA_ID AS \"dataId\",MAX(gc.CARD_TYPE) AS \"cardType\",MAX(gc.TYPE_NAME) AS \"typeName\","
+ " MAX(gc.IS_ENABLE_FACE) AS \"isEnableFace\",MAX(gc.APPLY_TIME) AS \"applyTime\","
+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
@ -782,7 +785,7 @@ public class NewCardService {
public RestResult getCardList(CardVo vo) {
try {
String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( "
+ " SELECT * FROM (SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\","
+ " SELECT * FROM (SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"cardType\","
+ " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\","
+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+ " MAX(CARD_STATUS) AS \"cardStatus\""
@ -861,16 +864,10 @@ public class NewCardService {
* @return
*/
public RestResult auditData(CardVo vo) {
switch (vo.getCardType()) {
case "职工卡":
case "第三方人员":
if(Objects.equals(vo.getCardType(), "职工卡") || Objects.equals(vo.getCardType(), "第三方人员")){
return auditCard(vo);
case "VIP贵宾":
case "临时出入证":
case "施工出入证":
}else if(Objects.equals(vo.getCardType(), "VIP贵宾") || Objects.equals(vo.getCardType(), "临时出入证")|| Objects.equals(vo.getCardType(), "施工出入证")){
return auditCard2(vo);
default:
break;
}
return new RestResult(Constant.FAILED, "操作失败");
}
@ -1231,13 +1228,10 @@ public class NewCardService {
* @return
*/
public RestResult getAuditData(CardVo vo) {
switch (vo.getType()) {
case "0":
if(Objects.equals(vo.getType(), "0")){
return getUnapprovedData(vo);
case "1":
}else if(Objects.equals(vo.getType(), "1")){
return getApprovedData(vo);
default:
break;
}
return new RestResult(Constant.FAILED, "查询失败");