From 5d167ea6e943dd1574e0e6ed70ff25b8d4830f61 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 16 六月 2022 11:47:49 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/bmo/customReport/ReportInfoAwnerData.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/customReport/ReportInfoAwnerData.java b/service-report/src/main/java/com/java110/report/bmo/customReport/ReportInfoAwnerData.java
index 265b4c7..cc69f24 100644
--- a/service-report/src/main/java/com/java110/report/bmo/customReport/ReportInfoAwnerData.java
+++ b/service-report/src/main/java/com/java110/report/bmo/customReport/ReportInfoAwnerData.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.db.dao.IQueryServiceDAO;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.apache.commons.lang.StringUtils;
import java.util.*;
@@ -75,14 +76,20 @@
JSONObject paramOut = new JSONObject();
List sqlParams = new ArrayList();
- String sql = "select rrs.`name` '涓婃姤椤圭洰',t.person_name '濮撳悕',t.tel '鐢佃瘽',t.id_card '韬唤璇佸彿',rist.title,riav.value_content\n" +
- "from report_info_answer t\n" +
- "left join report_info_setting rrs on t.setting_id = rrs.setting_id and rrs.status_cd = '0'\n" +
- "left join report_info_answer_value riav on t.user_an_id = riav.user_an_id and riav.status_cd = '0'\n" +
- "LEFT JOIN report_info_setting_title rist on riav.title_id = rist.title_id and rist.status_cd = '0'\n" +
- "where t.status_cd = '0'\n" +
- "and t.create_time > ?\n" +
- "and t.create_time < ?\n";
+ String sql = "select rrs.`name` '涓婃姤椤圭洰',t.person_name '濮撳悕',t.tel '鐢佃瘽',t.id_card '韬唤璇佸彿',DATE_FORMAT(t.create_time,'%Y-%m-%d %H:%i:%s') '涓婃姤鏃堕棿',rist.title,riav.value_content,\n" +
+ "\t\t\t\t\t\t\t\t\n" +
+ "\t\t\t\t\t\t\t\t\t(select '涓氫富' from building_owner bo where bo.link = t.tel and bo.status_cd = '0' and bo.community_id = t.community_id limit 1) '涓氫富'\n" +
+ "\t\t\t\t\t\t\t\t,\n" +
+ "\t\t\t\t\t\t\t\t\t(select '鍛樺伐' from u_user u \n" +
+ "\t\t\t\t\t\t\t\tinner join s_store_user su on u.user_id = su.user_id and su.status_cd = '0'\n" +
+ "\t\t\t\t\t\t\t\t\twhere u.tel = t.tel limit 1) '鍛樺伐'\n" +
+ " from report_info_answer t\n" +
+ " left join report_info_setting rrs on t.setting_id = rrs.setting_id and rrs.status_cd = '0'\n" +
+ " left join report_info_answer_value riav on t.user_an_id = riav.user_an_id and riav.status_cd = '0'\n" +
+ " LEFT JOIN report_info_setting_title rist on riav.title_id = rist.title_id and rist.status_cd = '0'\n" +
+ " where t.status_cd = '0'\n" +
+ " and t.create_time > ?\n" +
+ " and t.create_time < ?";
if (params.containsKey("startTime") && !StringUtils.isEmpty(params.getString("startTime"))) {
sqlParams.add(params.get("startTime"));
sqlParams.add(params.get("endTime"));
@@ -101,6 +108,12 @@
sql += "and t.`person_name` like CONCAT('%',?,'%') \n";
sqlParams.add(params.get("personName"));
}
+ if (params.containsKey("projectName") && !StringUtils.isEmpty(params.getString("projectName"))) {
+ sql += "and rrs.`name` like CONCAT('%',?,'%') \n";
+ sqlParams.add(params.get("projectName"));
+ }
+
+ sql += " order by t.create_time desc \n";
List datas = queryServiceDAOImpl.executeSql(sql, sqlParams.toArray());
@@ -123,6 +136,14 @@
td.put("濮撳悕", dataObj.get("濮撳悕"));
td.put("鐢佃瘽", dataObj.get("鐢佃瘽"));
td.put("韬唤璇佸彿", dataObj.get("韬唤璇佸彿"));
+ td.put("涓婃姤鏃堕棿", dataObj.get("涓婃姤鏃堕棿"));
+ if(!StringUtil.isNullOrNone(dataObj.get("涓氫富"))){
+ td.put("韬唤", "涓氫富");
+ }else if(!StringUtil.isNullOrNone(dataObj.get("鍛樺伐"))){
+ td.put("韬唤", "鍛樺伐");
+ }else{
+ td.put("韬唤", "璁垮");
+ }
tds.add(td);
}
td.put(dataObj.get("title").toString(), dataObj.get("value_content"));
--
Gitblit v1.8.0