|
@@ -37,6 +37,7 @@ import com.jeeplus.modules.sys.entity.User;
|
|
|
import com.jeeplus.modules.sys.service.UserService;
|
|
|
import com.jeeplus.modules.sys.utils.DictUtils;
|
|
|
import com.jeeplus.modules.sys.utils.UserUtils;
|
|
|
+import com.jeeplus.modules.wexinpackage.access.util.access.RequestAccess;
|
|
|
import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
|
|
|
import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
|
|
|
import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
|
|
@@ -48,6 +49,8 @@ import org.activiti.engine.runtime.ProcessInstance;
|
|
|
import org.activiti.engine.task.Task;
|
|
|
import org.apache.shiro.authz.annotation.Logical;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.Model;
|
|
@@ -670,7 +673,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = {"holdSaveReport"})
|
|
|
public String holdSaveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) throws Exception {
|
|
|
- //try{
|
|
|
+ try{
|
|
|
String str = ruralProjectMessageService.saveData(projectcontentinfo,1);
|
|
|
addMessage(redirectAttributes, "暂存报告"+(str.equals("true")?"成功":"失败"));
|
|
|
ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
|
|
@@ -680,9 +683,9 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
}
|
|
|
return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
|
|
|
}
|
|
|
- /*}catch (Exception e){
|
|
|
+ }catch (Exception e){
|
|
|
logger.error("ProjectcontentinfoController save Exception e"+e);
|
|
|
- }*/
|
|
|
+ }
|
|
|
if(UserUtils.isManager()){
|
|
|
model.addAttribute("flag","1");
|
|
|
}
|
|
@@ -829,6 +832,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
+ logger.error("报告流程审批错误:",e);
|
|
|
}
|
|
|
String taskDefKey = t.getAct().getTaskDefKey();
|
|
|
List<User> users = null;
|
|
@@ -893,7 +897,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
HashMap<String, String> requestMap = findRequestMap(request);
|
|
|
String processInstanceId = requestMap.get("processInstanceId");
|
|
|
String id = requestMap.get("id");
|
|
|
- /*try {*/
|
|
|
+ try {
|
|
|
RuralProjectRecords projectRecords = ruralProjectMessageService.get(id);
|
|
|
if(3==projectRecords.getProjectReportStatus() || 4==projectRecords.getProjectReportStatus()){
|
|
|
addMessage(redirectAttributes, "项目报告已撤回,请勿重复撤回");
|
|
@@ -905,10 +909,10 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
ProjectReportData projectReportDateByProjectId = ruralProjectMessageService.getProjectReportDateByProjectId(projectRecords.getId());
|
|
|
ruralProjectMessageService.cancelInvalidate(projectReportDateByProjectId);
|
|
|
addMessage(redirectAttributes, "撤回该项目报告成功");
|
|
|
- /*}catch (Exception e){
|
|
|
- logger.info(e.getMessage());
|
|
|
+ }catch (Exception e){
|
|
|
+ logger.info("报告撤回错误",e.getMessage());
|
|
|
addMessage(redirectAttributes, "撤回该项目报告失败");
|
|
|
- }*/
|
|
|
+ }
|
|
|
return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
|
|
|
}
|
|
|
|
|
@@ -1255,6 +1259,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
addMessage(redirectAttributes, "保存报告归档成功");
|
|
|
}catch (Exception e){
|
|
|
addMessage(redirectAttributes, "保存报告归档失败");
|
|
|
+ logger.error("保存报告归档失败",e);
|
|
|
}
|
|
|
return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
|
|
|
}
|
|
@@ -1308,6 +1313,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
addMessage(redirectAttributes, "保存报告归档暂存成功");
|
|
|
}catch (Exception e){
|
|
|
addMessage(redirectAttributes, "保存报告归档暂存失败");
|
|
|
+ logger.error("保存报告归档暂存失败",e);
|
|
|
}
|
|
|
return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
|
|
|
}
|
|
@@ -1387,6 +1393,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
addMessage(redirectAttributes, "强制撤回报告归档失败");
|
|
|
+ logger.error("强制撤回归档信息失败",e);
|
|
|
}
|
|
|
return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
|
|
|
}
|
|
@@ -1520,6 +1527,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
addMessage(redirectAttributes, "强制撤回项目上报失败");
|
|
|
+ logger.error("强制撤回项目上报信息失败",e);
|
|
|
}
|
|
|
return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
|
|
|
}
|
|
@@ -1559,6 +1567,7 @@ public class RuralCostProjectMessageController extends BaseController {
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
addMessage(redirectAttributes, "公告流程审批失败");
|
|
|
+ logger.error("公告流程审批失败:",e);
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
|