Merge branch 'main' of http://192.168.0.75:3000/bonus/hz-zhhq-app-service
This commit is contained in:
commit
6e44920549
|
|
@ -249,32 +249,35 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
"where A.CHECK_USER = ? ";
|
"where A.CHECK_USER = ? ";
|
||||||
paramList.add(roleId);
|
paramList.add(roleId);
|
||||||
}else{
|
}else{
|
||||||
sql = "SELECT\n" +
|
sql = " SELECT \n" +
|
||||||
"A.ID AS \"id\",\n" +
|
"A.ID AS \"id\",\n" +
|
||||||
"A.USER_ID AS \"userId\",\n" +
|
"MAX(A.USER_ID) AS \"userId\",\n" +
|
||||||
"A.USER_NAME AS \"userName\",\n" +
|
"MAX(A.USER_NAME) AS \"userName\",\n" +
|
||||||
"A.GENDER AS \"gender\",\n" +
|
"MAX(A.GENDER) AS \"gender\",\n" +
|
||||||
"A.MARRIAGE_STATE AS \"marriageState\",\n" +
|
"MAX(A.MARRIAGE_STATE) AS \"marriageState\",\n" +
|
||||||
"A.PHONE AS \"phone\",\n" +
|
"MAX(A.PHONE) AS \"phone\",\n" +
|
||||||
"A.ORG_ID AS \"orgId\",\n" +
|
"MAX(A.ORG_ID) AS \"orgId\",\n" +
|
||||||
"A.ORG_NAME AS \"orgName\",\n" +
|
"MAX(A.ORG_NAME) AS \"orgName\",\n" +
|
||||||
"A.POSITION AS \"position\",\n" +
|
"MAX(A.POSITION) AS \"position\",\n" +
|
||||||
"A.USER_TYPE AS \"userType\",\n" +
|
"MAX(A.USER_TYPE) AS \"userType\",\n" +
|
||||||
"A.HOUSE_TYPE AS \"houseType\",\n" +
|
"MAX(A.HOUSE_TYPE) AS \"houseType\",\n" +
|
||||||
"A.APPLY_CAUSE AS \"applyCause\",\n" +
|
"MAX(A.APPLY_CAUSE )AS \"applyCause\",\n" +
|
||||||
"to_char( A.APPLY_TIME, 'YYYY-MM-DD HH24:MI:SS' ) AS \"applyTime\",\n" +
|
"MAX(to_char( A.APPLY_TIME, 'YYYY-MM-DD HH24:MI:SS' )) AS \"applyTime\",\n" +
|
||||||
"A.EXAMINE_STATE AS \"examineState\",\n" +
|
"MAX(A.EXAMINE_STATE) AS \"examineState\",\n" +
|
||||||
"A.EXAMINE_BATCH AS \"examineBatch\",\n" +
|
"MAX(A.EXAMINE_BATCH) AS \"examineBatch\",\n" +
|
||||||
"A.IS_UPLOAD AS \"isUpload\",\n" +
|
"MAX(A.IS_UPLOAD) AS \"isUpload\",\n" +
|
||||||
"A.CHECK_ID,\n" +
|
"MAX(A.CHECK_ID) as CHECK_ID,\n" +
|
||||||
"A.CHECK_NODE,\n" +
|
"MAX(A.CHECK_NODE) as CHECK_NODE,\n" +
|
||||||
"B.CHECK_NUM,\n" +
|
"MAX(B.CHECK_NUM) as CHECK_NUM,\n" +
|
||||||
"A.CHECK_USER\n" +
|
"MAX(A.CHECK_USER) as CHECK_USER,\n" +
|
||||||
"FROM\n" +
|
"A.APPLY_TIME as APPLY_TIME \n" +
|
||||||
"GREEN_HOUSE_APPLY A\n" +
|
"FROM \n" +
|
||||||
"LEFT JOIN GREEN_HOUSE_CHECK B ON A.CHECK_ID = B.CHECK_ID\n" +
|
"GREEN_HOUSE_APPLY A \n" +
|
||||||
"LEFT JOIN GREEN_HOUSE_APPLY_EXAMINE B on B.APPLY_ID = A.ID\n" +
|
"LEFT JOIN GREEN_HOUSE_CHECK B ON A.CHECK_ID = B.CHECK_ID \n" +
|
||||||
"where B.USER_ID = ? ";
|
"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 ";
|
||||||
paramList.add(userId);
|
paramList.add(userId);
|
||||||
}
|
}
|
||||||
// paramList.add(limit);
|
// paramList.add(limit);
|
||||||
|
|
@ -376,11 +379,16 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
"C.CHECK_TYPE as \"checkType\",\n" +
|
"C.CHECK_TYPE as \"checkType\",\n" +
|
||||||
"C.CHECK_NAME as \"checkName\",\n" +
|
"C.CHECK_NAME as \"checkName\",\n" +
|
||||||
"C.CHECK_OPERATE as \"checkOperat\" ,\n" +
|
"C.CHECK_OPERATE as \"checkOperat\" ,\n" +
|
||||||
|
"gha.UN_CHECK_ID as \"unCheckId\" ,\n" +
|
||||||
|
"D.CHECK_TYPE as \"unCheckType\" ,\n" +
|
||||||
|
"D.CHECK_NAME as \"unCheckName\",\n" +
|
||||||
|
"D.CHECK_OPERATE as \"unCheckOperat\" ,\n" +
|
||||||
"gh.HOUSECODE as \"houseCode\" " +
|
"gh.HOUSECODE as \"houseCode\" " +
|
||||||
"FROM\n" +
|
"FROM\n" +
|
||||||
"GREEN_HOUSE_APPLY gha\n" +
|
"GREEN_HOUSE_APPLY gha\n" +
|
||||||
"LEFT JOIN GREEN_HOUSE_SELECTED ghs ON ghs.APPLY_ID = gha.ID \n" +
|
"LEFT JOIN GREEN_HOUSE_SELECTED ghs ON ghs.APPLY_ID = gha.ID \n" +
|
||||||
"LEFT JOIN GREEN_HOUSE_CHECK_DETAILS C on C.CHECK_SORT = gha.CHECK_NODE and gha.CHECK_ID = C.CHECK_ID\n" +
|
"LEFT JOIN GREEN_HOUSE_CHECK_DETAILS C on C.CHECK_SORT = gha.CHECK_NODE and gha.CHECK_ID = C.CHECK_ID " +
|
||||||
|
"LEFT JOIN GREEN_HOUSE_CHECK_DETAILS D on D.CHECK_SORT = gha.CHECK_NODE and gha.UN_CHECK_ID = D.CHECK_ID " +
|
||||||
"LEFT JOIN GREEN_HOUSE gh on gh.UUID = ghs.HOUSE_ID " +
|
"LEFT JOIN GREEN_HOUSE gh on gh.UUID = ghs.HOUSE_ID " +
|
||||||
"WHERE\n" +
|
"WHERE\n" +
|
||||||
"gha.DEL_FLAG = 0 \n" +
|
"gha.DEL_FLAG = 0 \n" +
|
||||||
|
|
@ -422,14 +430,34 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
}
|
}
|
||||||
// 获取审核详情
|
// 获取审核详情
|
||||||
if (list.size() > 0) {
|
if (list.size() > 0) {
|
||||||
String sqls = "SELECT EXAMINE_STATE as \"examineState\", to_char(EXAMINE_TIME,'YYYY-MM-DD HH24:MI:SS') as \"examineTime\","
|
// String sqls = "SELECT EXAMINE_STATE as \"examineState\", to_char(EXAMINE_TIME,'YYYY-MM-DD HH24:MI:SS') as \"examineTime\","
|
||||||
+ " EXAMINE_OPINION as \"examineOpinion\",EXAMINE_BATCH as \"examineBatch\",BATCH_DESCRIPTION as \"batchDescription\" "
|
// + " EXAMINE_OPINION as \"examineOpinion\",EXAMINE_BATCH as \"examineBatch\",BATCH_DESCRIPTION as \"batchDescription\" "
|
||||||
+ " FROM GREEN_HOUSE_APPLY_EXAMINE WHERE DEL_FLAG = 0 AND apply_id = ? order by EXAMINE_BATCH asc ";
|
// + " FROM GREEN_HOUSE_APPLY_EXAMINE WHERE DEL_FLAG = 0 AND apply_id = ? order by EXAMINE_BATCH asc ";
|
||||||
|
String sqls = "SELECT DISTINCT A.EXAMINE_STATE as \"examineState\", to_char(A.EXAMINE_TIME,'YYYY-MM-DD HH24:MI:SS') as \"examineTime\",\n" +
|
||||||
|
" A.EXAMINE_OPINION as \"examineOpinion\",A.EXAMINE_BATCH as \"examineBatch\",A.BATCH_DESCRIPTION as \"batchDescription\" \n" +
|
||||||
|
" FROM GREEN_HOUSE_APPLY B \n" +
|
||||||
|
" LEFT JOIN GREEN_HOUSE_APPLY_EXAMINE A on A.CHECK_ID = B.CHECK_ID \n" +
|
||||||
|
" WHERE A.DEL_FLAG = 0 AND A.apply_id = ? " +
|
||||||
|
"order by A.EXAMINE_BATCH asc ";
|
||||||
List<Map<String, String>> lists = hibernateDao.queryForListWithSql(sqls,
|
List<Map<String, String>> lists = hibernateDao.queryForListWithSql(sqls,
|
||||||
new Object[] { rentHouseApply.getId() });
|
new Object[] { rentHouseApply.getId() });
|
||||||
if (lists.size() > 0) {
|
if (lists.size() > 0) {
|
||||||
list.get(0).put("detail", lists.toArray());
|
list.get(0).put("detail", lists.toArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String unsql = "SELECT DISTINCT A.EXAMINE_STATE as \"examineState\", to_char(A.EXAMINE_TIME,'YYYY-MM-DD HH24:MI:SS') as \"examineTime\",\n" +
|
||||||
|
" A.EXAMINE_OPINION as \"examineOpinion\",A.EXAMINE_BATCH as \"examineBatch\",A.BATCH_DESCRIPTION as \"batchDescription\" \n" +
|
||||||
|
" 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 ";
|
||||||
|
List<Map<String, String>> unLists = hibernateDao.queryForListWithSql(unsql,
|
||||||
|
new Object[] { rentHouseApply.getId() });
|
||||||
|
if (unLists.size() > 0) {
|
||||||
|
list.get(0).put("unDetail", unLists.toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
return new RestResult(Constant.SUCCESS, "操作成功", list);
|
return new RestResult(Constant.SUCCESS, "操作成功", list);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
@ -867,6 +895,14 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
//流程名称
|
//流程名称
|
||||||
String checkName = map.get("checkName");
|
String checkName = map.get("checkName");
|
||||||
|
|
||||||
|
//判断是否退租 不是退租的情况下为null
|
||||||
|
String isLease = map.get("isLease");
|
||||||
|
if(StringHelper.isEmpty(isLease)){
|
||||||
|
isLease = "1";
|
||||||
|
}else{
|
||||||
|
isLease = "2";
|
||||||
|
}
|
||||||
|
|
||||||
if(("2".equals(checkType) && "2".equals(checkOperate)) || ("2".equals(checkType) && "1".equals(checkOperate))){
|
if(("2".equals(checkType) && "2".equals(checkOperate)) || ("2".equals(checkType) && "1".equals(checkOperate))){
|
||||||
return new RestResult(Constant.FAILED, "审核类型与所需操作互斥,请求驳回");
|
return new RestResult(Constant.FAILED, "审核类型与所需操作互斥,请求驳回");
|
||||||
}
|
}
|
||||||
|
|
@ -929,26 +965,37 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
if("1".equals(checkType)){
|
if("1".equals(checkType)){
|
||||||
//选房 1代表方管经办人审核,选择房源照片操作等;2代表方管经办人抄送,上传合同等数据等;默认为0
|
//选房 1代表方管经办人审核,选择房源照片操作等;2代表方管经办人抄送,上传合同等数据等;默认为0
|
||||||
if("1".equals(checkOperate)){
|
if("1".equals(checkOperate)){
|
||||||
updateBatchSql.setLength(0);
|
//申请流程
|
||||||
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '3' WHERE ID = ? ");
|
if("1".equals(isLease)){
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
updateBatchSql.setLength(0);
|
||||||
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '3' WHERE ID = ? ");
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
||||||
|
}else{
|
||||||
|
//暂无逻辑
|
||||||
|
|
||||||
|
}
|
||||||
//上传合同
|
//上传合同
|
||||||
}else if("2".equals(checkOperate)){
|
}else if("2".equals(checkOperate)){
|
||||||
updateBatchSql.setLength(0);
|
if("1".equals(isLease)){
|
||||||
// 上传合同-结束流程/更新租房申请状态为已租赁
|
updateBatchSql.setLength(0);
|
||||||
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7' WHERE ID = ? ");
|
// 上传合同-结束流程/更新租房申请状态为已租赁
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7' WHERE ID = ? ");
|
||||||
updateBatchSql.setLength(0);
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
||||||
updateBatchSql.append( "INSERT INTO GREEN_HOUSE_APPLY_EXAMINE(ID,APPLY_ID,USER_ID,USER_NAME,EXAMINE_STATE,EXAMINE_OPINION,"
|
updateBatchSql.setLength(0);
|
||||||
+ "EXAMINE_TIME,DEL_FLAG,EXAMINE_BATCH,BATCH_DESCRIPTION) "
|
updateBatchSql.append( "INSERT INTO GREEN_HOUSE_APPLY_EXAMINE(ID,APPLY_ID,USER_ID,USER_NAME,EXAMINE_STATE,EXAMINE_OPINION,"
|
||||||
+ "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?) ");
|
+ "EXAMINE_TIME,DEL_FLAG,EXAMINE_BATCH,BATCH_DESCRIPTION,CHECK_ID) "
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { uuid, applyId, userId, userName, "1",
|
+ "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?,?) ");
|
||||||
examineOpinion, nextCheckSort,checkName });
|
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 = ? ");
|
updateBatchSql.setLength(0);
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 3, houseId });
|
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 3, houseId });
|
||||||
|
}else{
|
||||||
|
//暂无逻辑
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}else{//普通审核节点审核
|
}else{//普通审核节点审核
|
||||||
//暂无需实现逻辑
|
//暂无需实现逻辑
|
||||||
|
|
@ -957,52 +1004,89 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
//不通过
|
//不通过
|
||||||
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ? WHERE ID = ? ");
|
if("1".equals(isLease)){
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { examineState, applyId });
|
updateBatchSql.setLength(0);
|
||||||
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ? WHERE ID = ? ");
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { examineState, applyId });
|
||||||
|
}else{
|
||||||
|
updateBatchSql.setLength(0);
|
||||||
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ? WHERE ID = ? ");
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { "6", applyId });
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
if("1".equals(checkType)){
|
//通过
|
||||||
System.err.println("111111111111111 checkOperate="+checkOperate);
|
if("1".equals(examineState)){
|
||||||
//选房 1代表方管经办人审核,选择房源照片操作等;2代表方管经办人抄送,上传合同等数据等;默认为0
|
if("1".equals(checkType)){
|
||||||
if("1".equals(checkOperate)){
|
System.err.println("111111111111111 checkOperate="+checkOperate);
|
||||||
System.err.println("222222222222");
|
//选房 1代表方管经办人审核,选择房源照片操作等;2代表方管经办人抄送,上传合同等数据等;默认为0
|
||||||
updateBatchSql.setLength(0);
|
if("1".equals(checkOperate)){
|
||||||
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '3' WHERE ID = ? ");
|
if("1".equals(isLease)){
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
System.err.println("222222222222");
|
||||||
//上传合同
|
updateBatchSql.setLength(0);
|
||||||
}else if("2".equals(checkOperate)){
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7',CHECK_USER = 0, CHECK_NODE = 0 WHERE ID = ? ");
|
||||||
System.err.println("3333333333333");
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
||||||
updateBatchSql.setLength(0);
|
}else{
|
||||||
// 上传合同-结束流程/更新租房申请状态为已租赁
|
//退租通过
|
||||||
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '7',CHECK_USER = 0, CHECK_NODE = 0 WHERE ID = ? ");
|
updateBatchSql.setLength(0);
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '5' WHERE ID = ? ");
|
||||||
// updateBatchSql.setLength(0);
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
||||||
// 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) "
|
|
||||||
// + "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?) ");
|
|
||||||
// hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { uuid, applyId, userId, userName, "1",
|
|
||||||
// examineOpinion, nextCheckSort,checkName });
|
|
||||||
// 更新房屋状态为在用
|
|
||||||
updateBatchSql.setLength(0);
|
|
||||||
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
|
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 3, houseId });
|
|
||||||
}
|
|
||||||
|
|
||||||
|
//上传合同
|
||||||
|
}else if("2".equals(checkOperate)){
|
||||||
|
if("1".equals(isLease)){
|
||||||
|
System.err.println("3333333333333");
|
||||||
|
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 });
|
||||||
|
// 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) "
|
||||||
|
// + "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?) ");
|
||||||
|
// hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { uuid, applyId, userId, userName, "1",
|
||||||
|
// examineOpinion, nextCheckSort,checkName });
|
||||||
|
// 更新房屋状态为在用
|
||||||
|
updateBatchSql.setLength(0);
|
||||||
|
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 3, houseId });
|
||||||
|
}else{
|
||||||
|
//退租通过
|
||||||
|
updateBatchSql.setLength(0);
|
||||||
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '5' WHERE ID = ? ");
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}else{
|
||||||
|
if("1".equals(isLease)){
|
||||||
|
//更新审批节点属性
|
||||||
|
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");
|
||||||
|
}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");
|
||||||
|
}
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
//更新审批节点属性
|
//退租不通过
|
||||||
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_BATCH = ? ,CHECK_NODE =? ,CHECK_USER = ? WHERE ID = ? ");
|
updateBatchSql.setLength(0);
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { nextCheckSort,nextCheckSort,nextCheckRole, applyId });
|
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '6' WHERE ID = ? ");
|
||||||
System.err.println("4444444444");
|
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String sql = "INSERT INTO GREEN_HOUSE_APPLY_EXAMINE(ID,APPLY_ID,USER_ID,USER_NAME,EXAMINE_STATE,EXAMINE_OPINION,"
|
String sql = "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) " + "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?) ";
|
+ "EXAMINE_TIME,DEL_FLAG,EXAMINE_BATCH,BATCH_DESCRIPTION,CHECK_ID) " + "VALUES(?,?,?,?,?,?,SYSDATE,0,?,?,?) ";
|
||||||
hibernateDao.executeSqlUpdate(sql, new Object[] { uuid, applyId, userId, userName, examineState,
|
hibernateDao.executeSqlUpdate(sql, new Object[] { uuid, applyId, userId, userName, examineState,
|
||||||
examineOpinion, checkSort, checkName });
|
examineOpinion, checkSort, checkName,checkId });
|
||||||
|
|
||||||
|
|
||||||
return new RestResult(Constant.SUCCESS, "操作成功");
|
return new RestResult(Constant.SUCCESS, "操作成功");
|
||||||
|
|
@ -1448,8 +1532,9 @@ public class GreenHouseController extends GreenBaseController {
|
||||||
if(list !=null && list.size()>0){
|
if(list !=null && list.size()>0){
|
||||||
String checkId = list.get(0).getCheckId();
|
String checkId = list.get(0).getCheckId();
|
||||||
String checkSort = list.get(0).getCheckSort();
|
String checkSort = list.get(0).getCheckSort();
|
||||||
String updateBatchSql = "UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ?,UN_CHECK_ID = ?,CHECK_SORT = ?,CHECK_NODE = ? WHERE ID = ? ";
|
String checkRole = list.get(0).getCheckRole();
|
||||||
hibernateDao.executeSqlUpdate(updateBatchSql, new Object[] { status, checkId,checkSort,"1",applyId });
|
String updateBatchSql = "UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ?,UN_CHECK_ID = ?,CHECK_USER = ?,CHECK_NODE = ? WHERE ID = ? ";
|
||||||
|
hibernateDao.executeSqlUpdate(updateBatchSql, new Object[] { status, checkId,checkRole,"1",applyId });
|
||||||
}else{
|
}else{
|
||||||
return new RestResult(Constant.FAILED, "未配置退租相关审核流程,请添加后再提交退租", map);
|
return new RestResult(Constant.FAILED, "未配置退租相关审核流程,请添加后再提交退租", map);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,161 @@
|
||||||
|
package com.nationalelectric.greenH5.po;
|
||||||
|
|
||||||
|
public class GreenHouseCheckInfo {
|
||||||
|
|
||||||
|
//审核流程唯一标识
|
||||||
|
private String checkId;
|
||||||
|
|
||||||
|
//审核流程名称
|
||||||
|
private String checkName;
|
||||||
|
|
||||||
|
//审核流程总节点数
|
||||||
|
private String checkNum;
|
||||||
|
|
||||||
|
//流程类型1租房申请;2退租申请;3办卡;4办证
|
||||||
|
private String proecssType;
|
||||||
|
|
||||||
|
//审核详细唯一标识
|
||||||
|
private String checkDetailsId;
|
||||||
|
|
||||||
|
//审核详细名称
|
||||||
|
private String checkDetailsName;
|
||||||
|
|
||||||
|
//流程类型 1房管经办人审核 2选择人员审核
|
||||||
|
private String checkType;
|
||||||
|
|
||||||
|
//流程顺序
|
||||||
|
private String checkSort;
|
||||||
|
|
||||||
|
//1代表方管经办人审核,选择房源照片操作等;2代表方管经办人抄送,上传合同等数据等;默认为0
|
||||||
|
private String checkoperate;
|
||||||
|
|
||||||
|
//备用参数 无意义
|
||||||
|
private String kerWord;
|
||||||
|
|
||||||
|
private String userId;
|
||||||
|
|
||||||
|
private String userName;
|
||||||
|
|
||||||
|
private String checkRole;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public String getCheckRole() {
|
||||||
|
return checkRole;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckRole(String checkRole) {
|
||||||
|
this.checkRole = checkRole;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUserName() {
|
||||||
|
return userName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserName(String userName) {
|
||||||
|
this.userName = userName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUserId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserId(String userId) {
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckId() {
|
||||||
|
return checkId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckId(String checkId) {
|
||||||
|
this.checkId = checkId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckName() {
|
||||||
|
return checkName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckName(String checkName) {
|
||||||
|
this.checkName = checkName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckNum() {
|
||||||
|
return checkNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckNum(String checkNum) {
|
||||||
|
this.checkNum = checkNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getProecssType() {
|
||||||
|
return proecssType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProecssType(String proecssType) {
|
||||||
|
this.proecssType = proecssType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckDetailsId() {
|
||||||
|
return checkDetailsId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckDetailsId(String checkDetailsId) {
|
||||||
|
this.checkDetailsId = checkDetailsId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckDetailsName() {
|
||||||
|
return checkDetailsName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckDetailsName(String checkDetailsName) {
|
||||||
|
this.checkDetailsName = checkDetailsName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckType() {
|
||||||
|
return checkType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckType(String checkType) {
|
||||||
|
this.checkType = checkType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckSort() {
|
||||||
|
return checkSort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckSort(String checkSort) {
|
||||||
|
this.checkSort = checkSort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCheckoperate() {
|
||||||
|
return checkoperate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckoperate(String checkoperate) {
|
||||||
|
this.checkoperate = checkoperate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getKerWord() {
|
||||||
|
return kerWord;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setKerWord(String kerWord) {
|
||||||
|
this.kerWord = kerWord;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "GreenHouseCheckInfo [checkId=" + checkId + ", checkName=" + checkName + ", checkNum=" + checkNum
|
||||||
|
+ ", proecssType=" + proecssType + ", checkDetailsId=" + checkDetailsId + ", checkDetailsName="
|
||||||
|
+ checkDetailsName + ", checkType=" + checkType + ", checkSort=" + checkSort + ", checkoperate="
|
||||||
|
+ checkoperate + ", kerWord=" + kerWord + ", userId=" + userId + ", userName=" + userName
|
||||||
|
+ ", checkRole=" + checkRole + "]";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue