|
@@ -84,6 +84,8 @@ public class RuralProjectMessageController extends BaseController {
|
|
|
@Autowired
|
|
|
private ProjectTemplateService projectTemplateService;
|
|
|
|
|
|
+ private static byte[] SYN_BYTE = new byte[0];
|
|
|
+
|
|
|
@ModelAttribute
|
|
|
public RuralProjectRecords get(@RequestParam(required=false) String id) {
|
|
|
RuralProjectRecords entity = null;
|
|
@@ -512,8 +514,10 @@ public class RuralProjectMessageController extends BaseController {
|
|
|
ProjectReportData reportData = ruralProjectMessageService.getProjectReportDateByProjectId(projectReportRecord.getReportId());
|
|
|
if(null != reportData){
|
|
|
if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
|
|
|
- int count = projectReportRecordService.getNumber(reportData.getId());
|
|
|
- projectReportRecord.setRecordNum(count>9?reportData.getNumber()+"-"+count+"":reportData.getNumber()+"-"+"0"+count);
|
|
|
+ synchronized (SYN_BYTE) {
|
|
|
+ int count = projectReportRecordService.getNumber(reportData.getId());
|
|
|
+ projectReportRecord.setRecordNum(count > 9 ? reportData.getNumber() + "-" + count + "" : reportData.getNumber() + "-" + "0" + count);
|
|
|
+ }
|
|
|
}else{
|
|
|
ProjectReportRecord projectReportRecordInfo =ruralProjectMessageService.getProjectReportRecord(reportData.getId());
|
|
|
MyBeanUtils.copyBeanNotNull2Bean(projectReportRecordInfo, projectReportRecord);
|
|
@@ -757,7 +761,7 @@ public class RuralProjectMessageController extends BaseController {
|
|
|
return "modules/workreimbursement/workReimbursementTrack";
|
|
|
}
|
|
|
|
|
|
- //报告流程审批
|
|
|
+ //报告归档流程审批
|
|
|
@RequestMapping(value = {"auditProjectReportRecordSave"})
|
|
|
public String auditProjectReportRecordSave(ProjectReportRecord projectReportRecord, HttpServletRequest request, HttpServletResponse response, Model model,
|
|
|
RedirectAttributes redirectAttributes) {
|