租房模块申请审核
This commit is contained in:
parent
219b57fe86
commit
fcd2a34512
|
|
@ -521,7 +521,7 @@ public class CardService {
|
|||
*/
|
||||
public RestResult getCardType(GreenCard entity) {
|
||||
String sql = "SELECT ID,DATA_TYPE ,DATA_CODE,DATA_VALUE,DESCRIPTION,DATA_SORT,CREATOR,MODIFIER,IS_DELETED "
|
||||
+ "FROM GREEN_DICTIONARY_INFO WHERE DATA_TYPE ='cardType' AND DATA_CODE = ?";
|
||||
+ "FROM GREEN_DICTIONARY_INFO WHERE DATA_TYPE ='cardType' AND DATA_CODE = ? AND IS_DELETED = 'N' ORDER BY DATA_VALUE";
|
||||
try {
|
||||
List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql, new Object[] { entity.getType() });
|
||||
return new RestResult(Constant.SUCCESS, "查询成功", list);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -72,6 +72,7 @@ import com.nationalelectric.greenH5.po.GreenGeneralInspecton;
|
|||
import com.nationalelectric.greenH5.po.GreenGrantAuth;
|
||||
import com.nationalelectric.greenH5.po.GreenHaircutComment;
|
||||
import com.nationalelectric.greenH5.po.GreenHaircutInfo;
|
||||
import com.nationalelectric.greenH5.po.GreenHouseCheckInfo;
|
||||
import com.nationalelectric.greenH5.po.GreenInfoGrather;
|
||||
import com.nationalelectric.greenH5.po.GreenLicenseplateApproval;
|
||||
import com.nationalelectric.greenH5.po.GreenMinorItem;
|
||||
|
|
@ -2727,7 +2728,16 @@ public class GreenMainInterfaceController {
|
|||
GreenRentHouseApply greenRentHouseApply = (GreenRentHouseApply) JSONObject.toBean(data,
|
||||
GreenRentHouseApply.class);
|
||||
return greenHouseController.apply(greenRentHouseApply);
|
||||
} else if ("greenHouse/examine".equals(method)) {
|
||||
}else if("greenHouse/getCheckDetailsByCheckIdAndDetailsSort".equals(method)){
|
||||
if (Utils.list.contains("greenHouse/getCheckDetailsByCheckIdAndDetailsSort" + checkTime)) {
|
||||
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
|
||||
} else {
|
||||
Utils.list.add("greenHouse/getCheckDetailsByCheckIdAndDetailsSort" + checkTime);
|
||||
}
|
||||
GreenHouseCheckInfo greenHouseCheckInfo = (GreenHouseCheckInfo) JSONObject.toBean(data,
|
||||
GreenHouseCheckInfo.class);
|
||||
return greenHouseController.getCheckDetailsByCheckIdAndDetailsSort(greenHouseCheckInfo);
|
||||
}else if ("greenHouse/examine".equals(method)) {
|
||||
if (Utils.list.contains("greenHouse/examine" + checkTime)) {
|
||||
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
|
||||
} else {
|
||||
|
|
@ -2735,6 +2745,26 @@ public class GreenMainInterfaceController {
|
|||
}
|
||||
Map<String, String> map = (Map<String, String>) JSONObject.toBean(data, Map.class);
|
||||
return greenHouseController.examine(map);
|
||||
}else if ("greenHouse/getPersonIdByUserId".equals(method)) {
|
||||
if (Utils.list.contains("greenHouse/getPersonIdByUserId" + checkTime)) {
|
||||
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
|
||||
} else {
|
||||
Utils.list.add("greenHouse/getPersonIdByUserId" + checkTime);
|
||||
}
|
||||
Map<String, String> map = (Map<String, String>) JSONObject.toBean(data, Map.class);
|
||||
GreenHouseCheckInfo greenHouseCheckInfo = (GreenHouseCheckInfo) JSONObject.toBean(data,
|
||||
GreenHouseCheckInfo.class);
|
||||
return greenHouseController.getPersonIdByRoleId(greenHouseCheckInfo);
|
||||
}else if ("greenHouse/getCheckNodeByThisNodeAndCheckId".equals(method)) {
|
||||
if (Utils.list.contains("greenHouse/getCheckNodeByThisNodeAndCheckId" + checkTime)) {
|
||||
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
|
||||
} else {
|
||||
Utils.list.add("greenHouse/getCheckNodeByThisNodeAndCheckId" + checkTime);
|
||||
}
|
||||
Map<String, String> map = (Map<String, String>) JSONObject.toBean(data, Map.class);
|
||||
GreenHouseCheckInfo greenHouseCheckInfo = (GreenHouseCheckInfo) JSONObject.toBean(data,
|
||||
GreenHouseCheckInfo.class);
|
||||
return greenHouseController.getCheckNodeByThisNodeAndCheckId(greenHouseCheckInfo);
|
||||
} else if ("greenHouse/addSelectedHouse".equals(method)) {
|
||||
if (Utils.list.contains("greenHouse/addSelectedHouse" + checkTime)) {
|
||||
return new RestResult(Constant.FAILED, "您的请求存在异常！请重新请求...");
|
||||
|
|
|
|||
|
|
@ -138,6 +138,8 @@ public class GreenWeekMenuController extends GreenBaseController {
|
|||
}
|
||||
System.err.println("2");
|
||||
ArrayList<Object> paramList = new ArrayList<Object>();
|
||||
System.out.println("DateTimeHelper.getWeek()="+DateTimeHelper.getWeek());
|
||||
System.out.println("DateTimeHelper.getNowYear()="+DateTimeHelper.getNowYear());
|
||||
paramList.add(DateTimeHelper.getWeek());
|
||||
paramList.add(DateTimeHelper.getNowYear());
|
||||
paramList.add(String.valueOf(map.get("foodType")));
|
||||
|
|
@ -147,6 +149,13 @@ public class GreenWeekMenuController extends GreenBaseController {
|
|||
sql.append(
|
||||
"SELECT gwc.ID,gwc.WEEKS,gwc.YEAR,gwc.DAY,gwc.TIME,gwc.FOOD_ID,gwc.FOOD_TYPE,gwk.FOOD_NAME,gwk.PICTURE,gwk.NUTRITIVE_VALUE FROM GREEN_WEEK_COOKBOOK gwc LEFT JOIN GREEN_WEEK_KINDS gwk ON gwk.ID = gwc.FOOD_ID WHERE gwc.WEEKS =? AND gwc.YEAR = ? AND gwc.FOOD_TYPE = ? ");
|
||||
List<Map<String, Object>> labelList = hibernateDao.queryForListWithSql(sql.toString(), paramList.toArray());
|
||||
System.err.print(labelList.size());
|
||||
for(int i=0;i<labelList.size();i++){
|
||||
Map<String, Object> listMap = labelList.get(i);
|
||||
for (String key : listMap.keySet()) {
|
||||
System.out.println(key + " = " + listMap.get(key));
|
||||
}
|
||||
}
|
||||
data.put("one", getMap("1", labelList));
|
||||
data.put("two", getMap("2", labelList));
|
||||
data.put("three", getMap("3", labelList));
|
||||
|
|
|
|||
|
|
@ -96,9 +96,122 @@ public class GreenRentHouseApply {
|
|||
|
||||
private String contractState;
|
||||
|
||||
//审核流程id
|
||||
private String checkId;
|
||||
//审核节点
|
||||
private String checkNode;
|
||||
//下节点审核人
|
||||
private String checkUser;
|
||||
|
||||
private String checkNum;
|
||||
|
||||
//1代表方管经办人审核，选择房源照片操作等;2代表方管经办人抄送，上传合同等数据等;默认为0
|
||||
private String checkOperate;
|
||||
//流程类型 1房管经办人审核 2选择人员审核
|
||||
private String checkType;
|
||||
//流程类型1租房申请;2退租申请;3办卡;4办证
|
||||
private String proecssType;
|
||||
|
||||
private String checkRole;
|
||||
|
||||
private String checkName;
|
||||
|
||||
private String idCardImg;
|
||||
private String attachment;
|
||||
|
||||
private int pageNum;
|
||||
private int pageSize;
|
||||
|
||||
|
||||
public String getIdCardImg() {
|
||||
return idCardImg;
|
||||
}
|
||||
|
||||
public void setIdCardImg(String idCardImg) {
|
||||
this.idCardImg = idCardImg;
|
||||
}
|
||||
|
||||
public String getAttachment() {
|
||||
return attachment;
|
||||
}
|
||||
|
||||
public void setAttachment(String attachment) {
|
||||
this.attachment = attachment;
|
||||
}
|
||||
|
||||
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 getCheckOperate() {
|
||||
return checkOperate;
|
||||
}
|
||||
|
||||
public void setCheckOperate(String checkOperate) {
|
||||
this.checkOperate = checkOperate;
|
||||
}
|
||||
|
||||
public String getCheckRole() {
|
||||
return checkRole;
|
||||
}
|
||||
|
||||
public void setCheckRole(String checkRole) {
|
||||
this.checkRole = checkRole;
|
||||
}
|
||||
|
||||
|
||||
public String getCheckType() {
|
||||
return checkType;
|
||||
}
|
||||
|
||||
public void setCheckType(String checkType) {
|
||||
this.checkType = checkType;
|
||||
}
|
||||
|
||||
public String getProecssType() {
|
||||
return proecssType;
|
||||
}
|
||||
|
||||
public void setProecssType(String proecssType) {
|
||||
this.proecssType = proecssType;
|
||||
}
|
||||
|
||||
public String getCheckId() {
|
||||
return checkId;
|
||||
}
|
||||
|
||||
public void setCheckId(String checkId) {
|
||||
this.checkId = checkId;
|
||||
}
|
||||
|
||||
public String getCheckNode() {
|
||||
return checkNode;
|
||||
}
|
||||
|
||||
public void setCheckNode(String checkNode) {
|
||||
this.checkNode = checkNode;
|
||||
}
|
||||
|
||||
public String getCheckUser() {
|
||||
return checkUser;
|
||||
}
|
||||
|
||||
public void setCheckUser(String checkUser) {
|
||||
this.checkUser = checkUser;
|
||||
}
|
||||
|
||||
/**
|
||||
* 房查照片
|
||||
*/
|
||||
|
|
@ -324,6 +437,4 @@ public class GreenRentHouseApply {
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -538,4 +538,22 @@ public class GreenUserInfo implements java.io.Serializable {
|
|||
public void main (String args[]){
|
||||
System.out.println(URLEncoder.encode("http://192.168.1.154:9000/greenH5/greenH5modul/rest/mainInterface/login"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "GreenUserInfo [id=" + id + ", loginName=" + loginName + ", userPossword=" + userPossword + ", realName="
|
||||
+ realName + ", mobile=" + mobile + ", email=" + email + ", unicode=" + unicode + ", departmentId="
|
||||
+ departmentId + ", departmentName=" + departmentName + ", ownerLocation=" + ownerLocation + ", orgId="
|
||||
+ orgId + ", orgName=" + orgName + ", title=" + title + ", userStatus=" + userStatus
|
||||
+ ", startUsefulLife=" + startUsefulLife + ", endUsefulLife=" + endUsefulLife + ", birthday=" + birthday
|
||||
+ ", idCard=" + idCard + ", mealStatus=" + mealStatus + ", mealNo=" + mealNo + ", compony=" + compony
|
||||
+ ", remark=" + remark + ", creator=" + creator + ", modifier=" + modifier + ", gmtCreated="
|
||||
+ gmtCreated + ", gmtModified=" + gmtModified + ", isDeleted=" + isDeleted + ", wxOpenId=" + wxOpenId
|
||||
+ ", wxProfile=" + wxProfile + ", gender=" + gender + ", isInner=" + isInner + ", facePic1=" + facePic1
|
||||
+ ", facePic1Data=" + facePic1Data + ", identityAuth=" + identityAuth + ", userLevel=" + userLevel
|
||||
+ ", className=" + className + ", vCode=" + vCode + ", codeKey=" + codeKey + ", deptTextUrl="
|
||||
+ deptTextUrl + ", deptIdUrl=" + deptIdUrl + ", leader=" + leader + "]";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue