Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/bos/BosController.java

@@ -8,6 +8,8 @@ import com.jeeplus.modules.iim.entity.LayFileJsonData;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.utils.SftpClientUtil;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +27,11 @@ import java.util.*;
 public class BosController {
     private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
     private final static String directory = Global.getConfig("remoteServer.directory");
+    /**
+     * 日志对象
+     */
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
     @RequestMapping("upload")
     @ResponseBody
     public Map upload(HttpServletRequest request, MultipartFile file, MultipartHttpServletRequest multiRequest){
@@ -48,6 +55,7 @@ public class BosController {
             }catch (Exception e){
                 map.put("msg","上传失败");
                 map.put("code","0");
+                logger.error("Exception e:"+e);
             }
         }else if("2".equals(uploadMode)){
             String filepath = "";
@@ -68,6 +76,7 @@ public class BosController {
                         ossUtil.uploadFile2OSS(file.getInputStream(),realPath,newName);
                     } catch (IOException e) {
                         e.printStackTrace();
+                        logger.error("Exception e:"+e);
                     }
                     filepath = Global.getAliDownloadUrl() + "/" + realPath + newName;
 
@@ -93,6 +102,7 @@ public class BosController {
                 map.put("code","1");
                 map.put("url","/a/workfullmanage/workFullManage/downLoadAttach?file=" + uploadFile);
             } catch (Exception e) {
+                logger.error("Exception e:"+e);
                 e.printStackTrace();
                 map.put("msg","上传失败");
                 map.put("code","0");
@@ -150,6 +160,7 @@ public class BosController {
             map.put("code","1");
             map.put("url",upload);
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             map.put("msg","上传失败");
             map.put("code","0");
         }
@@ -188,11 +199,13 @@ public class BosController {
                     FtlUtils.createFMLFile(fileName.toString());
                     FtlUtils.createFtl(fileName.toString());
                 } catch (Throwable throwable) {
+                    logger.error("Exception e:"+throwable);
                     throwable.printStackTrace();
                 }
                 //删除模板
                 saveFile.delete();
             } catch (IOException e) {
+                logger.error("Exception e:"+e);
                 e.printStackTrace();
             }
         }
@@ -215,6 +228,7 @@ public class BosController {
             map.put("code","1");
             map.put("url",upload);
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             map.put("msg","上传失败");
             map.put("code","0");
         }
@@ -239,6 +253,7 @@ public class BosController {
             map.put("code","1");
             map.put("url",uploadFile);
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
             map.put("msg","上传失败");
             map.put("code","0");
@@ -338,6 +353,7 @@ public class BosController {
                         srcFile.delete();
                     }
                 }catch (Exception e){
+                    logger.error("Exception e:"+e);
                 }
             }else if("2".equals(uploadMode)){
                 LayFileJsonData data = new LayFileJsonData();
@@ -355,6 +371,7 @@ public class BosController {
                         try {
                             ossUtil.uploadFile2OSS(file.getInputStream(),realPath,newName);
                         } catch (IOException e) {
+                            logger.error("Exception e:"+e);
                             e.printStackTrace();
                         }
                         filepath = Global.getAliDownloadUrl() + "/" + realPath + newName;
@@ -376,6 +393,7 @@ public class BosController {
                         srcFile.delete();
                     }
                 } catch (Exception e) {
+                    logger.error("Exception e:"+e);
                     e.printStackTrace();
                 }
             }
@@ -392,8 +410,10 @@ public class BosController {
             out.flush();
             out.close();
         } catch (IllegalStateException e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         } catch (IOException e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         }
     }

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -517,12 +517,14 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
                     workClientAttachments.add(workClientAttachment);
                     workClientAttachment.setAttachmentFlag(attachmentFlag);
                 }catch (Exception e){
+                    logger.error("Exception e:"+e);
                     e.printStackTrace();
                 }finally {
                     try {
                         if (inputStream != null)
                             inputStream.close();
                     } catch (IOException e) {
+                        logger.error("Exception e:"+e);
                         e.printStackTrace();
                     }
                 }
@@ -557,12 +559,14 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
             workClientAttachment.setType(suffix);
             workClientAttachment.setAttachmentFlag(attachmentFlag);
         } catch (IOException e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         } finally {
             try {
                 if (inputStream != null)
                     inputStream.close();
             } catch (IOException e) {
+                logger.error("Exception e:"+e);
                 e.printStackTrace();
             }
         }
