瀏覽代碼

项目登记-暂无合同(赤红)/ 列表委托方展示

[user3] 4 年之前
父節點
當前提交
596cbf2675

+ 9 - 9
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -116,15 +116,15 @@ public class RuralCostProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
-//			if (records1.getWorkContractInfo() == null) {
-//				projectRecordsService.queryLinkmanInfos(records1);
-//				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-//					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-//					WorkContractInfo contractInfo = new WorkContractInfo();
-//					contractInfo.setClient(linkman.getClientId());
-//					records1.setWorkContractInfo(contractInfo);
-//				}
-//			}
+			if (records1.getWorkContractInfo() == null) {
+				projectRecordsService.queryLinkmanInfos(records1);
+				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+					WorkContractInfo contractInfo = new WorkContractInfo();
+					contractInfo.setClient(linkman.getClientId());
+					records1.setWorkContractInfo(contractInfo);
+				}
+			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

+ 9 - 9
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -119,15 +119,15 @@ public class RuralProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
-//			if (records1.getWorkContractInfo() == null) {
-//				projectRecordsService.queryLinkmanInfos(records1);
-//				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-//					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-//					WorkContractInfo contractInfo = new WorkContractInfo();
-//					contractInfo.setClient(linkman.getClientId());
-//					records1.setWorkContractInfo(contractInfo);
-//				}
-//			}
+			if (records1.getWorkContractInfo() == null) {
+				projectRecordsService.queryLinkmanInfos(records1);
+				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+					WorkContractInfo contractInfo = new WorkContractInfo();
+					contractInfo.setClient(linkman.getClientId());
+					records1.setWorkContractInfo(contractInfo);
+				}
+			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

+ 5 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -295,7 +295,11 @@
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                     }}*/
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
-                    	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+						if(""!= d.contract){
+							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+						}else{
+							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
+						}
 					}}
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";

+ 6 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -320,7 +320,12 @@
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                     }}*/
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
-                    	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+                		if(""!= d.contract){
+							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+						}else{
+							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
+						}
+
 					}}
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";