|
@@ -23,6 +23,8 @@ import com.jeeplus.modules.projectrecord.dao.ProjectRecordsDao;
|
|
|
import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
|
|
|
import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
|
|
|
import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
|
|
|
+import com.jeeplus.modules.projectreportnum.dao.ProjectReportNumDao;
|
|
|
+import com.jeeplus.modules.projectreportnum.entity.ReportNum;
|
|
|
import com.jeeplus.modules.serialnum.service.SerialNumTplService;
|
|
|
import com.jeeplus.modules.sys.entity.Office;
|
|
|
import com.jeeplus.modules.sys.entity.User;
|
|
@@ -113,6 +115,8 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
|
|
|
private ProjectReportDataDao projectReportDataDao;
|
|
|
@Autowired
|
|
|
private ProjectRecordsDao projectRecordsDao;
|
|
|
+ @Autowired
|
|
|
+ private ProjectReportNumDao projectReportNumDao;
|
|
|
|
|
|
public ProjectRecords get(String id) {
|
|
|
return super.get(id);
|
|
@@ -763,6 +767,16 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
|
|
|
workActivityProcess.setIsApproval("1");
|
|
|
vars.put("pass", true);
|
|
|
notifyRole = "审批通过";
|
|
|
+ //审批通过则需要给该项目添加一个报告前缀信息
|
|
|
+ String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
|
|
|
+ ReportNum reportNum = new ReportNum();
|
|
|
+ reportNum.preInsert();
|
|
|
+ reportNum.setNum(num);
|
|
|
+ reportNum.setState("0");
|
|
|
+ reportNum.setParentId("0");
|
|
|
+ reportNum.setParentId("0");
|
|
|
+ reportNum.setProjectId(projectRecords.getId());
|
|
|
+ projectReportNumDao.insert(reportNum);
|
|
|
} else {
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
vars.put("pass", false);
|