Просмотр исходного кода

项目领域设置成动态生成

scr 8 лет назад
Родитель
Сommit
f78a837b0b

+ 6 - 6
donate-service/src/main/java/com/uas/service/donate/controller/AppController.java

@@ -106,8 +106,8 @@ public class AppController {
      */
     @ResponseBody
     @RequestMapping(value = "/donateDetail/{imid}",method = RequestMethod.GET)
-    public ModelMap projectRecodeList(@PathVariable("imid") Long imid)throws Exception{
-        Long uuid=AccountUtils.getUserUUByImId(imid);
+    public ModelMap projectRecodeList(@PathVariable("imid") String imid)throws Exception{
+        Long uuid=AccountUtils.getUserUUByImId(Long.parseLong(imid));
         ModelMap modelMap=new ModelMap();
         List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
         modelMap.put("projectRecodeList",projectRecodeList);
@@ -125,8 +125,8 @@ public class AppController {
      */
     @ResponseBody
     @RequestMapping(value = "/joinActivity/{imid}",method = RequestMethod.GET)
-    public ModelMap queryOne(@PathVariable("imid")Long imid)throws Exception{
-        Long uuid=AccountUtils.getUserUUByImId(imid);
+    public ModelMap queryOne(@PathVariable("imid")String imid)throws Exception{
+        Long uuid=AccountUtils.getUserUUByImId(Long.parseLong(imid));
         ModelMap modelMap=new ModelMap();
         List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(uuid);
         modelMap.put("activityRecodeList",activityRecodeList);
@@ -141,8 +141,8 @@ public class AppController {
      */
     @ResponseBody
     @RequestMapping(value = "/center",method = RequestMethod.GET)
-    public ModelMap center(Long imid) throws Exception {
-        Long uuid=AccountUtils.getUserUUByImId(imid);
+    public ModelMap center(String imid) throws Exception {
+        Long uuid=AccountUtils.getUserUUByImId(Long.parseLong(imid));
         ModelMap modelMap=new ModelMap();
         //获取个人账户信息
         User user=userService.findOne(uuid);

+ 3 - 0
donate-service/src/main/java/com/uas/service/donate/controller/IndexController.java

@@ -153,6 +153,8 @@ public class IndexController {
                               @RequestParam(value = "useFor",defaultValue ="donate")String useFor) {
 
         PageRequest pageable=new PageRequest(page,size);
+        //查询项目中所有领域分类
+        List<String> allArea=projectService.allArea();
 
 	    //得到历史参与总人数
 	    Long historyPerson = projectRecodeService.historyPerson();
@@ -193,6 +195,7 @@ public class IndexController {
             model.addAttribute("page",projects);
         }
 
+        model.addAttribute("allArea",allArea);
         model.addAttribute("areaList",areaList);
         model.addAttribute("historyPerson", historyPerson);
         model.addAttribute("totality", totality);

+ 11 - 5
donate-service/src/main/resources/templates/index.ftl

@@ -748,11 +748,15 @@
                     <label for="">项目领域:</label>
                     <select id="chooseArea">
                         <option>全部</option>
+                        <#list allArea as area>
+                            <option>${area}</option>
+                        </#list>
+                        <#--<option>全部</option>
                         <option>环境/动物保护</option>
                         <option>疾病援助</option>
                         <option>扶贫/救灾</option>
                         <option>教育/助学</option>
-                        <option>其他</option>
+                        <option>其他</option>-->
                     </select>
                 </div>
                 <div class="form-group form-groups">
@@ -821,7 +825,7 @@
                                     <input type="checkbox" name="checkbox" class="fl"><span class="fl">同意并接受《<a href="/userAgreement" target="_blank" style="color: #5078cb;">优软一元捐用户协议</a>》</span></span>
                             </div>
 
-                            <input type="button" class="payMoeny" disabled="disabled" onclick="pay(${project.id!''}, money, payWay)" value="确认捐款"/><#--</a>-->
+                            <input type="button" class="payMoeny" onclick="pay(${project.id!''}, money, payWay)" value="确认捐款"/><#--</a>-->
                         </div>
                     </div>
                 </div>
@@ -831,8 +835,8 @@
             <div id="kkpager"></div>
         </div>
     </div>
-</div>
-<div id="hover-background" style="display: none">
+    </div>
+    <div id="hover-background" style="display: none">
     <div class="x-floating-wrap"></div>
     <div class="x-floating">
         <div id="item-content">
@@ -841,6 +845,8 @@
         </div>
     </div>
 </div>
+</div>
+</body>
 <script>
     /*设置只能输入数字和一位小数点和一位小数点后面的两位数字*/
     function clearNoNum(obj){
@@ -1014,7 +1020,7 @@
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status;
+        window.location.href="http://localhost:8084?area="+area+"&&status="+status;
     })
 
     //项目状态下拉框查询项目