提示修改

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialModelListController.java

@@ -78,6 +78,9 @@ public class WorkMaterialModelListController {
                 workMaterialCollectEngineers.add(workMaEng);
             }
         }
+        for (WorkMaterialCollectEngineer we:workMaterialCollectEngineers){
+            getEndTimeString(we);
+        }
 //        List<WorkMaterialCollectTotal> list = workMaterialCollectTotalService.findList(workMaterialCollectTotal);
         return workMaterialCollectEngineers;
     }
@@ -181,7 +184,7 @@ public class WorkMaterialModelListController {
         model.addAttribute("taxMax",taxMax);
         model.addAttribute("taxMin",taxMin);
         model.addAttribute("workCollect",workMaterialCollectTotal);
-        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelView";
+        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView";
     }
 
     //转换时间
@@ -209,14 +212,18 @@ public class WorkMaterialModelListController {
     public String getItem(String id,Model model){
         DateFormat dateFormat = new SimpleDateFormat("yyyy");
         WorkMaterialCollectTotal workMaterialCollectTotal = workMaterialCollectTotalService.get(id);
-        if (null!=workMaterialCollectTotal.getStartDate()){
-            workMaterialCollectTotal.setModelStartDate(dateFormat.format(workMaterialCollectTotal.getStartDate()));
-        }
-        if (null!=workMaterialCollectTotal.getEndDate()){
-            workMaterialCollectTotal.setModelEndDate(dateFormat.format(workMaterialCollectTotal.getEndDate()));
-        }
+        WorkMaterialCollectTotal workMaterialCollect = new WorkMaterialCollectTotal();
+        workMaterialCollect.setProjectTypeId(workMaterialCollectTotal.getProjectTypeId());
+        WorkMaterialCollectType workMaterialCollectType = workMaterialCollectTypeService.get(workMaterialCollectTotal.getProjectTypeId());
+        WorkMaterialCollectEngineer workMaterialCollectEngineer = workMaterialCollectEngineerService.get(workMaterialCollectType.getEngineerId());
+        getEndTimeString(workMaterialCollectEngineer);
+        List<WorkMaterialCollectTotal> list = workMaterialCollectTotalService.findList(workMaterialCollect);
+        model.addAttribute("workTotal",list);
+        model.addAttribute("itemId",workMaterialCollectEngineer.getId());
+        model.addAttribute("workEng",workMaterialCollectEngineer);
+        model.addAttribute("workType",workMaterialCollectType);
         model.addAttribute("workEng",workMaterialCollectTotal);
-        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelitemView";
+        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView";
     }
 
 

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelList.jsp

@@ -226,7 +226,7 @@
                         '            <div class="weui-flex__item model_fex model_fex_font-size">名称</div>\n' +
                         '            <div class="weui-flex__item model_fex_font-size">型号</div>\n' +
                         '            <div class="weui-flex__item model_fex_font-size">单位</div>\n' +
-                        '            <div class="weui-flex__item model_fex_font-size">含税价</div>\n' +
+                        // '            <div class="weui-flex__item model_fex_font-size">含税价</div>\n' +
                         '            <div class="weui-flex__item model_fex_font-size">除税价</div>\n' +
                         '            <div class="weui-flex__item model_fex_font-size">分析</div>\n' +
                         '       </div></div>';
@@ -235,7 +235,7 @@
                             "<div class='weui-flex__item model_fex model_fex_font-size'>"+data[i].materialName+"</div>" +
                             "<div class='weui-flex__item model_fex_font-size'>"+data[i].specifications+"</div>" +
                             "<div class='weui-flex__item model_fex_font-size'>"+data[i].unit+"</div>" +
-                            "<div class='weui-flex__item model_fex_font-size'>/</div>" +
+                            // "<div class='weui-flex__item model_fex_font-size'>/</div>" +
                             "<div class='weui-flex__item model_fex_font-size'>"+data[i].excludingTax+"</div>" +
                             "<div class='weui-flex__item model_fex_font-size'><a class='css_a_href' href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
                             "</div></div>";
@@ -310,7 +310,7 @@
                                 "<div class='weui-flex__item model_fex_font-size'>"+data[k].projectName+"</div>" +
                                 "<div class='weui-flex__item model_fex_font-size'>"+data[k].projectSite+"</div>" +
                                 "<div class='weui-flex__item model_fex_font-size'>"+data[k].workMaterialCollectTypes[i].projectType+"</div>" +
-                                "<div class='weui-flex__item model_fex_font-size'>/</div>" +
+                                "<div class='weui-flex__item model_fex_font-size'>"+data[k].modelEndDate+"</div>" +
                                 "<div class='weui-flex__item model_fex_font-size'><a class='css_a_href' href='/workMaterialCollect/total/project.view?itemId="+data[k].id+"&projectTypeId="+data[k].workMaterialCollectTypes[i].id+"'>查看</a></div>" +
                                 "</div></div>";
                         }

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView.jsp

@@ -56,7 +56,7 @@
             <div class="weui-flex__item model_fex_text-align">名称</div>
             <div class="weui-flex__item model_fex_text-align">型号</div>
             <div class="weui-flex__item model_fex_text-align">单位</div>
-            <div class="weui-flex__item model_fex_text-align">含税价</div>
+            <%--<div class="weui-flex__item model_fex_text-align">含税价</div>--%>
             <div class="weui-flex__item model_fex_text-align">除税价</div>
             <div class="weui-flex__item model_fex_text-align">分析</div>
         </div>
@@ -67,7 +67,7 @@
             <div class="weui-flex__item model_fex_text-align">${w.materialName}</div>
             <div class="weui-flex__item model_fex_text-align">${w.specifications}</div>
             <div class="weui-flex__item model_fex_text-align">${w.unit}</div>
-            <div class="weui-flex__item model_fex_text-align">/</div>
+            <%--<div class="weui-flex__item model_fex_text-align">/</div>--%>
             <div class="weui-flex__item model_fex_text-align">${w.excludingTax}</div>
             <div class="weui-flex__item model_fex_text-align"><a class="css_a_href" href="/workMaterialCollect/total/project.view.do?id=${w.id}&itemId=${itemId}">查看</a></div>
         </div>