机统计列表修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java

@@ -52,4 +52,10 @@ public interface ProduceService {
      * @return
      */
     List<Produce> listSelectProduct(Produce produce);
+
+    /**
+     * 获取第一条产品
+     * @return
+     */
+    Produce getProduceByOne();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -256,4 +256,9 @@ public class ProduceServiceImpl implements ProduceService {
     public List<Produce> listSelectProduct(Produce produce) {
         return produceMapper.listSelectProduct(produce);
     }
+
+    @Override
+    public Produce getProduceByOne() {
+        return produceMapper.getProduceByOne();
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java

@@ -73,4 +73,10 @@ public interface ProduceMapper {
    //删除节点操作
     Integer delNode(String delNodeId[]);
 
+
+    /**
+     * 获取第一条产品
+     * @return
+     */
+    Produce getProduceByOne();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -420,5 +420,20 @@
         </foreach>
     </delete>
 
-
+    <select id="getProduceByOne" parameterType="Produce" resultType="Produce">
+        SELECT
+        produce_id AS produceId,
+        produce_no AS  produceNo,
+        produce_type AS  produceType,
+        produce_name AS produceName,
+        produce_status AS  produceStatus,
+        produce_pattern AS producePattern,
+        produce_model AS produceModel,
+        produce_feature AS  produceFeature,
+        produce_remake AS produceRemake,
+        produce_create_time AS  produceCreateTime,
+        produce_update_time AS produceUpdateTime
+        FROM
+        tb_rst_pts_produce LIMIT 1
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -260,15 +260,16 @@ public class AdminMachineController {
     public ModelAndView producedAbnormalityStatistics(HttpServletRequest request, PtsMachine ptsMachine) {
         ModelAndView mv = new ModelAndView("pts/machine/producedAbnormalityStatistics");
         String produceId = request.getParameter("produceId");//1.产品id
+        Produce produce = new Produce();
         if (produceId == null || produceId.equals("")) {
-            produceId = "1";//默认为第一个产品
+            produce = produceService.getProduceByOne();//默认为第一个产品
+
+        }else{
+            produce.setProduceId(Integer.valueOf(produceId));
+            produce = produceService.getProduce(produce);
         }
-        mv.addObject("produceId", produceId);
+        mv.addObject("produceId", produce.getProduceId());
         //根据产品id查询产品类型
-        Produce produce = new Produce();
-        produce.setProduceId(Integer.valueOf(produceId));
-        produce = produceService.getProduce(produce);
-
         PtsMachineStatistics ptsMachineStatistics = new PtsMachineStatistics();
         Calendar date = Calendar.getInstance();
         String year = String.valueOf(date.get(Calendar.YEAR));//年

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/producedAbnormalityStatistics.ftl

@@ -26,7 +26,7 @@
 
     <#if (produceList ?size > 0)>
         <#list produceList as list>
-            <a style="width: 100px;" <#if produceId == (""+list.produceId)>class="active"</#if>  onclick="machineTypeNormal(${list.produceId});">${list.produceName}</a>
+            <a style="width: 100px;" <#if produceId == list.produceId>class="active"</#if>  onclick="machineTypeNormal(${list.produceId});">${list.produceName}</a>
         </#list>
     </#if>
 	</nav>