bonus
/
hz-zhhq-app-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.0.75:3000/bonus/hz-zhhq-app-service 

# Conflicts:
#	.gitignore
This commit is contained in:
liux 2025-03-11 13:37:37 +08:00
parent 346c169298 b1bc6228bd
commit 341b08c9a9
5 changed files with 608 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
greenH5modul/src/com/jysoft/card/controller/NewCardController.java
View File

@ -25,9 +25,28 @@ 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);
}
/**
* 根据选择的卡类型获取审核人
* 职工卡-根据选择的卡类型获取审核人
* @param entity
* @return
*/
@ -46,6 +65,26 @@ public class NewCardController extends GreenBaseController{
}
/**
* 第三方人员/VIP贵宾/临时出入证/施工出入证-根据选择的部门获取获取审核人
* @param entity
* @return
*/
@ResponseBody
@RequestMapping(value = "/getAuditCheckUser2", method = { RequestMethod.POST })
public RestResult getAuditCheckUser2(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.getAuditCheckUser2(vo);
}
/**
* 新增办卡/办证数据
* @param entity
@ -205,5 +244,25 @@ public class NewCardController extends GreenBaseController{
return service.getAuditData(vo);
}
/**
* 查询历史填写项目
* @param vo
* @return
*/
@ResponseBody
@RequestMapping(value = "/getHistoryPros", method = { RequestMethod.POST })
public RestResult getHistoryPros(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.getHistoryPros(vo);
}
}

32
greenH5modul/src/com/jysoft/card/entity/vo/CardVo.java
View File

