user5 5 年之前
父节点
当前提交
ed0ee07a2e

+ 1 - 0
src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -1134,6 +1134,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 	@Transactional(readOnly = false)
 	public String saveInvalid(Projectcontentinfo projectcontentinfo,int type) {
 		ProjectReportData projectReportData= projectcontentinfo.getProjectReportData();
+		//判断是否为无需复核,若为无需复核则直接作废  无需审核
 		if("0".equals(projectcontentinfo.getProjectReportData().getReviewStandard())){
 			projectReportData.setStatus("7");
 			projectReportData.setInvalidStatus("2");

+ 2 - 2
src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -110,7 +110,7 @@ public class ProjectRecordsController extends BaseController {
 		Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords);
         //无合同状态下,获取委托方的名称
 		List<ProjectRecords> list = page.getList();
-		for (int i = 0; i < list.size(); i++) {
+		/*for (int i = 0; i < list.size(); i++) {
 			ProjectRecords records1 = list.get(i);
 			if (records1.getWorkContractInfo() == null) {
 				projectRecordsService.queryLinkmanInfos(records1);
@@ -121,7 +121,7 @@ public class ProjectRecordsController extends BaseController {
 					records1.setWorkContractInfo(contractInfo);
 				}
 			}
-		}
+		}*/
 		model.addAttribute("page", page);
 		return "modules/projectrecord/projectRecordsList";
 	}