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

jsk 租房修改

This commit is contained in:
skjia 2025-03-21 01:17:37 +08:00
parent 88677813b0
commit 59e769549e
2 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ public class GreenHouseController extends GreenBaseController {
//0 未审批 1已审核
StringBuffer sql = new StringBuffer();
if("0".equals(examineState)){
sql.append("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" +
@ -318,17 +318,24 @@ public class GreenHouseController extends GreenBaseController {
paramList.add(userId);
System.err.println("paramList xize222 =="+paramList.size());
}
// paramList.add(limit);
// paramList.add(pageSize);
paramList.add(pageSize);
paramList.add(limit);
System.err.println("================================");
StringBuffer sqld = new StringBuffer();
sqld.append("SELECT * FROM (SELECT AA.*,ROWNUM num FROM ( ");
sqld.append(sql);
sqld.append(" ) AA )where num <=? and num > ? ");
System.err.println(sqld);
System.err.println(sql);
System.err.println("================================");
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());
List<GreenRentHouseApply> list = hibernateDao.queryForListWithSql(sqld.toString(), paramList.toArray());
System.err.println("list==="+list.size());
return new RestResult(Constant.SUCCESS, "操作成功", list);
} catch (Exception e) {
@ -425,7 +432,7 @@ public class GreenHouseController extends GreenBaseController {
"D.CHECK_NAME as \"unCheckName\",\n" +
"D.CHECK_OPERATE as \"unCheckOperat\" ,\n" +
"D.CHECK_SORT as \"unCheckSort\" ,\n" +
"gh.HOUSECODE as \"houseCode\" " +
"gh.HOUSE_CODE as \"houseCode\" " +
"FROM\n" +
"GREEN_HOUSE_APPLY gha\n" +
"LEFT JOIN GREEN_HOUSE_SELECTED ghs ON ghs.APPLY_ID = gha.ID \n" +
@ -1101,6 +1108,11 @@ public class GreenHouseController extends GreenBaseController {
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = ? WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { examineState, applyId });
if(StringUtils.isNotEmpty(houseId)){
updateBatchSql.setLength(0);
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 1, houseId });
}
}else{
System.err.println("999");
updateBatchSql.setLength(0);
@ -1129,6 +1141,11 @@ public class GreenHouseController extends GreenBaseController {
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '5' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
if(StringUtils.isNotEmpty(houseId)){
updateBatchSql.setLength(0);
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 1, houseId });
}
}
//上传合同
@ -1155,6 +1172,11 @@ public class GreenHouseController extends GreenBaseController {
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '5' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
if(StringUtils.isNotEmpty(houseId)){
updateBatchSql.setLength(0);
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 1, houseId });
}
}
}
@ -1178,11 +1200,21 @@ public class GreenHouseController extends GreenBaseController {
updateBatchSql.setLength(0);
updateBatchSql.append("UPDATE GREEN_HOUSE_APPLY SET EXAMINE_STATE = '2' WHERE ID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { applyId });
if(StringUtils.isNotEmpty(houseId)){
updateBatchSql.setLength(0);
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 1, houseId });
}
}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 });
if(StringUtils.isNotEmpty(houseId)){
updateBatchSql.setLength(0);
updateBatchSql.append( "UPDATE GREEN_HOUSE SET STATUS = ? WHERE UUID = ? ");
hibernateDao.executeSqlUpdate(updateBatchSql.toString(), new Object[] { 1, houseId });
}
}
}
@ -1724,6 +1756,7 @@ public class GreenHouseController extends GreenBaseController {
}
int pageNum = Integer.parseInt(String.valueOf(map.get("pageNum")));
int pageSize = Integer.parseInt(String.valueOf(map.get("pageSize")));
String keyWord=String.valueOf(map.get("keyWord"));
int limit = ((pageNum > 0 ? pageNum : 1) - 1) * pageSize;
pageSize = pageSize * pageNum;
@ -1735,7 +1768,7 @@ public class GreenHouseController extends GreenBaseController {
+ "H.AMOUNT,H.AIR, P.PIC from GREEN_HOUSE H LEFT JOIN ( "
+ "SELECT HOUSE_ID, LISTAGG (to_char(PICTURE), ',') WITHIN GROUP (ORDER BY SORT) AS PIC "
+ "FROM GREEN_HOUSE_PICTURE GROUP BY HOUSE_ID ) P ON H.UUID = P.HOUSE_ID WHERE H.IS_DELETED='N' "
+ "AND HOUSE_TYPE = ? AND STATUS = 1 "
+ "AND HOUSE_TYPE = ? AND STATUS = 1 and H.HOUSE_NAME like '%"+keyWord+"%' "
+ "order by H.GMT_CREATED DESC )rn ) WHERE rw > ? AND rw <= ? ";
List<Map<String, Object>> list = hibernateDao.queryForListWithSql(sql,

23
greenH5modul/src/com/nationalelectric/greenH5/po/GreenImageInfo.java
View File

@ -2,6 +2,7 @@ package com.nationalelectric.greenH5.po;
import org.hibernate.validator.constraints.NotBlank;
import java.net.InetAddress;
import java.sql.Blob;
import java.util.Date;
@ -15,7 +16,17 @@ public class GreenImageInfo implements java.io.Serializable {
* 序列化
*/
private static final long serialVersionUID = 1L;
public GreenImageInfo(){
String serverIP="";
try{
InetAddress ip = InetAddress.getLocalHost();
serverIP= ip.getHostAddress();
System.out.println("Server IP: " + serverIP);
} catch (Exception e) {
e.printStackTrace();
}
this.serverAddr=serverIP;
}
/**
@ -65,6 +76,9 @@ public class GreenImageInfo implements java.io.Serializable {
private String imageStatus;
@NotBlank(message="不能为空")
private String serverAddr;
public String getImageName() {
@ -147,4 +161,11 @@ public class GreenImageInfo implements java.io.Serializable {
this.imageContentBlob = imageContentBlob;
}
public String getServerAddr() {
return serverAddr;
}
public void setServerAddr(String serverAddr) {
this.serverAddr = serverAddr;
}
}