@ -211,6 +211,11 @@ public class CardVo implements Serializable{
private Integer pageNum;
/**
* 卡状态 1.制卡中 2.制卡完成 3.已领取
*/
private String cardStatus;
/**
* 人员信息-多个
@ -404,6 +409,11 @@ public class CardVo implements Serializable{
* 制卡经办人ID
*/
private String operCardId;
/**
* 审批人操作类型 0.默认 1.制卡经办人审核 2.制卡经办人抄送、填写备注、办卡日期等操作
*/
private String operType;
public String getId() {
@ -915,4 +925,26 @@ public class CardVo implements Serializable{
this.operCardId = operCardId;
}
public String getOperType() {
return operType;
}
public void setOperType(String operType) {
this.operType = operType;
}
public String getCardStatus() {
return cardStatus;
}
public void setCardStatus(String cardStatus) {
this.cardStatus = cardStatus;
}
}

525
greenH5modul/src/com/jysoft/card/service/NewCardService.java
View File

@ -54,16 +54,47 @@ public class NewCardService {
@SuppressWarnings("unchecked")
public RestResult getAuditCheckUser(CardVo vo) {
try {
// List<Map<String, String>> list = getDeptByUser(vo);
List<CardAuditVo> dataList = new ArrayList<CardAuditVo>();
List<Object> parameter = new ArrayList<Object>();
String sql = " SELECT ghc.CHECK_ID AS \"checkId\"," + " ghcd.CHECK_ROLE AS \"checkRole\","
+ " gui.REAL_NAME AS \"userName\"," + " gui.ID AS \"userId\"" + " FROM GREEN_HOUSE_CHECK ghc"
+ " gui.REAL_NAME AS \"userName\"," + " gui.ID AS \"userId\" "
+ " FROM GREEN_HOUSE_CHECK ghc"
+ " LEFT JOIN GREEN_HOUSE_CHECK_DETAILS ghcd ON ghc.CHECK_ID = ghcd.CHECK_ID"
+ " LEFT JOIN GREEN_USER_ROLE_REL gurr ON ghcd.CHECK_ROLE = gurr.ROLE_ID AND IS_DELETED = 'N'"
+ " LEFT JOIN GREEN_USER_INFO gui ON gurr.USER_ID = gui.ID"
+ " LEFT JOIN GREEN_HOUSE_CHECK_ROLE ghcr ON ghcd.CHECK_ROLE = ghcr.ROLE_ID"
+ " LEFT JOIN GREEN_USER_INFO gui ON ghcr.USER_ID = gui.ID"
+ " WHERE ghc.CHECK_NAME = ? AND CHECK_SORT = '1'";
System.err.println(sql);
parameter.add(vo.getCardType());
// parameter.add(list.get(0).get("departmentId"));
dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(),
new BeanPropertyRowMapper<CardAuditVo>(CardAuditVo.class));
return new RestResult(Constant.SUCCESS, "查询成功", dataList);
} catch (Exception e) {
e.printStackTrace();
return new RestResult(Constant.FAILED, "查询失败");
}
}
/**
* 第三方人员/VIP贵宾/临时出入证/施工出入证-根据选择的部门获取获取审核人
* @param vo
* @return
*/
public RestResult getAuditCheckUser2(CardVo vo) {
try {
List<CardAuditVo> dataList = new ArrayList<CardAuditVo>();
List<Object> parameter = new ArrayList<Object>();
String sql = " SELECT ghc.CHECK_ID AS \"checkId\"," + " ghcd.CHECK_ROLE AS \"checkRole\","
+ " gui.REAL_NAME AS \"userName\"," + " gui.ID AS \"userId\" "
+ " FROM GREEN_HOUSE_CHECK ghc"
+ " LEFT JOIN GREEN_HOUSE_CHECK_DETAILS ghcd ON ghc.CHECK_ID = ghcd.CHECK_ID"
+ " LEFT JOIN GREEN_HOUSE_CHECK_ROLE ghcr ON ghcd.CHECK_ROLE = ghcr.ROLE_ID"
+ " LEFT JOIN GREEN_USER_INFO gui ON ghcr.USER_ID = gui.ID"
+ " WHERE ghc.CHECK_NAME = ? AND CHECK_SORT = '1'";
System.err.println(sql);
parameter.add(vo.getCardType());
// parameter.add(vo.getXmgkOrgId());
dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(),
new BeanPropertyRowMapper<CardAuditVo>(CardAuditVo.class));
return new RestResult(Constant.SUCCESS, "查询成功", dataList);
@ -119,14 +150,14 @@ public class NewCardService {
addSql.append("INSERT INTO GREEN_CARD (ID, USER_ID, USER_NAME, PHONE, ORG_ID, ORG_NAME,TYPE,"
+ " UNIT,PERSONNEL,PERSONNEL_PHONE,APPLY_TIME,EXAMINE_BATCH,EXAMINE_STATE,EXAMINE_PERSON_ID,"
+ " EXAMINE_PERSON_NAME,CARD_TYPE,TYPE_NAME,PHOTO,ID_PHOTO,IS_ENABLE_FACE,CARD_STATUS,"
+ " DATA_ID,CHECK_ID,CHECK_ROLE)"
+ " VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ " DATA_ID,CHECK_ID,CHECK_ROLE,OPER_TYPE)"
+ " VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
iHibernateDao.executeSqlUpdate(addSql.toString(),
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.getCheckId(), vo.getCheckRole() });
vo.getTypeName(), u.getPhoto(), u.getIdPhoto(), vo.getIsEnableFace(), '1', dataId,
vo.getCheckId(), vo.getCheckRole(),"0" });
}
// 添加出入区域
addAreaData(vo, dataId);
@ -163,16 +194,16 @@ public class NewCardService {
+ " UNIT,PERSONNEL,PERSONNEL_PHONE,APPLY_TIME,EXAMINE_BATCH,EXAMINE_STATE,EXAMINE_PERSON_ID,"
+ " EXAMINE_PERSON_NAME,CARD_TYPE,TYPE_NAME,PHOTO,ID_PHOTO,IS_ENABLE_FACE,CARD_STATUS,"
+ " DATA_ID,CHECK_ID,CHECK_ROLE,XMGK_ORG_ID,XMGK_ORG_NAME,JB_USER_ID,JB_USER_PHONE,JB_USER_NAME,"
+ " APPLY_TYPE,APPLY_TERM,DOCUMENTATION)"
+ " VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ " APPLY_TYPE,APPLY_TERM,DOCUMENTATION,OPER_TYPE)"
+ " VALUES (?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
iHibernateDao.executeSqlUpdate(addSql.toString(),
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() });
vo.getApplyTerm(), u.getDocumentation(),"0" });
}
// 添加出入区域
addAreaData(vo, dataId);
@ -204,14 +235,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)"
+ " 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() });
vo.getBackTime(), vo.getDocumentation(),"0","1" });
} catch (Exception e) {
e.printStackTrace();
// 手动回滚异常
@ -245,15 +276,17 @@ public class NewCardService {
+ " APPLY_TIME,EXAMINE_BATCH,EXAMINE_STATE,EXAMINE_PERSON_ID,EXAMINE_PERSON_NAME,"
+ " 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)"
+ " VALUES (?, ?, ?, ?, ?, ?,?,?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ " ACCESS_AREA,XMGK_ORG_ID,XMGK_ORG_NAME,"
+ " 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(),
vo.getCheckUserName(), vo.getCardType(), vo.getTypeName(), dataId, vo.getCheckId(),
vo.getCheckRole(), vo.getProName(), vo.getProUnit(), vo.getProManager(),
vo.getProManagerPhone(), vo.getContractStartTime(), vo.getContractEndTime(),
vo.getBzNum(), u.getPersonnel(), u.getIdPhoto(), vo.getAccessArea() });
vo.getBzNum(), u.getPersonnel(), u.getIdPhoto(), vo.getAccessArea(),vo.getXmgkOrgId(),
vo.getXmgkOrgName(),vo.getJbUserId(),vo.getJbUserPhone(),vo.getJbUserName(),"0","1"});
}
} catch (Exception e) {
e.printStackTrace();
@ -289,8 +322,8 @@ 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)"
+ " VALUES (?, ?, ?, ?, ?, ?,?,?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ " 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(),
vo.getOrgName(), vo.getType(), applyTime, "1", "0", vo.getCheckUserId(),
@ -299,7 +332,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() });
u.getIdPhoto(), u.getIdNumber(),"0","1" });
}
} catch (Exception e) {
e.printStackTrace();
@ -333,8 +366,9 @@ public class NewCardService {
* @param vo
*/
public void pushInfo(CardVo vo) {
String title = "" + vo.getCardType() + "申请";
String text = "您好，您有新的" + vo.getCardType() + "申请需要审批，请点击查看。";
String title = vo.getTypeName()+"-" + vo.getCardType() + "申请";
String text = "您好，您有新的" + vo.getTypeName() + "-"+ vo.getCardType() + "申请需要审批，请点击查看。";
// String url = "/pages/access-card/card-record?currentTabIndex=1";
String url = "/pages/access-card/card-record";
aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url);
}
@ -378,8 +412,9 @@ public class NewCardService {
String sql = " SELECT gc.DATA_ID AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\",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.EXAMINE_PERSON_ID) AS \"checkUserId\""
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\","
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?" + " GROUP BY gc.DATA_ID";
System.err.println(sql);
parameter.add(vo.getDataId());
@ -443,7 +478,8 @@ public class NewCardService {
+ " gc.JB_USER_NAME AS \"jbUserName\",gc.JB_USER_PHONE AS \"jbUserPhone\","
+ " gc.APPLY_TYPE AS \"applyType\",gc.APPLY_TERM AS \"applyTerm\",gc.DATA_ID AS \"dataId\","
+ " gc.EXAMINE_BATCH AS \"examineBatch\",gc.EXAMINE_STATE AS \"examineState\","
+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\""
+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\","
+ " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\",gc.CARD_STATUS AS \"cardStatus\""
+ " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?";
System.err.println(sql);
parameter.add(vo.getDataId());
@ -513,7 +549,8 @@ public class NewCardService {
+ " gc.JB_USER_NAME AS \"jbUserName\",gc.JB_USER_PHONE AS \"jbUserPhone\","
+ " gc.LEND_TIME AS \"lendTime\",gc.BACK_TIME AS \"backTime\","
+ " gc.ACTUAL_BACK_TIME AS \"actualBackTime\",gc.REMARK AS \"remark\","
+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\""
+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\","
+ " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\",gc.CARD_STATUS AS \"cardStatus\""
+ " FROM GREEN_CARD gc"
+ " WHERE gc.DATA_ID = ?";
System.err.println(sql);
@ -559,8 +596,9 @@ public class NewCardService {
+ " MAX(gc.CONTRACT_START_TIME) AS \"contractStartTime\",MAX(gc.CONTRACT_END_TIME) AS \"contractEndTime\","
+ " MAX(gc.CARD_START_TIME) AS \"cardStartTime\",MAX(gc.CARD_END_TIME) AS \"cardEndTime\","
+ " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.BZ_NUM) AS \"bzNum\","
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\","
+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\""
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\","
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc"
+ " WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID";
parameter.add(vo.getDataId());
@ -615,8 +653,9 @@ public class NewCardService {
+ " MAX(gc.CONTRACT_START_TIME) AS \"contractStartTime\",MAX(gc.CONTRACT_END_TIME) AS \"contractEndTime\","
+ " MAX(gc.CARD_START_TIME) AS \"cardStartTime\",MAX(gc.CARD_END_TIME) AS \"cardEndTime\","
+ " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.CAR_NUM) AS \"carNum\",MAX(gc.TICKET_NO) AS \"ticketNo\","
+ " MAX(gc.WORK_CONTENT) AS \"workContent\","
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\""
+ " MAX(gc.WORK_CONTENT) AS \"workContent\",MAX(gc.OPER_TYPE) AS \"operType\","
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\","
+ " MAX(gc.USER_NAME) AS \"userName\",MAX(gc.CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID";
parameter.add(vo.getDataId());
dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(),
@ -745,7 +784,8 @@ public class NewCardService {
String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( "
+ " SELECT * FROM (SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\","
+ " 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(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+ " MAX(CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc "
+ " WHERE gc.USER_ID = ? GROUP BY gc.DATA_ID) B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM<=?) WHERE num > ?";
System.err.println(sql);
@ -823,15 +863,12 @@ public class NewCardService {
public RestResult auditData(CardVo vo) {
switch (vo.getCardType()) {
case "职工卡":
return auditEmployeeCard(vo);
case "第三方人员":
return auditThirdPartyPersonnelCard(vo);
return auditCard(vo);
case "VIP贵宾":
return auditVipCard(vo);
case "临时出入证":
return auditLsAndSgCard(vo);
case "施工出入证":
return auditLsAndSgCard(vo);
return auditCard2(vo);
default:
break;
}
@ -840,64 +877,21 @@ public class NewCardService {
/**
* 职工卡-审批
* @param vo
* @return
*/
@Transactional(rollbackFor = Exception.class)
public RestResult auditEmployeeCard(CardVo vo) {
try {
// 审批流程-申请人所在部门负责人审核->制卡经办人审核->制卡部门负责人审核->制卡经办人抄送
Boolean repeatAudit = isRepeatAudit(vo);
if(repeatAudit){
return new RestResult(Constant.FAILED, "请勿重复审核，刷新页面重试");
}
List<Map<String, String>> auditNodeList = getNextAuditNodeRole(vo);
vo.setDescription(auditNodeList.get(0).get("checkName"));
String examineBatch = vo.getExamineBatch();
String nextExamineBatch =String.valueOf(Integer.parseInt(examineBatch));
// 添加审核记录
addExamineData(vo);
if(Objects.equals(vo.getExamineState(), "1") && !Objects.equals(vo.getExamineBatch(), "3")){
// 1.申请人所在部门负责人审核、2.制卡经办人审核 ---> 审核通过-流转到下一审批
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
if(Objects.equals(examineBatch, "2")){ // 添加制卡经办人ID
vo.setOperCardId(vo.getUserId());
}
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(vo.getExamineBatch(), "3")){
// 3.制卡部门负责人审核 ----> 制卡部门负责人审核通过直接抄送制卡经办人审批流程结束
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("1");
List<Map<String, String>> sendUserInfos = getSendUserInfo(vo,"2");
vo.setUserId(sendUserInfos.get(0).get("userId"));
vo.setUserId(sendUserInfos.get(0).get("userName"));
vo.setDescription(auditNodeList.get(1).get("checkName"));
// 添加抄送记录
addExamineData(vo);
// 发起抄送
pushInfo2(vo);
}
// 更新办卡/办证数据
updateCardAuditData(vo);
} catch (Exception e) {
e.printStackTrace();
// 手动回滚异常
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return new RestResult(Constant.FAILED, "操作失败");
}
return new RestResult(Constant.SUCCESS, "操作成功");
}
/**
* 第三方人员-审批
* @param vo
* @return
*/
public RestResult auditThirdPartyPersonnelCard(CardVo vo) {
@Transactional(rollbackFor = Exception.class)
public RestResult auditCard(CardVo vo) {
try {
// 审批流程->项目归口管理部门负责人审核->制卡经办人审核->制卡部门负责人审核->项目归口管理部门分管领导审核->制卡经办人抄送
// 职工卡的审批流程-申请人所在部门负责人审核->制卡经办人审核->制卡部门负责人审核->制卡经办人抄送
// 第三方人员的审批流程->项目归口管理部门负责人审核->制卡经办人审核->制卡部门负责人审核->项目归口管理部门分管领导审核->制卡经办人抄送
// 判断当前登录人是否具有审核权限
Boolean isHasAuditAuth = isHasAuditAuth(vo);
if(isHasAuditAuth){
return new RestResult(Constant.FAILED, "当前登录用户无审核权限");
}
// 判断是否重复审核
Boolean repeatAudit = isRepeatAudit(vo);
if(repeatAudit){
return new RestResult(Constant.FAILED, "请勿重复审核，刷新页面重试");
@ -905,23 +899,38 @@ public class NewCardService {
List<Map<String, String>> auditNodeList = getNextAuditNodeRole(vo);
vo.setDescription(auditNodeList.get(0).get("checkName"));
String examineBatch = vo.getExamineBatch();
String nextExamineBatch =String.valueOf(Integer.parseInt(examineBatch));
String nextExamineBatch =String.valueOf(Integer.parseInt(examineBatch) + 1);
// check_operate -1.已无审核节点 0.无操作人员审核 1.代表制卡经办人审核 2.代表制卡经办人抄送
String checkOperate = auditNodeList.get(0).get("checkOperate");
String nextCheckOperate = auditNodeList.get(1).get("checkOperate");
// 添加审核记录
addExamineData(vo);
if(Objects.equals(vo.getExamineState(), "1") && !Objects.equals(vo.getExamineBatch(), "4")){
// 1.项目归口管理部门负责人审核、2.制卡经办人审核、3.制卡部门负责人审核 ---> 审核通过-流转到下一审批
if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "0")){ // 无操作人员审核->无操作人员审核
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
if(Objects.equals(examineBatch, "2")){ // 添加制卡经办人ID
vo.setOperCardId(vo.getUserId());
}
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(vo.getExamineBatch(), "4")){
// 4.项目归口管理部门分管领导审核 ----> 项目归口管理部门分管领导审核通过直接抄送制卡经办人审批流程结束
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
// 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId());
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人抄送(默认审批流程已结束)
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("1");
List<Map<String, String>> sendUserInfos = getSendUserInfo(vo,"2");
List<Map<String, String>> sendUserInfos = getSendUserInfo(vo);
vo.setUserId(sendUserInfos.get(0).get("userId"));
vo.setUserId(sendUserInfos.get(0).get("userName"));
vo.setDescription(auditNodeList.get(1).get("checkName"));
@ -929,6 +938,25 @@ public class NewCardService {
addExamineData(vo);
// 发起抄送
pushInfo2(vo);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "2")){ // 制卡经办人审核->制卡经办人抄送
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("1");
// 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId());
List<Map<String, String>> sendUserInfos = getSendUserInfo(vo);
vo.setUserId(sendUserInfos.get(0).get("userId"));
vo.setUserId(sendUserInfos.get(0).get("userName"));
vo.setDescription(auditNodeList.get(1).get("checkName"));
// 添加抄送记录
addExamineData(vo);
// 发起抄送
pushInfo2(vo);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "-1")){
// 无操作人员审核->已无审核节点(审批流程结束)
vo.setExamineState("1");
}
// 更新办卡/办证数据
updateCardAuditData(vo);
@ -946,14 +974,20 @@ public class NewCardService {
* @param vo
* @return
*/
public RestResult auditVipCard(CardVo vo) {
public RestResult auditCard2(CardVo vo) {
try {
// 审批流程->经办部门负责人审核->制卡经办人审核->制卡部门负责人审核->制卡经办人填写归还时间及备注
// VIP贵宾的审批流程->经办部门负责人审核->制卡经办人审核->制卡部门负责人审核->制卡经办人填写归还时间及备注
// 临时出入证/施工出入证的审批流程->项目归口管理部门负责人审核->制卡经办人审核->制卡部门负责人审核->制卡经办人填写证件有效期
// 判断当前登录人是否具有审核权限
Boolean isHasAuditAuth = isHasAuditAuth(vo);
if(isHasAuditAuth){
return new RestResult(Constant.FAILED, "当前登录用户无审核权限");
}
Boolean repeatAudit = isRepeatAudit(vo);
if(repeatAudit){
return new RestResult(Constant.FAILED, "请勿重复审核，刷新页面重试");
}
if(Objects.equals(vo.getExamineBatch(), "4")){
if(Objects.equals(vo.getOperType(), "2") && Objects.equals(vo.getCardType(), "VIP贵宾")){
if(StringUtils.isEmpty(vo.getActualBackTime())){
return new RestResult(Constant.FAILED, "实际归还时间不能为空");
}
@ -961,22 +995,62 @@ public class NewCardService {
return new RestResult(Constant.FAILED, "备注不能为空");
}
}
if(Objects.equals(vo.getOperType(), "2") && (Objects.equals(vo.getCardType(), "临时出入证") || Objects.equals(vo.getCardType(), "施工出入证"))){
if(StringUtils.isEmpty(vo.getCardStartTime()) || StringUtils.isEmpty(vo.getCardEndTime())){
return new RestResult(Constant.FAILED, "证件有效期不能为空");
}
}
List<Map<String, String>> auditNodeList = getNextAuditNodeRole(vo);
vo.setDescription(auditNodeList.get(0).get("checkName"));
String examineBatch = vo.getExamineBatch();
String nextExamineBatch =String.valueOf(Integer.parseInt(examineBatch));
String nextExamineBatch =String.valueOf(Integer.parseInt(examineBatch) + 1);
// check_operate -1.代表已无审核流程 0.无操作人员审核 1.代表制卡经办人审核 2.代表制卡经办人抄送
String checkOperate = auditNodeList.get(0).get("checkOperate");
String nextCheckOperate = auditNodeList.get(1).get("checkOperate");
// 添加审核记录
addExamineData(vo);
if(Objects.equals(vo.getExamineState(), "1") && !Objects.equals(vo.getExamineBatch(), "4")){
// 1.经办部门负责人审核、2.制卡经办人审核、3.制卡部门负责人审核 ---> 审核通过-流转到下一审批
if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "0")){ // 无操作人员审核->无操作人员审核
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
if(Objects.equals(examineBatch, "2")){ // 添加制卡经办人ID
vo.setOperCardId(vo.getUserId());
}
}else if(Objects.equals(vo.getExamineBatch(), "4")){
// 4.制卡经办人填写归还时间及备注
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
// 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId());
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人填写数据
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "2")){ // 制卡经办人审核->制卡经办人填写数据
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("1");
// 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId());
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "2")
&& Objects.equals(nextCheckOperate, "-1")){ // 制卡经办人填写数据->已无审核节点(审批流程结束)
vo.setExamineState("1");
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "2")
&& Objects.equals(nextCheckOperate, "0")){ // 制卡经办人填写数据->无操作人员审核(默认审批流程结束)
vo.setExamineState("1");
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "-1")){ // 无操作人员审核->已无审核节点(审批流程结束)
vo.setExamineState("1");
}
// 更新办卡/办证数据
@ -991,49 +1065,35 @@ public class NewCardService {
}
/**
* 临时出入证-审批/施工出入证-审批
* @param vo
* 判断当前用户是否具有审核权限
* @return
*/
public RestResult auditLsAndSgCard(CardVo vo) {
public Boolean isHasAuditAuth(CardVo vo){
try {
// 审批流程->项目归口管理部门负责人审核->制卡经办人审核->制卡部门负责人审核->制卡经办人填写证件有效期
Boolean repeatAudit = isRepeatAudit(vo);
if(repeatAudit){
return new RestResult(Constant.FAILED, "请勿重复审核，刷新页面重试");
}
if(Objects.equals(vo.getExamineBatch(), "4")){
if(StringUtils.isEmpty(vo.getCardStartTime()) || StringUtils.isEmpty(vo.getCardEndTime())){
return new RestResult(Constant.FAILED, "证件有效期不能为空");
if(Objects.equals(vo.getExamineBatch(), "1")){ // 第一批次审核已经指定了审核人-判断当前登录人和审核人是否一致
if(!Objects.equals(vo.getUserId(), vo.getCheckUserId())){
return true;
}
}else{
// 制卡经办人填写备注、证件有效期等操作
if(Objects.equals(vo.getOperType(), "2")){
if(!Objects.equals(vo.getUserId(), vo.getCheckUserId())){
return true;
}
}
// 其余审核批次指定角色
String sql = "SELECT COUNT(*) FROM GREEN_HOUSE_CHECK_ROLE "
+ " WHERE USER_ID = ? AND ROLE_ID = ?";
Integer result = iHibernateDao.queryForIntWithSql(sql,
new Object[] { vo.getUserId(),vo.getCheckRole()});
if(Objects.equals(result, 0)){
return true;
}
}
List<Map<String, String>> auditNodeList = getNextAuditNodeRole(vo);
vo.setDescription(auditNodeList.get(0).get("checkName"));
String examineBatch = vo.getExamineBatch();
String nextExamineBatch =String.valueOf(Integer.parseInt(examineBatch));
// 添加审核记录
addExamineData(vo);
if(Objects.equals(vo.getExamineState(), "1") && !Objects.equals(vo.getExamineBatch(), "4")){
// 1.项目归口管理部门负责人审核、2.制卡经办人审核、3.制卡部门负责人审核 ---> 审核通过-流转到下一审批
vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0");
if(Objects.equals(examineBatch, "2")){ // 添加制卡经办人ID
vo.setOperCardId(vo.getUserId());
}
}else if(Objects.equals(vo.getExamineBatch(), "4")){
// 4.制卡经办人填写证件有效期
vo.setExamineState("1");
}
// 更新办卡/办证数据
updateCardAuditData(vo);
} catch (Exception e) {
e.printStackTrace();
// 手动回滚异常
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return new RestResult(Constant.FAILED, "操作失败");
}
return new RestResult(Constant.SUCCESS, "操作成功");
return false;
}
/**
@ -1064,11 +1124,18 @@ public class NewCardService {
try {
String examineBatch = vo.getExamineBatch();
String nextExamineBatch = String.valueOf(Integer.parseInt(examineBatch) + 1);
String sql = "SELECT CHECK_ROLE AS \"checkRole\",CHECK_NAME AS \"checkName\" "
+ " FROM GREEN_HOUSE_CHECK_DETAILS "
+ " WHERE CHECK_ID = ? AND CHECK_SORT IN (?,?) ORDER BY CHECK_SORT";
String sql = "SELECT ghcd.CHECK_ROLE AS \"checkRole\",ghcd.CHECK_NAME AS \"checkName\","
+ " ghcd.CHECK_OPERATE AS \"checkOperate\",ghc.CHECK_NUM AS \"checkNum\" "
+ " FROM GREEN_HOUSE_CHECK_DETAILS ghcd"
+ " LEFT JOIN GREEN_HOUSE_CHECK ghc ON ghcd.CHECK_ID = ghc.CHECK_ID"
+ " WHERE ghcd.CHECK_ID = ? AND ghcd.CHECK_SORT IN (?,?) ORDER BY ghcd.CHECK_SORT";
List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql,
new Object[] { vo.getCheckId(),examineBatch,nextExamineBatch});
if(CollectionUtils.isNotEmpty(list) && list.size() == 1){
Map<String, String> map = new HashMap<String, String>();
map.put("checkOperate", "-1");
list.add(map);
}
return list;
} catch (Exception e) {
e.printStackTrace();
@ -1095,10 +1162,11 @@ public class NewCardService {
*/
public void updateCardAuditData(CardVo vo){
List<Object> parameter = new ArrayList<Object>();
String sql = "UPDATE GREEN_CARD SET EXAMINE_BATCH = ?,EXAMINE_STATE = ?,CHECK_ROLE = ?";
String sql = "UPDATE GREEN_CARD SET EXAMINE_BATCH = ?,EXAMINE_STATE = ?,CHECK_ROLE = ?,OPER_TYPE = ?";
parameter.add(vo.getExamineBatch());
parameter.add(vo.getExamineState());
parameter.add(vo.getCheckRole());
parameter.add(vo.getOperType());
if(StringUtils.isNotBlank(vo.getActualBackTime())){ // 实际归还时间
parameter.add(vo.getActualBackTime());
sql += ",ACTUAL_BACK_TIME = ?";
@ -1120,6 +1188,7 @@ public class NewCardService {
sql += ",OPER_CARD_ID = ?";
}
sql += " WHERE DATA_ID = ?";
parameter.add(vo.getDataId());
iHibernateDao.executeSqlUpdate(sql,parameter.toArray());
}
@ -1129,13 +1198,13 @@ public class NewCardService {
* @param examineBatch
* @return
*/
public List<Map<String, String>> getSendUserInfo(CardVo vo,String examineBatch){
public List<Map<String, String>> getSendUserInfo(CardVo vo){
try {
String sql = "SELECT USER_ID AS \"userId\",USER_NAME AS \"userName\" "
+ " FROM GREEN_CARD_EXAMINE "
+ " WHERE CARD_ID = ? AND EXAMINE_BATCH = ?";
+ " WHERE CARD_ID = ? AND USER_ID = ?";
List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql,
new Object[] { vo.getDataId(),examineBatch});
new Object[] { vo.getDataId(),vo.getUserId()});
return list;
} catch (Exception e) {
e.printStackTrace();
@ -1149,9 +1218,9 @@ public class NewCardService {
* @param vo
*/
public void pushInfo2(CardVo vo) {
String title = "" + vo.getCardType() + "申请";
String text = "您好，您有新的" + vo.getCardType() + "申请需要审批，请点击查看。";
String url = "/pages/access-card/card-record";
String title = vo.getTypeName()+"-" + vo.getCardType() + "审批通过";
String text = "您好，" +vo.getTypeName()+"-" + vo.getCardType() + "申请审批已通过，请点击查看。";
String url = "/pages/access-card/card-record?currentTabIndex=1";
aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url);
}
@ -1182,26 +1251,38 @@ public class NewCardService {
public RestResult getUnapprovedData(CardVo vo){
try {
// 获取当前登录人的角色
String currentUserRole = getCurrentUserRole(vo);
List<String> aduitRoles = getCurrentUserRole(vo);
String userId = vo.getUserId();
List<Object> parameter = new ArrayList<Object>();
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 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(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""
+ " FROM GREEN_CARD gc "
+ " WHERE (gc.EXAMINE_BATCH = '1' AND gc.EXAMINE_STATE = '0' AND gc.EXAMINE_PERSON_ID = ?) OR"
+ " (gc.EXAMINE_BATCH IN ('2','3') AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE = ?) OR"
+ " (gc.CARD_TYPE = '第三方人员' AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE = ?) OR"
+ " (gc.CARD_TYPE != '第三方人员' AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?)"
+ " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE = '2' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?) OR"
+ " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE IN ('0','1') AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE IN ("+handlePlaceholder(aduitRoles)+"))"
+ " GROUP BY gc.DATA_ID"
+ ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?";
System.err.println(sql);
Integer pageSize = vo.getPageSize();
Integer pageNum = vo.getPageNum();
Integer page = (pageNum - 1) * pageSize;
Integer limit = pageNum * pageSize;
List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql,
new Object[] { userId,currentUserRole,currentUserRole,userId, limit, page });
parameter.add(userId);
parameter.add(userId);
if(CollectionUtils.isEmpty(aduitRoles)){
parameter.add("-1");
}else{
for (int i = 0; i < aduitRoles.size(); i++) {
parameter.add(aduitRoles.get(i));
}
}
parameter.add(limit);
parameter.add(page);
List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql,parameter.toArray());
return new RestResult(Constant.SUCCESS, "查询成功", list);
} catch (Exception e) {
e.printStackTrace();
@ -1216,26 +1297,32 @@ public class NewCardService {
*/
public RestResult getApprovedData(CardVo vo){
try {
List<Object> parameter = new ArrayList<Object>();
String userId = vo.getUserId();
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 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\""
+ " FROM GREEN_CARD gc "
+ " LEFT JOIN GREEN_CARD_EXAMINE gce ON gc.ID = ghcd.CARD_ID "
+ " WHERE (gc.CARD_TYPE IN ('职工卡','第三方人员') AND gce.USER_ID = ? ) OR"
+ " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH IN ('1','2','3') AND gce.USER_ID = ? ) OR"
+ " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gce.USER_ID = '0' ) OR"
+ " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '1' AND gce.USER_ID = ? ) OR"
+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""
+ " FROM GREEN_CARD_EXAMINE gce "
+ " LEFT JOIN GREEN_CARD gc ON gc.DATA_ID = gce.CARD_ID "
+ " WHERE gce.USER_ID = ?"
// + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH IN ('1','2','3') AND gce.USER_ID = ? ) OR"
// + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gce.USER_ID = '0' ) OR"
// + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '1' AND gce.USER_ID = ? )"
+ " GROUP BY gc.DATA_ID"
+ ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?";
System.err.println(sql);
Integer pageSize = vo.getPageSize();
Integer pageNum = vo.getPageNum();
Integer page = (pageNum - 1) * pageSize;
Integer limit = pageNum * pageSize;
parameter.add(userId);
parameter.add(limit);
parameter.add(page);
List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql,
new Object[] { userId,userId,userId, limit, page });
parameter.toArray());
return new RestResult(Constant.SUCCESS, "查询成功", list);
} catch (Exception e) {
e.printStackTrace();
@ -1244,24 +1331,104 @@ public class NewCardService {
}
/**
* 查询当前登录人的角色
* 查询当前登录人的审批角色 ROLE_TYPE为3是审批角色
* @return
*/
public String getCurrentUserRole(CardVo vo){
String currentUserRole = "";
public List<String> getCurrentUserRole(CardVo vo){
List<String> dataList = new ArrayList<String>();
try {
String sql = "SELECT USER_ID AS \"userId\",ROLE_ID AS \"roleId\" "
+ " FROM GREEN_USER_ROLE_REL "
+ " WHERE USER_ID = ? AND IS_DELETED = 'N'";
String sql = "SELECT ghcr.USER_ID AS \"userId\",ghcr.ROLE_ID AS \"roleId\" "
+ " FROM GREEN_HOUSE_CHECK_ROLE ghcr"
+ " LEFT JOIN GREEN_ROLE gr ON ghcr.ROLE_ID = gr.ID AND gr.IS_DELETED = 'N'"
+ " WHERE ghcr.USER_ID = ? AND gr.IS_DELETED = 'N' AND gr.ROLE_TYPE = '3'";
List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql,
new Object[] { vo.getUserId()});
if(CollectionUtils.isNotEmpty(list)){
currentUserRole = list.get(0).get("roleId");
for (int i = 0; i < list.size(); i++) {
dataList.add(list.get(i).get("roleId"));
}
}
} catch (Exception e) {
e.printStackTrace();
}
return currentUserRole;
return dataList;
}
/**
* 查询历史填写项目
* @param vo
* @return
*/
public RestResult getHistoryPros(CardVo vo) {
try {
String sql = "SELECT DISTINCT PRO_NAME AS \"proName\""
+ " FROM GREEN_CARD WHERE PRO_NAME IS NOT NULL";
List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql);
return new RestResult(Constant.SUCCESS, "查询成功", list);
} catch (Exception e) {
e.printStackTrace();
return new RestResult(Constant.FAILED, "查询失败");
}
}
/**
* 查询当前登录人所在部门
* @param vo
* @return
*/
public List<Map<String, String>> getDeptByUser(CardVo vo) {
try {
List<Object> parameter = new ArrayList<Object>();
String sql = "SELECT ID AS \"id\",DEPARTMENT_ID AS \"departmentId\""
+ " FROM GREEN_USER_INFO WHERE ID = ? AND IS_DELETED = 'N'";
parameter.add(vo.getUserId());
List<Map<String, String>> list = iHibernateDao.queryForListWithSql(sql,parameter.toArray());
return list;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
/**
* 处理占位符
* @return
*/
public String handlePlaceholder(List<String> list){
if(CollectionUtils.isEmpty(list)){
return "?";
}
StringBuffer sb = new StringBuffer();
for (int i = 0; i < list.size(); i++) {
sb.append("?").append(",");
}
// 检查最后一个字符是否是逗号
if (sb.length() > 0 && sb.charAt(sb.length() - 1) == ',') {
// 移除最后一个字符
sb.deleteCharAt(sb.length() - 1);
}
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, "操作失败");
}
}
}

180
greenH5modul/src/com/nationalelectric/greenH5/GreenHouseController.java
View File

@ -10,6 +10,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@ -44,6 +45,7 @@ import com.aostarit.mobile.client.message.api.client.MsgSendClient;
import com.aostarit.mobile.client.message.api.config.WxMsgConfig;
import com.aostarit.mobile.client.message.api.entity.SendMsgParams;
import com.aostarit.mobile.client.message.api.entity.WxSendMsgResult;
import com.jysoft.card.entity.vo.CardVo;
/**
* 租房管理
@ -60,6 +62,9 @@ public class GreenHouseController extends GreenBaseController {
@Autowired
private BaseServiceImpl baseService;
@Resource
private AliasManageController aliasManageController;
/**
* 房屋申请列表：个人查看
@ -203,23 +208,23 @@ public class GreenHouseController extends GreenBaseController {
// sql += " ORDER BY A.APPLY_TIME DESC " + " ) rn )where rownum>? and rownum<=? ";
//查询当前人员角色id
String sql2 = "SELECT ROLE_ID as \" checkRole\" FROM GREEN_USER_ROLE_REL where USER_ID = ? ";
String sql2 = "SELECT ROLE_ID as \" checkRole\" FROM GREEN_HOUSE_CHECK_ROLE where USER_ID = ? ";
ArrayList<Object> paramList2 = new ArrayList<Object>();
paramList2.add(userId);
String roleId = "";
List<GreenRentHouseApply> list2 = hibernateDao.queryForListWithSql(sql2, paramList2.toArray(),new BeanPropertyRowMapper<GreenRentHouseApply>(GreenRentHouseApply.class));
if(list2 !=null && list2.size()>0){
GreenRentHouseApply bb = list2.get(0);
roleId = bb.getCheckRole();
//只能获取一个角色，此方法不用了
// GreenRentHouseApply bb = list2.get(0);
// roleId = bb.getCheckRole();
}else{
return new RestResult(Constant.FAILED, "未找到当前用户角色，不允许审核");
}
String examineState = rentHouseApply.getExamineState();
//0 未审批 1已审核
String sql = "";
StringBuffer sql = new StringBuffer();
if("0".equals(examineState)){
sql = "SELECT DISTINCT\n" +
sql.append("SELECT DISTINCT\n" +
"A.ID AS \"id\",\n" +
"A.USER_ID AS \"userId\",\n" +
"A.USER_NAME AS \"userName\",\n" +
@ -246,10 +251,28 @@ public class GreenHouseController extends GreenBaseController {
"GREEN_HOUSE_APPLY A\n" +
"LEFT JOIN GREEN_HOUSE_CHECK B ON A.CHECK_ID = B.CHECK_ID\n" +
"LEFT JOIN GREEN_HOUSE_CHECK_DETAILS C on C.CHECK_SORT = A.CHECK_NODE and A.CHECK_ID = C.CHECK_ID\n" +
"where A.CHECK_USER = ? ";
paramList.add(roleId);
"where 1=1 and EXAMINE_STATE !='2' and EXAMINE_STATE !='6' " );
if(list2.size() ==1){
sql.append(" AND ( A.CHECK_USER = ?");
paramList.add(list2.get(0).getCheckRole());
sql.append(" or A.CHECK_USER = ?");
paramList.add(userId);
sql.append(" )");
}else{
sql.append(" AND (A.CHECK_USER = ? ");
paramList.add(list2.get(0).getCheckRole());
for(int i=1;i<list2.size();i++){
sql.append(" OR A.CHECK_USER = ? ");
paramList.add(list2.get(i).getCheckRole());
}
sql.append(" or A.CHECK_USER = ?");
paramList.add(userId);
sql.append(" )");
}
System.err.println("paramList xize11 =="+paramList.size());
}else{
sql = " SELECT \n" +
sql.append( " SELECT \n" +
"A.ID AS \"id\",\n" +
"MAX(A.USER_ID) AS \"userId\",\n" +
"MAX(A.USER_NAME) AS \"userName\",\n" +
@ -275,19 +298,37 @@ public class GreenHouseController extends GreenBaseController {
"GREEN_HOUSE_APPLY A \n" +
"LEFT JOIN GREEN_HOUSE_CHECK B ON A.CHECK_ID = B.CHECK_ID \n" +
"LEFT JOIN GREEN_HOUSE_APPLY_EXAMINE C on C.APPLY_ID = A.ID \n" +
"where C.USER_ID = ? \n" +
"GROUP BY A.ID,A.APPLY_TIME \n" +
"ORDER BY A.APPLY_TIME ";
"where 1=1 AND C.USER_ID = ? \n");
// if(list2.size() ==1){
// sql.append(" AND C.USER_ID = ?");
// paramList.add(list2.get(0).getCheckRole());
// }else{
// sql.append(" AND (C.C.USER_ID = ? ");
// paramList.add(list2.get(0).getCheckRole());
// for(int i=1;i<list2.size();i++){
// sql.append(" OR C.USER_ID = ? ");
// paramList.add(list2.get(i).getCheckRole());
// }
// sql.append(" )");
// }
sql.append("GROUP BY A.ID,A.APPLY_TIME \n" +
"ORDER BY A.APPLY_TIME ");
paramList.add(userId);
System.err.println("paramList xize222 =="+paramList.size());
}
// paramList.add(limit);
// paramList.add(pageSize);
System.err.println("roleId==="+roleId);
System.err.println(sql);
List<GreenRentHouseApply> list = hibernateDao.queryForListWithSql(sql, paramList.toArray());
System.err.println("paramList xize33 =="+paramList.size());
for(int i=0;i<paramList.size();i++){
System.err.println("paramList xize33 =="+paramList.get(i));
}
List<GreenRentHouseApply> list = hibernateDao.queryForListWithSql(sql.toString(), paramList.toArray());
System.err.println("list==="+list.size());
return new RestResult(Constant.SUCCESS, "操作成功", list);
} catch (Exception e) {
@ -383,6 +424,7 @@ public class GreenHouseController extends GreenBaseController {
"D.CHECK_TYPE as \"unCheckType\" ,\n" +
"D.CHECK_NAME as \"unCheckName\",\n" +
"D.CHECK_OPERATE as \"unCheckOperat\" ,\n" +
"D.CHECK_SORT as \"unCheckSort\" ,\n" +
"gh.HOUSECODE as \"houseCode\" " +
"FROM\n" +
"GREEN_HOUSE_APPLY gha\n" +
@ -450,7 +492,7 @@ public class GreenHouseController extends GreenBaseController {
" FROM GREEN_HOUSE_APPLY B \n" +
" LEFT JOIN GREEN_HOUSE_APPLY_EXAMINE A on A.CHECK_ID = B.UN_CHECK_ID \n" +
" WHERE A.DEL_FLAG = 0 AND A.apply_id = ? " +
"order by A.EXAMINE_BATCH asc ";
" order by to_char(A.EXAMINE_TIME,'YYYY-MM-DD HH24:MI:SS') asc ";
List<Map<String, String>> unLists = hibernateDao.queryForListWithSql(unsql,
new Object[] { rentHouseApply.getId() });
if (unLists.size() > 0) {
@ -842,7 +884,16 @@ public class GreenHouseController extends GreenBaseController {
return new RestResult(Constant.SUCCESS, "操作成功",list);
}
/**
* 房管经办人抄送
* @param vo
*/
public void pushInfo2(CardVo vo) {
String title = "" + vo.getCardType() + "申请";
String text = "您好，您有新的" + vo.getCardType() + "申请需要抄送，请点击查看。";
String url = "/pages/house/house-examine";
aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url);
}
/**
* 房屋申请审批
@ -897,6 +948,9 @@ public class GreenHouseController extends GreenBaseController {
//判断是否退租 不是退租的情况下为null
String isLease = map.get("isLease");
//房管经办人审核id
String uId = "-1";
if(StringHelper.isEmpty(isLease)){
isLease = "1";
}else{
@ -926,12 +980,41 @@ public class GreenHouseController extends GreenBaseController {
return new RestResult(Constant.FAILED, "审核结果为 通过/不通过 无第三种情况");
}
String examSql = "SELECT A.CHECK_ID as \"checkId\" ,A.CHECK_NAME as \"checkName\",A.CHECK_NUM as \"checkNum\",\n" +
"A.PROECSS_TYPE as \"proecssType\",A.PROECSS_TYPE_NAME as \"proecssTypeName\" FROM GREEN_HOUSE_CHECK A \n" +
"WHERE A.CHECK_ID = ? ";;
List<Map<String, String>> examList = hibernateDao.queryForListWithSql(examSql, new Object[] { checkId});
if (examList !=null && examList.size() > 0) {
int checkNum = (int)Integer.valueOf(examList.get(0).get("checkNum"));
String proecssTypeName = examList.get(0).get("proecssTypeName");
int tSort = (int)Integer.valueOf(checkSort);
if((tSort +1) == checkNum){
String detailsSqlSql = "SELECT DISTINCT A.* from (\n" +
"SELECT * from GREEN_HOUSE_APPLY_EXAMINE where APPLY_ID =? \n" +
") A LEFT JOIN GREEN_HOUSE_CHECK_DETAILS B on A.BATCH_DESCRIPTION = B.CHECK_NAME\n" +
"where B.CHECK_TYPE ='1' and B.CHECK_OPERATE ='1' ";
List<Map<String, String>> detailsSqlList = hibernateDao.queryForListWithSql(detailsSqlSql, new Object[] { applyId});
if(detailsSqlList !=null && detailsSqlList.size()>0){
uId =detailsSqlList.get(0).get("USER_ID");
CardVo vo = new CardVo();
vo.setCheckUserId(uId);
vo.setCardType(proecssTypeName);
pushInfo2(vo);
}else{
return new RestResult(Constant.FAILED, "当前审核查询不到房管经办人审核信息，系统异常!");
}
}
}else{
return new RestResult(Constant.FAILED, "当前审核流程ID查询不到一应的审核流，系统异常!");
}
String batchSql = "SELECT * FROM (\n" +
"SELECT CHECK_SORT as \"checkSort\" , CHECK_ROLE as \"checkRole\" ,CHECK_NAME as \"checkName\" FROM GREEN_HOUSE_CHECK_DETAILS WHERE CHECK_ID =? AND CHECK_SORT > ? " +
") WHERE ROWNUM <2";
System.err.println("batchSql====="+batchSql);
List<Map<String, String>> list = hibernateDao.queryForListWithSql(batchSql, new Object[] { checkId,checkSort});
String nextCheckSort ="";
String nextCheckRole ="";
String nextCheckName ="" ;
@ -953,62 +1036,73 @@ public class GreenHouseController extends GreenBaseController {
if (list !=null && list.size() > 0) {
nextCheckSort = list.get(0).get("checkSort");
//nextCheckRole = list.get(0).get("checkRole");
nextCheckRole = "100061";
if("-1".equals(uId)){
nextCheckRole = list.get(0).get("checkRole");
}else{
nextCheckRole = uId;
}
//nextCheckRole = "100061";
nextCheckName = list.get(0).get("checkName");
//通过
if("1".equals(examineState)){
System.err.println("111");
//更新审批节点属性
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_BATCH = ? ,CHECK_NODE =? ,CHECK_USER = ? WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { nextCheckSort,nextCheckSort,nextCheckRole, applyId });
//房管经办人审核
if("1".equals(checkType)){
System.err.println("222");
//选房 1代表方管经办人审核，选择房源照片操作等;2代表方管经办人抄送，上传合同等数据等;默认为0
if("1".equals(checkOperate)){
//申请流程
if("1".equals(isLease)){
System.err.println("333");
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '3' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
}else{
//暂无逻辑
System.err.println("444");
}
//上传合同
}else if("2".equals(checkOperate)){
if("1".equals(isLease)){
System.err.println("555");
updateBatchSql.setLength(0);
// 上传合同-结束流程/更新租房申请状态为已租赁
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
updateBatchSql.setLength(0);
updateBatchSql.append( "INSERT INTO GREEN_HOUSE_APPLY_EXAMINE(ID,APPLY_ID,USER_ID,USER_NAME,EXAMINE_STATE,EXAMINE_OPINION,"
+ "EXAMINE_TIME,DEL_FLAG,EXAMINE_BATCH,BATCH_DESCRIPTION,CHECK_ID) "
+ "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?,?) ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { uuid, applyId, userId, userName, "1",
examineOpinion, nextCheckSort,checkName,checkId });
// updateBatchSql.setLength(0);
// updateBatchSql.append( "INSERT INTO GREEN_HOUSE_APPLY_EXAMINE(ID,APPLY_ID,USER_ID,USER_NAME,EXAMINE_STATE,EXAMINE_OPINION,"
// + "EXAMINE_TIME,DEL_FLAG,EXAMINE_BATCH,BATCH_DESCRIPTION,CHECK_ID) "
// + "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?,?) ");
// hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { uuid, applyId, userId, userName, "1",
// examineOpinion, nextCheckSort,checkName,checkId });
// 更新房屋状态为在用
updateBatchSql.setLength(0);
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 3, houseId });
}else{
//暂无逻辑
System.err.println("666");
}
}
}else{//普通审核节点审核
//暂无需实现逻辑
System.err.println("777");
}
}else{
//不通过
if("1".equals(isLease)){
System.err.println("888");
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ? WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { examineState, applyId });
}else{
System.err.println("999");
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ? WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { "6", applyId });
@ -1020,15 +1114,17 @@ public class GreenHouseController extends GreenBaseController {
//通过
if("1".equals(examineState)){
if("1".equals(checkType)){
System.err.println("aaa");
System.err.println("111111111111111 checkOperate="+checkOperate);
//选房 1代表方管经办人审核，选择房源照片操作等;2代表方管经办人抄送，上传合同等数据等;默认为0
if("1".equals(checkOperate)){
if("1".equals(isLease)){
System.err.println("222222222222");
System.err.println("bbb");
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7',CHECK_USER = 0, CHECK_NODE = 0 WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
}else{
System.err.println("ccc");
//退租通过
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '5' WHERE ID = ? ");
@ -1038,7 +1134,7 @@ public class GreenHouseController extends GreenBaseController {
//上传合同
}else if("2".equals(checkOperate)){
if("1".equals(isLease)){
System.err.println("3333333333333");
System.err.println("ddd");
updateBatchSql.setLength(0);
// 上传合同-结束流程/更新租房申请状态为已租赁
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7',CHECK_USER = 0, CHECK_NODE = 0 WHERE ID = ? ");
@ -1054,6 +1150,7 @@ public class GreenHouseController extends GreenBaseController {
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 3, houseId });
}else{
System.err.println("eee");
//退租通过
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '5' WHERE ID = ? ");
@ -1067,18 +1164,27 @@ public class GreenHouseController extends GreenBaseController {
//更新审批节点属性
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_BATCH = ? ,CHECK_NODE =? ,CHECK_USER = ? WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { nextCheckSort,nextCheckSort,nextCheckRole, applyId });
System.err.println("4444444444");
System.err.println("fff");
}else{
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_BATCH = ? ,CHECK_NODE =? ,CHECK_USER = ? ,EXAMINE_STATE = '5' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { nextCheckSort,nextCheckSort,nextCheckRole, applyId });
System.err.println("4444444444");
System.err.println("ggg");
}
}
}else{
//退租不通过
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '6' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
//不通过
if("1".equals(isLease)){
System.err.println("hhh");
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '2' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
}else{
System.err.println("iii");
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '6' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
}
}
}
@ -1511,13 +1617,13 @@ public class GreenHouseController extends GreenBaseController {
String updateHosueStateSql = "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ";
hibernateDao.executeSqlUpdate(updateHosueStateSql, new Object[] { "1", houseId });
// 更新租房退租验收项目
String updateBatchSql = "UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ?,CHECK_OUT_DATE = ?,CHECK_OUT_PHOTO = ?,"
String updateBatchSql = "UPDATE GREEN_HOUSE_APPLY SET CHECK_OUT_DATE = ?,CHECK_OUT_PHOTO = ?,"
+ " PROPERTY_PHOTO = ?,WATER_VALUE_NOW = ?,POWER_VALUE_NOW = ?,"
+ " GAS_VALUE_NOW = ?,WATER_SETTLE_PHOTO = ?,POWER_SETTLE_PHOTO = ?,"
+ " GAS_SETTLE_PHOTO = ?,CHECK_DEVICE_LIST = ?,DEPOSIT_BACK = ?,IS_DEDUCTION = ?,DEDUCTION_REASON = ?"
+ " WHERE ID = ? ";
hibernateDao.executeSqlUpdate(updateBatchSql,
new Object[] { status, checkOutDate, checkOutPhoto, propertyPhoto, waterValueNow, powerValueNow,
new Object[] { checkOutDate, checkOutPhoto, propertyPhoto, waterValueNow, powerValueNow,
gasValueNow, waterSettlePhoto, powerSettlePhoto, gasSettlePhoto, checkDeviceList,
depositBack, isDeduction, deductionReason, applyId });
} else { // 提交退租申请

27
greenH5modul/src/com/nationalelectric/greenH5/GreenMainInterfaceController.java
View File

@ -3461,6 +3461,33 @@ public class GreenMainInterfaceController {
ObjectMapper objectMapper = new ObjectMapper();
CardVo vo = objectMapper.readValue(dataStr, CardVo.class);
return newCardController.getAuditData(vo);
}else if ("greenNewCard/getHistoryPros".equals(method)) {
if (Utils.list.contains("greenNewCard/getHistoryPros" + checkTime)) {
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
} else {
Utils.list.add("greenNewCard/getHistoryPros" + checkTime);
}
ObjectMapper objectMapper = new ObjectMapper();
CardVo vo = objectMapper.readValue(dataStr, CardVo.class);
return newCardController.getHistoryPros(vo);
}else if ("greenNewCard/getAuditCheckUser2".equals(method)) {
if (Utils.list.contains("greenNewCard/getAuditCheckUser2" + checkTime)) {
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
} else {
Utils.list.add("greenNewCard/getAuditCheckUser2" + checkTime);
}
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);
}