能力管理--联调

历史档案--联调
非标产值--联调

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardApprovalController.java

@@ -106,9 +106,9 @@ public class NonStandardApprovalController {
 
 	@ApiOperation("委托单位审批导出列表")
 	@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 {
-			iNonStandardApprovalService.exportList(status, filename, userId, name, response);
+			iNonStandardApprovalService.exportList(filename, userId, name, response);
 		} catch (Exception e) {
 			log.debug("非标产值申请导出列表{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java

@@ -94,9 +94,9 @@ public class NonStandardValueController {
 
     @ApiOperation("非标产值信息导出列表")
     @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 {
-            inonStandardValueService.exportList(status, filename, userId, name, response);
+            inonStandardValueService.exportList(filename, userId, name, response);
         } catch (Exception e) {
             log.debug("非标产值信息导出列表{}", e);
         }

cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardApprovalService.java

@@ -72,11 +72,10 @@ public interface INonStandardApprovalService extends IService<NonStandardApprova
 
 	/**
 	 * 非标产值审批列表导出
-	 * @param status 状态
 	 * @param filename 文件名
 	 * @param userId 账户
 	 * @param name 姓名
 	 * @param response
 	 */
-	void exportList(Integer status,String filename, String userId, String name, HttpServletResponse response);
+	void exportList(String filename, String userId, String name, HttpServletResponse response);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java

@@ -43,11 +43,10 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
 
 	/**
 	 * 非标产值列表导出
-	 * @param status 状态
 	 * @param filename 文件名
 	 * @param userId 用户id
 	 * @param name 姓名
 	 * @param response
 	 */
-	void exportList(Integer status, String filename, Integer userId, String name, HttpServletResponse response);
+	void exportList(String filename, Integer userId, String name, HttpServletResponse response);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -140,8 +140,8 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 			for (Map<String, Object> m : list) {
 				Object[] objects = new Object[headers.length];
 				for (int j = 0; j < headers.length; j++) {
-					String obj = m.get(headers[j]).toString();
-					if(j==0){
+					String obj = m.get(headers[j])==null?"":m.get(headers[j]).toString();
+					if(j==0 && obj!=null){
 						obj = obj.split("\\.")[0];
 					}
 					objects[j] = obj;

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java

@@ -129,9 +129,8 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
 	}
 
 	@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<>();
-		params.put("status", status);
 		params.put("name", name);
 		params.put("userId", userId);
 		List<Map<String, Object>> list= nonStandardApprovalMapper.exportList(params);

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java

@@ -116,16 +116,15 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 
 
 	@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<>();
-		params.put("status", status);
 		params.put("userId", userId);
 		params.put("name", name);
 		List<Map<String, Object>> list= nonStandardValueMapper.exportList(params);
 
 		if (!CollectionUtils.isEmpty(list)) {
 			Map<String, Object> map = list.get(0);
-			String[] headers = new String[map.size()];
+			String[] headers = new String[10];
 			headers[0] = "序号";
 			headers[1] = "姓名";
 			headers[2] = "账户";
@@ -142,8 +141,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 			for (Map<String, Object> m : list) {
 				Object[] objects = new Object[headers.length];
 				for (int j = 0; j < headers.length; j++) {
-					String obj = m.get(headers[j]).toString();
-					if(j==0){
+					String obj = m.get(headers[j])==null?"":m.get(headers[j]).toString();
+					if(j==0 && obj!=null){
 						obj = obj.split("\\.")[0];
 					}
 					objects[j] = obj;