办卡办证修改
This commit is contained in:
parent
b81a72ab24
commit
5282c7e969
|
|
@ -25,6 +25,25 @@ public class NewCardController extends GreenBaseController{
|
|||
@Autowired
|
||||
private NewCardService service;
|
||||
|
||||
/**
|
||||
* 更新卡状态 2.制卡完成 3.已领卡
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@RequestMapping(value = "/updateCardStatus", method = { RequestMethod.POST })
|
||||
public RestResult updateCardStatus(CardVo vo) {
|
||||
try {
|
||||
GreenUserInfo info = getUserInfo(vo.getUserId());
|
||||
if (info == null) {
|
||||
return new RestResult(Constant.FAILED, "非法用户");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return new RestResult(Constant.FAILED, "非法用户");
|
||||
}
|
||||
return service.updateCardStatus(vo);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 职工卡-根据选择的卡类型获取审核人
|
||||
|
|
|
|||
|
|
@ -211,6 +211,11 @@ public class CardVo implements Serializable{
|
|||
|
||||
private Integer pageNum;
|
||||
|
||||
/**
|
||||
* 卡状态 1.制卡中 2.制卡完成 3.已领取
|
||||
*/
|
||||
private String cardStatus;
|
||||
|
||||
|
||||
/**
|
||||
* 人员信息-多个
|
||||
|
|
@ -929,6 +934,16 @@ public class CardVo implements Serializable{
|
|||
public void setOperType(String operType) {
|
||||
this.operType = operType;
|
||||
}
|
||||
|
||||
|
||||
public String getCardStatus() {
|
||||
return cardStatus;
|
||||
}
|
||||
|
||||
|
||||
public void setCardStatus(String cardStatus) {
|
||||
this.cardStatus = cardStatus;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ public class NewCardService {
|
|||
new Object[] { id, vo.getUserId(), vo.getUserName(), vo.getPhone(), vo.getOrgId(),
|
||||
vo.getOrgName(), vo.getType(), u.getUnit(), u.getPersonnel(), u.getPersonnelPhone(),
|
||||
applyTime, '1', '0', vo.getCheckUserId(), vo.getCheckUserName(), vo.getCardType(),
|
||||
vo.getTypeName(), u.getPhoto(), u.getIdPhoto(), vo.getIsEnableFace(), '0', dataId,
|
||||
vo.getTypeName(), u.getPhoto(), u.getIdPhoto(), vo.getIsEnableFace(), '1', dataId,
|
||||
vo.getCheckId(), vo.getCheckRole(),"0" });
|
||||
}
|
||||
// 添加出入区域
|
||||
|
|
@ -198,7 +198,7 @@ public class NewCardService {
|
|||
new Object[] { id, vo.getUserId(), vo.getUserName(), vo.getPhone(), vo.getOrgId(),
|
||||
vo.getOrgName(), vo.getType(), u.getUnit(), u.getPersonnel(), u.getPersonnelPhone(),
|
||||
applyTime, '1', '0', vo.getCheckUserId(), vo.getCheckUserName(), vo.getCardType(),
|
||||
vo.getTypeName(), u.getPhoto(), u.getIdPhoto(), vo.getIsEnableFace(), '0', dataId,
|
||||
vo.getTypeName(), u.getPhoto(), u.getIdPhoto(), vo.getIsEnableFace(), '1', dataId,
|
||||
vo.getCheckId(), vo.getCheckRole(), vo.getXmgkOrgId(), vo.getXmgkOrgName(),
|
||||
vo.getJbUserId(), vo.getJbUserPhone(), vo.getJbUserName(), vo.getApplyType(),
|
||||
vo.getApplyTerm(), u.getDocumentation(),"0" });
|
||||
|
|
@ -233,14 +233,14 @@ public class NewCardService {
|
|||
addSql.append("INSERT INTO GREEN_CARD (ID, USER_ID, USER_NAME, PHONE, ORG_ID, ORG_NAME,TYPE,"
|
||||
+ " APPLY_TIME,EXAMINE_BATCH,EXAMINE_STATE,EXAMINE_PERSON_ID,EXAMINE_PERSON_NAME,"
|
||||
+ " CARD_TYPE,TYPE_NAME,DATA_ID,CHECK_ID,CHECK_ROLE,JB_USER_ID,JB_USER_PHONE,JB_USER_NAME,"
|
||||
+ " LEND_TIME,BACK_TIME,DOCUMENTATION,OPER_TYPE)"
|
||||
+ " VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
|
||||
+ " LEND_TIME,BACK_TIME,DOCUMENTATION,OPER_TYPE,CARD_STATUS)"
|
||||
+ " VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
|
||||
iHibernateDao.executeSqlUpdate(addSql.toString(),
|
||||
new Object[] { id, vo.getUserId(), vo.getUserName(), vo.getPhone(), vo.getOrgId(), vo.getOrgName(),
|
||||
vo.getType(), applyTime, "1", "0", vo.getCheckUserId(), vo.getCheckUserName(),
|
||||
vo.getCardType(), vo.getTypeName(), dataId, vo.getCheckId(), vo.getCheckRole(),
|
||||
vo.getJbUserId(), vo.getJbUserPhone(), vo.getJbUserName(), vo.getLendTime(),
|
||||
vo.getBackTime(), vo.getDocumentation(),"0" });
|
||||
vo.getBackTime(), vo.getDocumentation(),"0","1" });
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
// 手动回滚异常
|
||||
|
|
@ -275,8 +275,8 @@ public class NewCardService {
|
|||
+ " CARD_TYPE,TYPE_NAME,DATA_ID,CHECK_ID,CHECK_ROLE,PRO_NAME,PRO_UNIT,PRO_MANAGER,"
|
||||
+ " PRO_MANAGER_PHONE,CONTRACT_START_TIME,CONTRACT_END_TIME,BZ_NUM,PERSONNEL,ID_PHOTO,"
|
||||
+ " ACCESS_AREA,XMGK_ORG_ID,XMGK_ORG_NAME,"
|
||||
+ " JB_USER_ID,JB_USER_PHONE,JB_USER_NAME,OPER_TYPE)"
|
||||
+ " VALUES (?, ?, ?, ?, ?, ?,?,?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
|
||||
+ " JB_USER_ID,JB_USER_PHONE,JB_USER_NAME,OPER_TYPE,CARD_STATUS)"
|
||||
+ " VALUES (?, ?, ?, ?, ?, ?,?,?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
|
||||
iHibernateDao.executeSqlUpdate(addSql.toString(),
|
||||
new Object[] { id, vo.getUserId(), vo.getUserName(), vo.getPhone(), vo.getOrgId(),
|
||||
vo.getOrgName(), vo.getType(), applyTime, "1", "0", vo.getCheckUserId(),
|
||||
|
|
@ -284,7 +284,7 @@ public class NewCardService {
|
|||
vo.getCheckRole(), vo.getProName(), vo.getProUnit(), vo.getProManager(),
|
||||
vo.getProManagerPhone(), vo.getContractStartTime(), vo.getContractEndTime(),
|
||||
vo.getBzNum(), u.getPersonnel(), u.getIdPhoto(), vo.getAccessArea(),vo.getXmgkOrgId(),
|
||||
vo.getXmgkOrgName(),vo.getJbUserId(),vo.getJbUserPhone(),vo.getJbUserName(),"0"});
|
||||
vo.getXmgkOrgName(),vo.getJbUserId(),vo.getJbUserPhone(),vo.getJbUserName(),"0","1"});
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
|
@ -320,7 +320,7 @@ public class NewCardService {
|
|||
+ " CARD_TYPE,TYPE_NAME,DATA_ID,CHECK_ID,CHECK_ROLE,XMGK_ORG_ID,XMGK_ORG_NAME,"
|
||||
+ " JB_USER_ID,JB_USER_PHONE,JB_USER_NAME,WORK_CONTENT,TICKET_NO,ACCESS_AREA,"
|
||||
+ " PRO_UNIT,PRO_MANAGER,PRO_MANAGER_PHONE,CONTRACT_START_TIME,CONTRACT_END_TIME,CAR_NUM,"
|
||||
+ " PERSONNEL,ID_PHOTO,ID_NUMBER,OPER_TYPE)"
|
||||
+ " PERSONNEL,ID_PHOTO,ID_NUMBER,OPER_TYPE,CARD_STATUS)"
|
||||
+ " VALUES (?, ?, ?, ?, ?, ?,?,?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
|
||||
iHibernateDao.executeSqlUpdate(addSql.toString(),
|
||||
new Object[] { id, vo.getUserId(), vo.getUserName(), vo.getPhone(), vo.getOrgId(),
|
||||
|
|
@ -330,7 +330,7 @@ public class NewCardService {
|
|||
vo.getJbUserPhone(), vo.getJbUserName(), vo.getWorkContent(), vo.getTicketNo(),
|
||||
vo.getAccessArea(), vo.getProUnit(), vo.getProManager(), vo.getProManagerPhone(),
|
||||
vo.getContractStartTime(), vo.getContractEndTime(), vo.getCarNum(), u.getPersonnel(),
|
||||
u.getIdPhoto(), u.getIdNumber(),"0" });
|
||||
u.getIdPhoto(), u.getIdNumber(),"0","1" });
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
|
@ -1377,4 +1377,25 @@ public class NewCardService {
|
|||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新卡状态 2.制卡完成 3.已领卡
|
||||
* @param vo
|
||||
* @return
|
||||
*/
|
||||
public RestResult updateCardStatus(CardVo vo) {
|
||||
try {
|
||||
List<Object> parameter = new ArrayList<Object>();
|
||||
String sql = "UPDATE GREEN_CARD SET CARD_STATUS = ? WHERE DATA_ID = ?";
|
||||
parameter.add(vo.getCardStatus());
|
||||
parameter.add(vo.getDataId());
|
||||
iHibernateDao.executeSqlUpdate(sql,parameter.toArray());
|
||||
return new RestResult(Constant.SUCCESS, "操作成功");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
// 手动回滚异常
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
return new RestResult(Constant.FAILED, "操作失败");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3479,6 +3479,15 @@ public class GreenMainInterfaceController {
|
|||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
CardVo vo = objectMapper.readValue(dataStr, CardVo.class);
|
||||
return newCardController.getAuditCheckUser2(vo);
|
||||
}else if ("greenNewCard/updateCardStatus".equals(method)) {
|
||||
if (Utils.list.contains("greenNewCard/updateCardStatus" + checkTime)) {
|
||||
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
|
||||
} else {
|
||||
Utils.list.add("greenNewCard/updateCardStatus" + checkTime);
|
||||
}
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
CardVo vo = objectMapper.readValue(dataStr, CardVo.class);
|
||||
return newCardController.updateCardStatus(vo);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue