Commit 12c03198 authored by mengbali153's avatar mengbali153

能力管理--联调

历史档案--联调
非标产值--联调
parent 8d2df675
...@@ -106,9 +106,9 @@ public class NonStandardApprovalController { ...@@ -106,9 +106,9 @@ public class NonStandardApprovalController {
@ApiOperation("委托单位审批导出列表") @ApiOperation("委托单位审批导出列表")
@PostMapping("/exportList") @PostMapping("/exportList")
public void exportList(Integer status,String filename, String userId, String name, HttpServletResponse response) { public void exportList(String filename, String userId, String name, HttpServletResponse response) {
try { try {
iNonStandardApprovalService.exportList(status, filename, userId, name, response); iNonStandardApprovalService.exportList(filename, userId, name, response);
} catch (Exception e) { } catch (Exception e) {
log.debug("非标产值申请导出列表{}", e); log.debug("非标产值申请导出列表{}", e);
} }
......
...@@ -94,9 +94,9 @@ public class NonStandardValueController { ...@@ -94,9 +94,9 @@ public class NonStandardValueController {
@ApiOperation("非标产值信息导出列表") @ApiOperation("非标产值信息导出列表")
@PostMapping("/exportList") @PostMapping("/exportList")
public void exportList(Integer status, String filename, Integer userId, String name, HttpServletResponse response) { public void exportList(String filename, Integer userId, String name, HttpServletResponse response) {
try { try {
inonStandardValueService.exportList(status, filename, userId, name, response); inonStandardValueService.exportList(filename, userId, name, response);
} catch (Exception e) { } catch (Exception e) {
log.debug("非标产值信息导出列表{}", e); log.debug("非标产值信息导出列表{}", e);
} }
......
...@@ -72,11 +72,10 @@ public interface INonStandardApprovalService extends IService<NonStandardApprova ...@@ -72,11 +72,10 @@ public interface INonStandardApprovalService extends IService<NonStandardApprova
/** /**
* 非标产值审批列表导出 * 非标产值审批列表导出
* @param status 状态
* @param filename 文件名 * @param filename 文件名
* @param userId 账户 * @param userId 账户
* @param name 姓名 * @param name 姓名
* @param response * @param response
*/ */
void exportList(Integer status,String filename, String userId, String name, HttpServletResponse response); void exportList(String filename, String userId, String name, HttpServletResponse response);
} }
...@@ -43,11 +43,10 @@ public interface INonStandardValueService extends IService<NonStandardValue> { ...@@ -43,11 +43,10 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
/** /**
* 非标产值列表导出 * 非标产值列表导出
* @param status 状态
* @param filename 文件名 * @param filename 文件名
* @param userId 用户id * @param userId 用户id
* @param name 姓名 * @param name 姓名
* @param response * @param response
*/ */
void exportList(Integer status, String filename, Integer userId, String name, HttpServletResponse response); void exportList(String filename, Integer userId, String name, HttpServletResponse response);
} }
...@@ -140,8 +140,8 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap ...@@ -140,8 +140,8 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
for (Map<String, Object> m : list) { for (Map<String, Object> m : list) {
Object[] objects = new Object[headers.length]; Object[] objects = new Object[headers.length];
for (int j = 0; j < headers.length; j++) { for (int j = 0; j < headers.length; j++) {
String obj = m.get(headers[j]).toString(); String obj = m.get(headers[j])==null?"":m.get(headers[j]).toString();
if(j==0){ if(j==0 && obj!=null){
obj = obj.split("\\.")[0]; obj = obj.split("\\.")[0];
} }
objects[j] = obj; objects[j] = obj;
......
...@@ -129,9 +129,8 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro ...@@ -129,9 +129,8 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
} }
@Override @Override
public void exportList(Integer status,String filename, String userId, String name, HttpServletResponse response) { public void exportList(String filename, String userId, String name, HttpServletResponse response) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("status", status);
params.put("name", name); params.put("name", name);
params.put("userId", userId); params.put("userId", userId);
List<Map<String, Object>> list= nonStandardApprovalMapper.exportList(params); List<Map<String, Object>> list= nonStandardApprovalMapper.exportList(params);
......
...@@ -116,16 +116,15 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -116,16 +116,15 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
@Override @Override
public void exportList(Integer status, String filename, Integer userId, String name, HttpServletResponse response) { public void exportList(String filename, Integer userId, String name, HttpServletResponse response) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("status", status);
params.put("userId", userId); params.put("userId", userId);
params.put("name", name); params.put("name", name);
List<Map<String, Object>> list= nonStandardValueMapper.exportList(params); List<Map<String, Object>> list= nonStandardValueMapper.exportList(params);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
Map<String, Object> map = list.get(0); Map<String, Object> map = list.get(0);
String[] headers = new String[map.size()]; String[] headers = new String[10];
headers[0] = "序号"; headers[0] = "序号";
headers[1] = "姓名"; headers[1] = "姓名";
headers[2] = "账户"; headers[2] = "账户";
...@@ -142,8 +141,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -142,8 +141,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
for (Map<String, Object> m : list) { for (Map<String, Object> m : list) {
Object[] objects = new Object[headers.length]; Object[] objects = new Object[headers.length];
for (int j = 0; j < headers.length; j++) { for (int j = 0; j < headers.length; j++) {
String obj = m.get(headers[j]).toString(); String obj = m.get(headers[j])==null?"":m.get(headers[j]).toString();
if(j==0){ if(j==0 && obj!=null){
obj = obj.split("\\.")[0]; obj = obj.split("\\.")[0];
} }
objects[j] = obj; objects[j] = obj;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment