Procházet zdrojové kódy

防伪报告二维码扫码查询接口修改

user5 před 4 roky
rodič
revize
31cb7a0bf4

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

@@ -919,6 +919,23 @@ public class RuralProjectRecordsController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			projectRecordsService.getDownloadProjectView(projectRecords);
 		}
+		List<MainDictDetail> mainDictList = Lists.newArrayList();
+		//工程咨询
+		if("1".equals(projectRecords.getProjectType())){
+			mainDictList = DictUtils.getMainDictListByOuterNet("attachment_project_sort");
+			//造价审核
+		} else if("2".equals(projectRecords.getProjectType())){
+			mainDictList = DictUtils.getMainDictListByOuterNet("attachment_project_sort_cost");
+		}
+		if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+			//处理项目类别
+			for (MainDictDetail info: mainDictList) {
+				if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+					projectRecords.setAttachmentProjectSort(info.getLabel());
+					break;
+				}
+			}
+		}
 		model.addAttribute("ruralProjectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralporjectmessage/downloadType/downloadProjectView";
 	}

+ 17 - 3
src/main/java/com/jeeplus/modules/sys/utils/DictUtils.java

@@ -34,7 +34,7 @@ import java.util.*;
  * @version 2013-5-29
  */
 public class DictUtils {
-	
+
 	private static DictDao dictDao = SpringContextHolder.getBean(DictDao.class);
 	private static MainDictService mainDictService = SpringContextHolder.getBean(MainDictService.class);
 	private static MainDictDetailDao mainDictDetailDao = SpringContextHolder.getBean(MainDictDetailDao.class);
@@ -122,7 +122,7 @@ public class DictUtils {
 		}
 		return defaultLabel;
 	}
-	
+
 	public static List<Dict> getDictList(String type){
 		@SuppressWarnings("unchecked")
 		Map<String, List<Dict>> dictMap = (Map<String, List<Dict>>)CacheUtils.get(CACHE_DICT_MAP);
@@ -365,7 +365,21 @@ public class DictUtils {
 		} catch (InvocationTargetException e) {
 			e.printStackTrace();
 		}
-		
+
 		return null;
 	}
+
+
+
+	/**
+	 * 公司级业务字典
+	 * @param type
+	 * @return
+	 */
+	public static List<MainDictDetail> getMainDictListByOuterNet(String type){
+		MainDictDetail mainDictDetail = new MainDictDetail();
+		mainDictDetail.setType(type);
+		List<MainDictDetail> dictList = mainDictDetailDao.findJedisAllList(mainDictDetail);
+		return dictList;
+	}
 }

+ 4 - 1
src/main/resources/jeeplus.properties

@@ -252,7 +252,10 @@ bos_buck_name=newxgccpm
 
 
 #serverDomain=http://192.168.2.4:18080/total_process
-serverDomain=http://192.168.5.74:8090/a
+#\u5F00\u53D1\u73AF\u5883
+#serverDomain=http://192.168.2.7:8080/a
+#\u751F\u4EA7\u73AF\u5883
+serverDomain=http://ccpm.xgccpm.com/a
 
 #\u8BA2\u9910\u56DE\u8C03
 backUrl = http://yf.xgccpm.cn/weXin/theOrder/orderFrom

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/downloadProjectView.jsp

@@ -46,7 +46,7 @@
 					<div class="form-group">
 						<label class="col-sm-2 control-label">咨询项目类型:</label>
 						<div class="col-sm-10">
-							<input htmlEscape="false" readonly="true" value="" class="form-control "/>
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.attachmentProjectSort}" class="form-control "/>
 						</div>
 					</div>
 					<div class="form-group">
@@ -134,4 +134,4 @@
 </div>
 </div>
 </body>
-</html>
+</html>