#weaver-njpmsreport-3# 处理知识分享列表数据展示不全及不用代码屏蔽

devlop
shilei 11 months ago
parent c2efeac85b
commit 29267cfc45

@ -34,7 +34,7 @@ import java.util.Map;
public class ProjectDownloadController {
//日志
private final Logger log = LoggerFactory.getLogger(ProjectColumnsController.class);
private final Logger log = LoggerFactory.getLogger(ProjectDownloadController.class);
@Autowired
private ColumnsUtils columnsUtils;
@ -47,73 +47,73 @@ public class ProjectDownloadController {
public String jtjname = "第三集团军";
public String qiyuesuoid = "9081413488803384317";
@GetMapping(value = "/excledownload",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@WeaPermission(publicPermission = true)
public void downloadExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
String otherid = CommonUtils.null2String(request.getParameter("otherid")).trim();
if(StringUtils.isBlank(otherid)){
otherid = permissionEmployee;
}
String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();
String xm_xmjl = CommonUtils.null2String(request.getParameter("xmjl")).trim();
String xm_bm = CommonUtils.null2String(request.getParameter("bm")).trim();
String xm_jg = CommonUtils.null2String(request.getParameter("jg")).trim();
String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
Long employeeId = UserContext.getCurrentEmployeeId();
log.info("downloadExcel----employeeId:"+employeeId);
String employee_id = CommonUtils.null2String(employeeId);
SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
String userid = CommonUtils.null2String(employee.getUserId());
log.info("downloadExcel----userid:"+userid);
String subcompanyids = "" ;
if(otherid.contains(employee_id)){
subcompanyids = columnsUtils.getEmployeeByProjectTeam4Other(jtjname,qiyuesuoid,employee_id,tenant_key);
}else{
subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
}
log.info("downloadExcel----2222:"+employee_id);
List<Map<String,Object>> recordList = new ArrayList<Map<String,Object>>();
log.info("downloadExcel----recordList:" + recordList.size());
String name = "第三集团军知识分享报表.xlsx";
String sheetName = "知识分享报表" ;
// 1.创建一个工作簿。
SXSSFWorkbook workbook = new SXSSFWorkbook();
// 2.创建一个工作表
Sheet sheet = workbook.createSheet(sheetName);
// 3.创建行。
List<Map<String,String>> headList = columnsUtils.getExcelHead();
Row headRow = sheet.createRow(0);
for (int i = 0; i < headList.size(); i++) {
Map<String,String> headData = headList.get(i);
Cell cell = headRow.createCell(i);
cell.setCellValue(headData.get("name"));
}
if(StringUtils.isNotBlank(subcompanyids)) {
String baseSql = columnsUtils.queryProjectSql(subcompanyids, xm_mc, xm_xmjl, xm_bm, xm_id, xm_jg, xm_ysrq_start, xm_ysrq_end);
columnsUtils.queryProjectListByExcel(baseSql, tenant_key,jtjname,headList,sheet);
}
response.reset();
response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(name, "UTF-8"));
response.setContentType("application/vnd.ms-excel");
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
OutputStream output = response.getOutputStream();
workbook.write(output);
output.flush();
output.close();
workbook.dispose();
}
// @GetMapping(value = "/excledownload",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
// @WeaPermission(publicPermission = true)
// public void downloadExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
//
// String otherid = CommonUtils.null2String(request.getParameter("otherid")).trim();
// if(StringUtils.isBlank(otherid)){
// otherid = permissionEmployee;
// }
// String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
// String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();
// String xm_xmjl = CommonUtils.null2String(request.getParameter("xmjl")).trim();
// String xm_bm = CommonUtils.null2String(request.getParameter("bm")).trim();
// String xm_jg = CommonUtils.null2String(request.getParameter("jg")).trim();
// String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
// String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
//
// Long employeeId = UserContext.getCurrentEmployeeId();
// log.info("downloadExcel----employeeId:"+employeeId);
// String employee_id = CommonUtils.null2String(employeeId);
//
// SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
// String userid = CommonUtils.null2String(employee.getUserId());
// log.info("downloadExcel----userid:"+userid);
//
// String subcompanyids = "" ;
// if(otherid.contains(employee_id)){
// subcompanyids = columnsUtils.getEmployeeByProjectTeam4Other(jtjname,qiyuesuoid,tenant_key);
// }else{
// subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
// }
// log.info("downloadExcel----2222:"+employee_id);
// List<Map<String,Object>> recordList = new ArrayList<Map<String,Object>>();
//
// log.info("downloadExcel----recordList:" + recordList.size());
// String name = "第三集团军知识分享报表.xlsx";
// String sheetName = "知识分享报表" ;
// // 1.创建一个工作簿。
// SXSSFWorkbook workbook = new SXSSFWorkbook();
// // 2.创建一个工作表
// Sheet sheet = workbook.createSheet(sheetName);
// // 3.创建行。
// List<Map<String,String>> headList = columnsUtils.getExcelHead();
//
//
// Row headRow = sheet.createRow(0);
// for (int i = 0; i < headList.size(); i++) {
// Map<String,String> headData = headList.get(i);
// Cell cell = headRow.createCell(i);
// cell.setCellValue(headData.get("name"));
// }
//
// if(StringUtils.isNotBlank(subcompanyids)) {
// String baseSql = columnsUtils.queryProjectSql();
// columnsUtils.queryProjectListByExcel(baseSql, tenant_key,jtjname,headList,sheet,subcompanyids, xm_mc, xm_xmjl, xm_bm, xm_id, xm_jg, xm_ysrq_start, xm_ysrq_end);
// }
//
// response.reset();
// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(name, "UTF-8"));
// response.setContentType("application/vnd.ms-excel");
// response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
//
// OutputStream output = response.getOutputStream();
// workbook.write(output);
// output.flush();
// output.close();
// workbook.dispose();
// }
// @ApiOperation(notes = "文件下载", value = "文件下载")
@ -281,29 +281,23 @@ public class ProjectDownloadController {
String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
int pageNo = CommonUtils.getIntValue(request.getParameter("pageNo"),1);
int pageSize = CommonUtils.getIntValue(request.getParameter("pageSize"),20);
Long employeeId = UserContext.getCurrentEmployeeId();
log.info("downloadExcel----employeeId:"+employeeId);
String employee_id = CommonUtils.null2String(employeeId);
SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
String userid = CommonUtils.null2String(employee.getUserId());
log.info("downloadExcel----userid:"+userid);
// SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
// String userid = CommonUtils.null2String(employee.getUserId());
String subcompanyids = "" ;
if(otherid.contains(employee_id)){
subcompanyids = columnsUtils.getEmployeeByProjectTeam4Other(jtjname,qiyuesuoid,employee_id,tenant_key);
subcompanyids = columnsUtils.getEmployeeByProjectTeam4Other(jtjname,qiyuesuoid,tenant_key);
}else{
subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
}
log.info("downloadExcel----2222:"+employee_id);
List<Map<String,Object>> recordList = new ArrayList<Map<String,Object>>();
// List<Map<String,Object>> recordList = new ArrayList<Map<String,Object>>();
log.info("downloadExcel----recordList:" + recordList.size());
String name = "第三集团军知识分享报表.xlsx";
String sheetName = "知识分享报表" ;
// 1.创建一个工作簿。
@ -313,7 +307,6 @@ public class ProjectDownloadController {
// 3.创建行。
List<Map<String,String>> headList = columnsUtils.getExcelHead();
Row headRow = sheet.createRow(0);
for (int i = 0; i < headList.size(); i++) {
Map<String,String> headData = headList.get(i);
@ -322,8 +315,8 @@ public class ProjectDownloadController {
}
if(StringUtils.isNotBlank(subcompanyids)) {
String baseSql = columnsUtils.queryProjectSql(subcompanyids, xm_mc, xm_xmjl, xm_bm, xm_id, xm_jg, xm_ysrq_start, xm_ysrq_end);
columnsUtils.queryProjectListByExcel2(baseSql, tenant_key,jtjname,headList,sheet,pageNo,pageSize);
String baseSql = columnsUtils.queryProjectSql();
columnsUtils.queryProjectListByExcel2(baseSql,tenant_key,jtjname,headList,sheet,pageNo,pageSize,subcompanyids,xm_mc, xm_xmjl, xm_bm, xm_id, xm_jg, xm_ysrq_start, xm_ysrq_end);
}
response.reset();
@ -344,82 +337,82 @@ public class ProjectDownloadController {
* @param request
* @return
*/
@GetMapping("/getProjectListCount")
@WeaPermission(publicPermission = true)
public WeaResult<Object> getProjectListCount(HttpServletRequest request){
String otherid = CommonUtils.null2String(request.getParameter("otherid")).trim();
if(StringUtils.isBlank(otherid)){
otherid = permissionEmployee;
}
String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();
String xm_xmjl = CommonUtils.null2String(request.getParameter("xmjl")).trim();
String xm_bm = CommonUtils.null2String(request.getParameter("bm")).trim();
String xm_jg = CommonUtils.null2String(request.getParameter("jg")).trim();
String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
Long employeeId = UserContext.getCurrentEmployeeId();
log.info("downloadExcel----employeeId:"+employeeId);
String employee_id = CommonUtils.null2String(employeeId);
SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
String userid = CommonUtils.null2String(employee.getUserId());
log.info("downloadExcel----userid:"+userid);
String subcompanyids = "" ;
if(otherid.contains(employee_id)){
subcompanyids = columnsUtils.getEmployeeByProjectTeam4Other(jtjname,qiyuesuoid,employee_id,tenant_key);
}else{
subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
}
log.info("downloadExcel----2222:"+employee_id);
List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
int count = 0;
if(StringUtils.isNotBlank(subcompanyids)) {
String baseSql = columnsUtils.queryProjectSql(subcompanyids, xm_mc, xm_xmjl, xm_bm, xm_id, xm_jg, xm_ysrq_start, xm_ysrq_end);
count = columnsUtils.getProjectListCount(baseSql);
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("count",count);
return WeaResult.success(data);
}
@GetMapping("/getprojectlist")
@WeaPermission(publicPermission = true)
public WeaResult<Object> getprojectlist(HttpServletRequest request){
int pageNo = CommonUtils.getIntValue(request.getParameter("pageNo"),1);
int pageSize = CommonUtils.getIntValue(request.getParameter("pageSize"),20);
String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();
String xm_xmjl = CommonUtils.null2String(request.getParameter("xmjl")).trim();
String xm_bm = CommonUtils.null2String(request.getParameter("bm")).trim();
String xm_jg = CommonUtils.null2String(request.getParameter("jg")).trim();
String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
Long employeeId = UserContext.getCurrentEmployeeId();
String employee_id = CommonUtils.null2String(employeeId);
SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
String userid = CommonUtils.null2String(employee.getUserId());
Map<String, Object> data = new HashMap<String, Object>();
log.info("queryprojectlistdata3----:"+userid);
String subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
String baseSql = columnsUtils.queryProjectSql(subcompanyids,xm_mc,xm_xmjl,xm_bm,xm_id,xm_jg,xm_ysrq_start,xm_ysrq_end);
int total = columnsUtils.queryProjectCount(baseSql);
// @GetMapping("/getProjectListCount")
// @WeaPermission(publicPermission = true)
// public WeaResult<Object> getProjectListCount(HttpServletRequest request){
//
// String otherid = CommonUtils.null2String(request.getParameter("otherid")).trim();
// if(StringUtils.isBlank(otherid)){
// otherid = permissionEmployee;
// }
// String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
// String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();
// String xm_xmjl = CommonUtils.null2String(request.getParameter("xmjl")).trim();
// String xm_bm = CommonUtils.null2String(request.getParameter("bm")).trim();
// String xm_jg = CommonUtils.null2String(request.getParameter("jg")).trim();
// String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
// String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
//
// Long employeeId = UserContext.getCurrentEmployeeId();
// log.info("downloadExcel----employeeId:"+employeeId);
// String employee_id = CommonUtils.null2String(employeeId);
//
// SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
// String userid = CommonUtils.null2String(employee.getUserId());
// log.info("downloadExcel----userid:"+userid);
//
// String subcompanyids = "" ;
// if(otherid.contains(employee_id)){
// subcompanyids = columnsUtils.getEmployeeByProjectTeam4Other(jtjname,qiyuesuoid,tenant_key);
// }else{
// subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
// }
// log.info("downloadExcel----2222:"+employee_id);
// List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
// int count = 0;
// if(StringUtils.isNotBlank(subcompanyids)) {
// String baseSql = columnsUtils.queryProjectSql(subcompanyids, xm_mc, xm_xmjl, xm_bm, xm_id, xm_jg, xm_ysrq_start, xm_ysrq_end);
// count = columnsUtils.getProjectListCount(baseSql);
// }
// Map<String, Object> data = new HashMap<String, Object>();
// data.put("count",count);
// return WeaResult.success(data);
// }
data.put("count", total);
return WeaResult.success(data);
}
// @GetMapping("/getprojectlist")
// @WeaPermission(publicPermission = true)
// public WeaResult<Object> getprojectlist(HttpServletRequest request){
//
// int pageNo = CommonUtils.getIntValue(request.getParameter("pageNo"),1);
// int pageSize = CommonUtils.getIntValue(request.getParameter("pageSize"),20);
//
// String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
// String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();
// String xm_xmjl = CommonUtils.null2String(request.getParameter("xmjl")).trim();
// String xm_bm = CommonUtils.null2String(request.getParameter("bm")).trim();
// String xm_jg = CommonUtils.null2String(request.getParameter("jg")).trim();
// String xm_ysrq_start = CommonUtils.null2String(request.getParameter("ysrq_start")).trim();
// String xm_ysrq_end = CommonUtils.null2String(request.getParameter("ysrq_end")).trim();
//
// Long employeeId = UserContext.getCurrentEmployeeId();
// String employee_id = CommonUtils.null2String(employeeId);
// SimpleEmployee employee = hrmCommonEmployeeService.getEmployeeById(employeeId, tenant_key);
// String userid = CommonUtils.null2String(employee.getUserId());
//
// Map<String, Object> data = new HashMap<String, Object>();
// log.info("queryprojectlistdata3----:"+userid);
//
// String subcompanyids = columnsUtils.getEmployeeByProjectTeam(jtjname,qiyuesuoid,employee_id,tenant_key);
//
// String baseSql = columnsUtils.queryProjectSql(subcompanyids,xm_mc,xm_xmjl,xm_bm,xm_id,xm_jg,xm_ysrq_start,xm_ysrq_end);
//
// int total = columnsUtils.queryProjectCount(baseSql);
//
// data.put("count", total);
// return WeaResult.success(data);
//
// }
}

@ -1,118 +0,0 @@
package com.weaver.seconddev.njprojectreport.test;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Month;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
public class test1 {
// public static void main(String[] args) {
//// int count = 200;
//// int size = 30;
//// System.out.println((int)Math.ceil(count/(size*1.0)));
//
// LocalDate currentDate = LocalDate.now();
// LocalDate lastMonthDate = currentDate.minusMonths(1);
//
// LocalDate firstDay = lastMonthDate.with(TemporalAdjusters.firstDayOfMonth());
// // 获取当前月的最后一天
// LocalDate lastDay = lastMonthDate.with(TemporalAdjusters.lastDayOfMonth());
//
// // System.out.println(lastMonthDate.getMonth().toString());
//
// System.out.println("firstDay" + firstDay.toString());
// System.out.println("lastDay" + lastDay.toString());
//
// }
// public static void main(String[] args) {
//
// Calendar calendar = Calendar.getInstance();
// int year = calendar.get(Calendar.YEAR);
// int dayOfYear = 1 ;
//
// LocalDate localDate = LocalDate.now();
// int year1 = localDate.getYear() ;
// System.out.println("year1 " + year1);
//
// for(int i=0;i<=12;i++){
// LocalDate previousMonth = localDate.minusMonths(i);
// String startDay = previousMonth.with(TemporalAdjusters.lastDayOfMonth()).toString();
// String endDay = previousMonth.with(TemporalAdjusters.firstDayOfMonth()).toString();
// System.out.println("startDay:"+startDay);
// System.out.println("endDay:"+endDay);
// }
//
// for (int i = 1; i <= 12; i++) {
// Month month = Month.of(i);
// LocalDate firstDayOfMonth = YearMonth.of(year, month).atDay(dayOfYear); // 计算当前月份的首日
// LocalDate lastDayOfMonth = YearMonth.of(year, month).atEndOfMonth(); // 计算当前月份的最后一天
// String yearMonth = "";
// if(i<10){
// yearMonth = year+"-0"+i ;
// }else{
// yearMonth = year+"-"+i ;
// }
//
// System.out.println("月份 " + yearMonth + ":");
// System.out.println("开始日期: " + firstDayOfMonth);
// System.out.println("结束日期: " + lastDayOfMonth);
// System.out.println("\n");
// }
//
//
// List<String> dataList = new ArrayList<String>();
// dataList.add("1");
// dataList.add("2");
// dataList.add("3");
// dataList.add("4");
// System.out.println(dataList.subList(0,2).toString());
//
// }
// public static void main(String[] args) {
//
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//
// Calendar calendar = Calendar.getInstance();
// for(int i=0;i<12;i++){
// calendar.set(Calendar.MONTH, i);
// String dat = sdf.format(calendar.getTime());
// System.out.println("dat:"+dat);
//
//
// }
// }
public static void main(String[] args) {
// Calendar calendar = Calendar.getInstance();
// int year = calendar.get(Calendar.YEAR);
//
// calendar.set(Calendar.MONTH,calendar.getActualMaximum(Calendar.MONTH));
// calendar.set(Calendar.DAY_OF_MONTH,calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
// Date currYearLast = calendar.getTime();
// String lastDayOfYear = new SimpleDateFormat("yyyy-MM-dd").format(currYearLast)+" 23:59:59";
// System.out.println("本年度的最后一天: " + lastDayOfYear);
LocalDate today = LocalDate.now(); // 获取当前日期
LocalDate tenDaysBefore = today.minusDays(30); // 当前日期前10天
System.out.println("10天前的日期是: " + tenDaysBefore.toString());
}
}

@ -1,10 +1,13 @@
package com.weaver.seconddev.njprojectreport.util;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -15,16 +18,28 @@ public class RequestUtil {
@Autowired
private DatabaseUtils databaseUtils;
public Map<String,Object> getmainlinename(String mainlineid, String tenant_key){
public Map<String,Object> getmainlinename(String mainlineid, String tenantKey){
Map<String,Object> recordMap = new HashMap<String,Object>();
String groupId = "weaver-crm-service";
String sourceType = "LOGIC";
if(StringUtils.isNotBlank(mainlineid)){
String sql =" select id,name from mainline " +
" where id='"+mainlineid+"' " +
" and tenant_key='"+tenant_key+"' " +
" and delete_type='0' " ;
Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
" where id=? " +
" and tenant_key=? " +
" and delete_type='0' " ;
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.LONG);
sqlParamEntity.setValue(mainlineid+"");
sqlparam.add(sqlParamEntity);
sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(tenantKey);
sqlparam.add(sqlParamEntity);
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(CollectionUtils.isNotEmpty(recordList)){
recordMap = recordList.get(0);

Loading…
Cancel
Save