@@ -697,6 +701,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
             dictList = mainDictDetailDao.findAchievementParentIdList(mainDictDetail);
             return dictList;
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             System.out.println("获取业务字典失败！");
         }
         return dictList;
@@ -708,6 +713,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
             dictList = workClientInfoDao.getJobTypeById(id);
             return dictList;
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             e.getMessage();
         }
         return dictList;

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -316,6 +316,7 @@ public class WorkClientInfoController extends BaseController {
 			}
 			map.put("msg","true");
 		}catch (Exception e){
+			logger.error("Exception e:"+e);
 			map.put("id",workClientInfo.getId());
 			map.put("msg","false");
 		}
@@ -389,6 +390,7 @@ public class WorkClientInfoController extends BaseController {
     		new ExportExcel(true,"客户管理", WorkClientInfo.class,1).setDataList(true,page.getList()).write(response, fileName,request.getHeader("USER-AGENT")).dispose();
     		return null;
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			addMessage(redirectAttributes, "导出客户管理记录失败！失败信息："+e.getMessage());
 		}
 		return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfo/?repage";
@@ -461,6 +463,7 @@ public class WorkClientInfoController extends BaseController {
 						successNum++;
 					}
 				}catch(ConstraintViolationException ex){
+					logger.error("Exception e:"+ex);
 					List<String> messageList = BeanValidators.extractPropertyAndMessageAsList(ex, ": ");
 					for (String message : messageList){
 						failureMsg.append(message+"; ");
@@ -495,8 +498,10 @@ public class WorkClientInfoController extends BaseController {
 					InputStream inputStream = new ByteArrayInputStream(content);
 					ossUtil.uploadFile2OSS(inputStream,fileDir, fileName);
 				}catch (IOException e){
+					logger.error("Exception e:"+e);
 					e.printStackTrace();
 				}catch (Exception e1){
+					logger.error("Exception e1:"+e1);
 					e1.printStackTrace();
 					System.out.println("客户信息错误导入日志文件上传失败！");
 				}
@@ -518,6 +523,7 @@ public class WorkClientInfoController extends BaseController {
 			sysImportInfoService.save(sysImportInfo);
 			addMessage(redirectAttributes, msg);
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			addMessage(redirectAttributes, "导入客户信息失败！失败信息："+e.getMessage());
 		}
 		return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfo/?repage";
@@ -535,6 +541,7 @@ public class WorkClientInfoController extends BaseController {
     		new ExportExcel(true,"客户管理数据", WorkClientInfo.class, 1).setDataList(list).write(response, fileName,request.getHeader("USER-AGENT")).dispose();
     		return null;
 		} catch (Exception e) {
+			logger.error("Exception e:"+e);
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
 		}
 		return "redirect:"+Global.getAdminPath()+"/workclientinfo/workClientInfo/?repage";
@@ -625,6 +632,7 @@ public class WorkClientInfoController extends BaseController {
 			searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -648,6 +656,7 @@ public class WorkClientInfoController extends BaseController {
 			searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -684,6 +693,7 @@ public class WorkClientInfoController extends BaseController {
 			searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -711,6 +721,7 @@ public class WorkClientInfoController extends BaseController {
 			searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -735,6 +746,7 @@ public class WorkClientInfoController extends BaseController {
 			searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -771,6 +783,7 @@ public class WorkClientInfoController extends BaseController {
             searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
             searchKey = URLDecoder.decode(searchKey, "UTF-8");
         } catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
             e.printStackTrace();
         }
         model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -830,6 +843,7 @@ public class WorkClientInfoController extends BaseController {
 			searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
+			logger.error("Exception e:"+e);
 			e.printStackTrace();
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -319,6 +319,7 @@ public class WorkContractInfoController extends BaseController {
                 addMessage(redirectAttributes,message);
             }
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "审批失败");
         }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
@@ -384,6 +385,7 @@ public class WorkContractInfoController extends BaseController {
             String str = workContractInfoService.contractInvalidateStart(workContractInfo,reason);
             addMessage(redirectAttributes, str);
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "送审失败");
             return "modules/workcontractinfo/workContractInfoList";
         }
@@ -659,6 +661,7 @@ public class WorkContractInfoController extends BaseController {
                 addMessage(redirectAttributes, "合同变更申请已经提交");
             }
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "申请提交失败!");
             addMessage(redirectAttributes, "系统内部错误");
         }
@@ -750,7 +753,7 @@ public class WorkContractInfoController extends BaseController {
      */
     @RequestMapping(value = "saveAlterAudit")
     public String saveAlterAudit(WorkContractInfo workContractInfo,Map<String, Object> vars, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) {
-//        try{
+        try{
             // 对不同环节的业务逻辑进行操作
             String taskDefKey = workContractInfo.getAct().getTaskDefKey();
             List<User> users = null;
@@ -768,9 +771,10 @@ public class WorkContractInfoController extends BaseController {
                 String str = workContractInfoService.auditAlterSave(workContractInfo,users);
                 addMessage(redirectAttributes, str);
 //            }
-//        }catch (Exception e){
-//            addMessage(redirectAttributes, "审批失败");
-//        }
+        }catch (Exception e){
+            logger.error("Exception e:"+e);
+            addMessage(redirectAttributes, "审批失败");
+        }
         model.addAttribute("workContractInfo", workContractInfo);
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
@@ -1158,6 +1162,7 @@ public class WorkContractInfoController extends BaseController {
                 addMessage(redirectAttributes, "该合同不是送审状态，无法撤回");
             }
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "撤回失败");
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -1173,6 +1178,7 @@ public class WorkContractInfoController extends BaseController {
             addMessage(redirectAttributes, "撤回成功");
             workContractInfoService.auditCompletionInvalidate(workContractInfo);
         }catch (Exception e){
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "撤回失败");
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -1302,6 +1308,7 @@ public class WorkContractInfoController extends BaseController {
             new ExportExcel("合同管理", WorkContractInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "导出合同管理记录失败！失败信息：" + e.getMessage());
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -1334,6 +1341,7 @@ public class WorkContractInfoController extends BaseController {
                         successNum++;
                     }
                 } catch (ConstraintViolationException ex) {
+                    logger.error("Exception ex:"+ex);
                     List<String> messageList = BeanValidators.extractPropertyAndMessageAsList(ex, ": ");
                     for (String message : messageList){
                         failureMsg.append(message+"; ");
@@ -1342,6 +1350,7 @@ public class WorkContractInfoController extends BaseController {
                     workContractInfo = toWorkEntity(workContractInfo,date,"导入失败!");
                     errlist.add(workContractInfo);
                 } catch (Exception ex) {
+                    logger.error("Exception ex:"+ex);
                     workContractInfo = toWorkEntity(workContractInfo,date,ex+"!");
                     failureNum++;
                     errlist.add(workContractInfo);
@@ -1366,8 +1375,10 @@ public class WorkContractInfoController extends BaseController {
                     InputStream inputStream = new ByteArrayInputStream(content);
                     ossUtil.uploadFile2OSS(inputStream,fileDir, fileName);
                 }catch (IOException e){
+                    logger.error("Exception e:"+e);
                     e.printStackTrace();
                 }catch (Exception e1){
+                    logger.error("Exception e1:"+e1);
                     e1.printStackTrace();
                     System.out.println("合同信息错误导入日志文件上传失败！");
                 }
@@ -1390,6 +1401,7 @@ public class WorkContractInfoController extends BaseController {
             sysImportInfoService.save(sysImportInfo);
             addMessage(redirectAttributes, "已成功导入 " + successNum + " 条合同信息记录" + failureMsg);
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "导入合同信息失败！失败信息：" + e.getMessage());
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -1408,6 +1420,7 @@ public class WorkContractInfoController extends BaseController {
             new ExportExcel(true,"合同管理数据", WorkContractInfo.class, 1).setDataList(list).write(response, fileName,agent).dispose();
             return null;
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "导入模板下载失败！失败信息：" + e.getMessage());
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -1442,6 +1455,7 @@ public class WorkContractInfoController extends BaseController {
             searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
             searchKey = URLDecoder.decode(searchKey, "UTF-8");
         } catch (UnsupportedEncodingException e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         }
         model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -1473,6 +1487,7 @@ public class WorkContractInfoController extends BaseController {
             searchLabel1 = URLDecoder.decode(searchLabel1, "UTF-8");
             searchKey1 = URLDecoder.decode(searchKey1, "UTF-8");
         } catch (UnsupportedEncodingException e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         }
         model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -1561,7 +1576,7 @@ public class WorkContractInfoController extends BaseController {
             workClientAttachments.addAll(workClientAttachmentList);
             workContractInfo.setWorkAttachments(workClientAttachments);
         }
-//        try{
+        try{
             // 对不同环节的业务逻辑进行操作
             List<User> users = null;
             if ("bmzr".equals(taskDefKey)){
@@ -1578,9 +1593,10 @@ public class WorkContractInfoController extends BaseController {
                 String str = workContractInfoService.auditSave(workContractInfo, VarStr.CONTRACT_STATUS,users);
                 addMessage(redirectAttributes, str);
 //            }
-//        }catch (Exception e){
-//            addMessage(redirectAttributes, "审批失败");
-//        }
+        }catch (Exception e){
+            logger.error("Exception e:"+e);
+            addMessage(redirectAttributes, "审批失败");
+        }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
@@ -1599,7 +1615,7 @@ public class WorkContractInfoController extends BaseController {
     public String saveAuditCompletion(WorkContractInfo workContractInfo, Model model,
                             RedirectAttributes redirectAttributes) {
         String taskDefKey = workContractInfo.getAct().getTaskDefKey();
-//        try{
+        try{
             // 对不同环节的业务逻辑进行操作
             List<User> users = null;
             if ("bmzr".equals(taskDefKey)){
@@ -1614,9 +1630,10 @@ public class WorkContractInfoController extends BaseController {
                 String str = workContractInfoService.saveAuditCompletion(workContractInfo, VarStr.CONTRACT_STATUS,users);
                 addMessage(redirectAttributes, str);
 //            }
-//        }catch (Exception e){
-//            addMessage(redirectAttributes, "审批失败");
-//        }
+        }catch (Exception e){
+            logger.error("Exception e:"+e);
+            addMessage(redirectAttributes, "审批失败");
+        }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
@@ -1666,6 +1683,7 @@ public class WorkContractInfoController extends BaseController {
                 in.close();
                 out.close();
             }catch (IOException e){
+                logger.error("Exception e:"+e);
                 e.printStackTrace();
             }finally {
                 if (out != null) {
@@ -1793,6 +1811,7 @@ public class WorkContractInfoController extends BaseController {
             searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
             searchKey = URLDecoder.decode(searchKey, "UTF-8");
         } catch (UnsupportedEncodingException e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         }
         model.addAttribute("labelNames", fieldLabels.split("\\|"));
@@ -2023,6 +2042,7 @@ public class WorkContractInfoController extends BaseController {
             new ExportExcel("合同一览表", WorkContractListInfo.class).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
+            logger.error("Exception e:"+e);
             addMessage(redirectAttributes, "导出合同管理记录失败！失败信息：" + e.getMessage());
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/workContractList/?repage";

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -1419,8 +1419,10 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 		} catch (ActivitiObjectNotFoundException e) {
 			System.err.println("撤销发票申请异常，因为这个流程已不存在!");
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		} catch (Exception e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 	}
 
@@ -1472,8 +1474,10 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 		} catch (ActivitiObjectNotFoundException e) {
 			System.err.println("撤销发票作废申请异常，因为这个流程已不存在!");
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		} catch (Exception e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 	}
 

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -1492,8 +1492,10 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		} catch (ActivitiObjectNotFoundException e) {
 			System.err.println("撤销发票申请异常，因为这个流程已不存在!");
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		} catch (Exception e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 	}
 
@@ -1545,8 +1547,10 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		} catch (ActivitiObjectNotFoundException e) {
 			System.err.println("撤销发票作废申请异常，因为这个流程已不存在!");
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		} catch (Exception e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 	}
 

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -163,7 +163,7 @@ public class WorkInvoiceAllController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkInvoice workInvoice, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try{
+		try{
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workInvoice.getAct().getTaskDefKey();
 			List<User> users = null;
@@ -204,9 +204,10 @@ public class WorkInvoiceAllController extends BaseController {
 				}
 				addMessage(redirectAttributes, str);
 			}
-//		}catch (Exception e){
-//			addMessage(redirectAttributes, "审批失败:");
-//		}
+		}catch (Exception e){
+			addMessage(redirectAttributes, "审批失败:");
+			logger.error("Exception e:"+e);
+		}
 
 		if (StringUtils.isNotBlank(workInvoice.getHome()) && "home".equals(workInvoice.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
@@ -311,7 +312,7 @@ public class WorkInvoiceAllController extends BaseController {
 		if (user!=null && StringUtils.isNotBlank(user.getId()) && StringUtils.isNotBlank(invoiceState) && "3".equals(invoiceState)){
 			processInstanceId = workInvoiceService.get(workInvoice.getId()).getProcessInstanceId();
 		}
-//		try {
+		try {
 			Map<String, Object> variables = Maps.newHashMap();
 			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
@@ -339,10 +340,11 @@ public class WorkInvoiceAllController extends BaseController {
 			}else{
 				addMessage(redirectAttributes, "因未选择公司类型，发票申请提交失败");
 			}
-//		} catch (Exception e) {
-//			addMessage(redirectAttributes, "发票申请提交失败!");
-//			addMessage(redirectAttributes, "系统内部错误");
-//		}
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "发票申请提交失败!");
+			addMessage(redirectAttributes, "系统内部错误");
+			logger.error("Exception e:"+e);
+		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
 	}
 
@@ -412,7 +414,7 @@ public class WorkInvoiceAllController extends BaseController {
 		if (user!=null && StringUtils.isNotBlank(user.getId()) && StringUtils.isNotBlank(invoiceState) && "9".equals(invoiceState)){
 			processInstanceId = workInvoiceService.get(workInvoice.getId()).getProcessInstanceId();
 		}
-//		try {
+		try {
 			Map<String, Object> variables = Maps.newHashMap();
 			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 //			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
@@ -435,9 +437,10 @@ public class WorkInvoiceAllController extends BaseController {
 					addMessage(redirectAttributes, "发票作废申请已经提交");
 				}
 			}
-//		} catch (Exception e) {
-//			addMessage(redirectAttributes, "发票作废申请提交失败!");
-//		}
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "发票作废申请提交失败!");
+			logger.error("Exception e:"+e);
+		}
 		}
 		else{
 			addMessage(redirectAttributes, "您不是申请人或财务部成员，无法作废");
@@ -456,7 +459,7 @@ public class WorkInvoiceAllController extends BaseController {
 	@RequestMapping(value = "cancellationSaveAudit")
 	public String cancellationSaveAudit(WorkInvoice workInvoice, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try{
+		try{
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = workInvoice.getAct().getTaskDefKey();
 		List<User> users = null;
@@ -497,9 +500,10 @@ public class WorkInvoiceAllController extends BaseController {
 			}
 			addMessage(redirectAttributes, str);
 		}
-//		}catch (Exception e){
-//			addMessage(redirectAttributes, "审批失败:");
-//		}
+		}catch (Exception e){
+			addMessage(redirectAttributes, "审批失败:");
+			logger.error("Exception e:"+e);
+		}
 
 		if (StringUtils.isNotBlank(workInvoice.getHome()) && "home".equals(workInvoice.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
@@ -613,6 +617,7 @@ public class WorkInvoiceAllController extends BaseController {
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导出发票管理记录失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
     }
@@ -636,8 +641,10 @@ public class WorkInvoiceAllController extends BaseController {
 					successNum++;
 				}catch(ConstraintViolationException ex){
 					failureNum++;
+					logger.error("Exception e:"+ex);
 				}catch (Exception ex) {
 					failureNum++;
+					logger.error("Exception e:"+ex);
 				}
 			}
 			if (failureNum>0){
@@ -646,6 +653,7 @@ public class WorkInvoiceAllController extends BaseController {
 			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条发票管理记录"+failureMsg);
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入发票管理失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
     }
@@ -663,6 +671,7 @@ public class WorkInvoiceAllController extends BaseController {
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
     }
@@ -681,6 +690,7 @@ public class WorkInvoiceAllController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -709,6 +719,7 @@ public class WorkInvoiceAllController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -769,6 +780,7 @@ public class WorkInvoiceAllController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -1030,8 +1042,10 @@ public class WorkInvoiceAllController extends BaseController {
 			workInvoiceAlter.setId(null);
 		} catch (IllegalAccessException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		} catch (InvocationTargetException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		workInvoiceAlter.setCreateBy(UserUtils.getUser());
 		workInvoiceAlter.setCreateDate(new Date());

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -184,7 +184,7 @@ public class WorkInvoiceController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkInvoice workInvoice, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try{
+		try{
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workInvoice.getAct().getTaskDefKey();
 			List<User> users = null;
@@ -225,9 +225,10 @@ public class WorkInvoiceController extends BaseController {
 				}
 				addMessage(redirectAttributes, str);
 			}
-//		}catch (Exception e){
-//			addMessage(redirectAttributes, "审批失败:");
-//		}
+		}catch (Exception e){
+			addMessage(redirectAttributes, "审批失败:");
+			logger.error("Exception e:"+e);
+		}
 
 		if (StringUtils.isNotBlank(workInvoice.getHome()) && "home".equals(workInvoice.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
@@ -332,7 +333,7 @@ public class WorkInvoiceController extends BaseController {
 		if (user!=null && StringUtils.isNotBlank(user.getId()) && StringUtils.isNotBlank(invoiceState) && "3".equals(invoiceState)){
 			processInstanceId = workInvoiceService.get(workInvoice.getId()).getProcessInstanceId();
 		}
-//		try {
+		try {
 			Map<String, Object> variables = Maps.newHashMap();
 			/*WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
@@ -360,10 +361,11 @@ public class WorkInvoiceController extends BaseController {
 			}else{
 				addMessage(redirectAttributes, "因未选择公司类型，发票申请提交失败");
 			}
-//		} catch (Exception e) {
-//			addMessage(redirectAttributes, "发票申请提交失败!");
-//			addMessage(redirectAttributes, "系统内部错误");
-//		}
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "发票申请提交失败!");
+			addMessage(redirectAttributes, "系统内部错误");
+			logger.error("Exception e:"+e);
+		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
 	}
 
@@ -433,7 +435,7 @@ public class WorkInvoiceController extends BaseController {
 		if (user!=null && StringUtils.isNotBlank(user.getId()) && StringUtils.isNotBlank(invoiceState) && "9".equals(invoiceState)){
 			processInstanceId = workInvoiceService.get(workInvoice.getId()).getProcessInstanceId();
 		}
-//		try {
+		try {
 			Map<String, Object> variables = Maps.newHashMap();
 			/*WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
@@ -456,9 +458,10 @@ public class WorkInvoiceController extends BaseController {
 					addMessage(redirectAttributes, "发票作废申请已经提交");
 				}
 			}
-//		} catch (Exception e) {
-//			addMessage(redirectAttributes, "发票作废申请提交失败!");
-//		}
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "发票作废申请提交失败!");
+			logger.error("Exception e:"+e);
+		}
 		}
 		else{
 			addMessage(redirectAttributes, "您不是申请人或财务部成员，无法作废");
@@ -477,7 +480,7 @@ public class WorkInvoiceController extends BaseController {
 	@RequestMapping(value = "cancellationSaveAudit")
 	public String cancellationSaveAudit(WorkInvoice workInvoice, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try{
+		try{
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = workInvoice.getAct().getTaskDefKey();
 		List<User> users = null;
@@ -518,9 +521,10 @@ public class WorkInvoiceController extends BaseController {
 			}
 			addMessage(redirectAttributes, str);
 		}
-//		}catch (Exception e){
-//			addMessage(redirectAttributes, "审批失败:");
-//		}
+		}catch (Exception e){
+			addMessage(redirectAttributes, "审批失败:");
+			logger.error("Exception e:"+e);
+		}
 
 		if (StringUtils.isNotBlank(workInvoice.getHome()) && "home".equals(workInvoice.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
@@ -634,6 +638,7 @@ public class WorkInvoiceController extends BaseController {
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导出发票管理记录失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
     }
@@ -657,8 +662,10 @@ public class WorkInvoiceController extends BaseController {
 					successNum++;
 				}catch(ConstraintViolationException ex){
 					failureNum++;
+					logger.error("Exception e:"+ex);
 				}catch (Exception ex) {
 					failureNum++;
+					logger.error("Exception e:"+ex);
 				}
 			}
 			if (failureNum>0){
@@ -667,6 +674,7 @@ public class WorkInvoiceController extends BaseController {
 			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条发票管理记录"+failureMsg);
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入发票管理失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
     }
@@ -684,6 +692,7 @@ public class WorkInvoiceController extends BaseController {
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
     }
@@ -702,6 +711,7 @@ public class WorkInvoiceController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -730,6 +740,7 @@ public class WorkInvoiceController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -790,6 +801,7 @@ public class WorkInvoiceController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -1059,8 +1071,10 @@ public class WorkInvoiceController extends BaseController {
 			workInvoiceAlter.setId(null);
 		} catch (IllegalAccessException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		} catch (InvocationTargetException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		workInvoiceAlter.setCreateBy(UserUtils.getUser());
 		workInvoiceAlter.setCreateDate(new Date());

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1395,14 +1395,6 @@ public class WorkProjectNotifyController extends BaseController {
 									break;
 								}
 							}
-							//处理送审金额
-							List<MainDictDetail> mainDict = DictUtils.getMainDictList("attachment_project_approval_money");
-							for (MainDictDetail info: mainDict) {
-								if(ruralProjectRecords.getSubmitMoney().equals(info.getValue())){
-									ruralProjectRecords.setSubmitMoney(info.getLabel());
-									break;
-								}
-							}
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							//查询工程类型信息

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementAllService.java

@@ -1389,9 +1389,11 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
         }catch (ActivitiObjectNotFoundException e){
             System.err.println("撤销报销作废异常，因为这个流程已不存在!");
             e.printStackTrace();
+            logger.error("Exception e:"+e);
         }
         catch (Exception e) {
             e.printStackTrace();
+            logger.error("Exception e:"+e);
         }
 
     }

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -1403,10 +1403,12 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workReimbursement.preUpdate();
             workReimbursementDao.update(workReimbursement);
         }catch (ActivitiObjectNotFoundException e){
+            logger.error("Exception e:"+e);
             System.err.println("撤销报销作废异常，因为这个流程已不存在!");
             e.printStackTrace();
         }
         catch (Exception e) {
+            logger.error("Exception e:"+e);
             e.printStackTrace();
         }
 

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkAccountController.java

@@ -289,6 +289,7 @@ public class WorkAccountController extends BaseController {
 			} catch (DocumentException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
+				logger.error("Exception e:"+e);
 			}
 			responseEntity.setData(list);
 			responseEntity.setMessage("成功导入发票明细"+list.size()+"条！");

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -326,7 +326,7 @@ public class WorkReimbursementAllController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkReimbursement workReimbursement, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try {
+		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workReimbursement.getAct().getTaskDefKey();
 			List<User> users = null;
@@ -365,10 +365,10 @@ public class WorkReimbursementAllController extends BaseController {
 				String str = workReimbursementService.auditSave(workReimbursement,users);
 				addMessage(redirectAttributes, str);
 			}
-//		}catch (Exception e){
-//			logger.info("Exception e:"+e);
-//			addMessage(redirectAttributes, "审批失败");
-//		}
+		}catch (Exception e){
+			logger.info("Exception e:"+e);
+			addMessage(redirectAttributes, "审批失败");
+		}
 		if (StringUtils.isNotBlank(workReimbursement.getHome()) && "home".equals(workReimbursement.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {
@@ -426,6 +426,7 @@ public class WorkReimbursementAllController extends BaseController {
 			return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导出报销单记录失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workreimbursement/workReimbursementAll/?repage";
 	}
@@ -449,8 +450,10 @@ public class WorkReimbursementAllController extends BaseController {
 					successNum++;
 				}catch(ConstraintViolationException ex){
 					failureNum++;
+					logger.error("Exception ex:"+ex);
 				}catch (Exception ex) {
 					failureNum++;
+					logger.error("Exception ex:"+ex);
 				}
 			}
 			if (failureNum>0){
@@ -459,6 +462,7 @@ public class WorkReimbursementAllController extends BaseController {
 			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条报销单记录"+failureMsg);
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入报销单失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workreimbursement/workReimbursementAll/?repage";
 	}
@@ -477,6 +481,7 @@ public class WorkReimbursementAllController extends BaseController {
 			return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workreimbursement/workReimbursementAll/?repage";
 	}
@@ -495,6 +500,7 @@ public class WorkReimbursementAllController extends BaseController {
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -766,6 +772,7 @@ public class WorkReimbursementAllController extends BaseController {
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -799,6 +806,7 @@ public class WorkReimbursementAllController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -351,7 +351,7 @@ public class WorkReimbursementController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkReimbursement workReimbursement, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try {
+		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workReimbursement.getAct().getTaskDefKey();
 			List<User> users = null;
@@ -390,10 +390,10 @@ public class WorkReimbursementController extends BaseController {
 				String str = workReimbursementService.auditSave(workReimbursement,users);
 				addMessage(redirectAttributes, str);
 			}
-//		}catch (Exception e){
-//			logger.info("Exception e:"+e);
-//			addMessage(redirectAttributes, "审批失败");
-//		}
+		}catch (Exception e){
+			logger.info("Exception e:"+e);
+			addMessage(redirectAttributes, "审批失败");
+		}
 		if (StringUtils.isNotBlank(workReimbursement.getHome()) && "home".equals(workReimbursement.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {
@@ -451,6 +451,7 @@ public class WorkReimbursementController extends BaseController {
 			return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导出报销单记录失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workreimbursement/workReimbursement/?repage";
 	}
@@ -474,8 +475,10 @@ public class WorkReimbursementController extends BaseController {
 					successNum++;
 				}catch(ConstraintViolationException ex){
 					failureNum++;
+					logger.error("Exception ex:"+ex);
 				}catch (Exception ex) {
 					failureNum++;
+					logger.error("Exception ex:"+ex);
 				}
 			}
 			if (failureNum>0){
@@ -484,6 +487,7 @@ public class WorkReimbursementController extends BaseController {
 			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条报销单记录"+failureMsg);
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入报销单失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workreimbursement/workReimbursement/?repage";
 	}
@@ -502,6 +506,7 @@ public class WorkReimbursementController extends BaseController {
 			return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+			logger.error("Exception e:"+e);
 		}
 		return "redirect:"+Global.getAdminPath()+"/workreimbursement/workReimbursement/?repage";
 	}
@@ -520,6 +525,7 @@ public class WorkReimbursementController extends BaseController {
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -791,6 +797,7 @@ public class WorkReimbursementController extends BaseController {
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));
@@ -824,6 +831,7 @@ public class WorkReimbursementController extends BaseController {
 			searchKey = URLDecoder.decode(searchKey, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
+			logger.error("Exception e:"+e);
 		}
 		model.addAttribute("labelNames", fieldLabels.split("\\|"));
 		model.addAttribute("labelValues", fieldKeys.split("\\|"));

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -51,6 +51,7 @@
                 //     top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                 //     return;
                 // }
+
                 if($("#workClientLinkmanList tr").length==0){
                     top.layer.msg("请选择委托方联系人！", {icon: 5});
                     return;
@@ -65,7 +66,6 @@
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectRecords/tstore");
                 }else{
-
                     var flag = $("#flagFile").val();
                     if(flag == 'false'){
                         top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
@@ -75,13 +75,17 @@
                     if (!flags){
                         return flags;
                     }
+                    var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
+                    if (null == submitMoney){
+                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        return false;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
             }else{
                 parent.layer.msg("信息未填写完整!", {icon: 5});
             }
-
             return false;
         }
         $(document).ready(function() {
@@ -811,7 +815,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false" placeholder="请输入项目名称" class="form-control layui-input required"/>
+                        <form:input path="projectName" id="projectName" maxlength="255" htmlEscape="false" placeholder="请输入项目名称" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -928,10 +932,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                            <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                                <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                            </c:forEach>
+<%--                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -281,13 +281,16 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
 					<div class="layui-input-block">
+						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+						</c:forEach>
 <%--						<form:select path="submitMoney" disabled="true" class="form-control required simple-select">--%>
 <%--							<form:option value=""/>--%>
 <%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
 <%--						</form:select>--%>
-						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="${projectRecords.submitMoney}"/>
+<%--						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="${projectRecords.submitMoney}"/>--%>
 
 					</div>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -87,6 +87,11 @@
                     if (!flags){
                         return flags;
                     }
+                    var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
+                    if (null == submitMoney){
+                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        return false;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
@@ -830,7 +835,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" maxlength="255" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -946,10 +951,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" class="form-control judgment simple-select">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                        </c:forEach>
+<%--                        <form:select path="submitMoney" class="form-control judgment simple-select">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -815,7 +815,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称</label>
                     <div class="layui-input-block">
-                        <form:input placeholder="请输入项目名称" path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input placeholder="请输入项目名称" maxlength="255" path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -930,12 +930,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" class="form-control required simple-select">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+                        </c:forEach>
+<%--                        <form:select path="submitMoney" class="form-control required simple-select">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -223,8 +223,11 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程类型：</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.engineeringType==''}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
+							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
 						</c:forEach>
 					</div>
 				</div>