bug xiugai1102=01

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentManageVo.java

@@ -127,4 +127,6 @@ public class EquipmentManageVo  implements Serializable {
     private String address;
 
     private String fullName;
+
+    private String categoryCode;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -841,12 +841,14 @@ public class PointServiceImpl implements IPointService {
         String excludeItems = list.get(0).getExcludeItems();
         if(excludeItems!=null){
             resList.forEach(e->{
-                if("WGJC".equals(e.get("input_classify").toString())){
-                    e.put("input_classify","外观检查");
-                }else if("GNCS".equals(e.get("input_classify").toString())){
-                    e.put("input_classify","功能测试");
-                }else if("HJJC".equals(e.get("input_classify").toString())){
-                    e.put("input_classify","环境检查");
+                if (e.containsKey("input_classify")) {
+                    if ("WGJC".equals(e.get("input_classify").toString())) {
+                        e.put("input_classify", "外观检查");
+                    } else if ("GNCS".equals(e.get("input_classify").toString())) {
+                        e.put("input_classify", "功能测试");
+                    } else if ("HJJC".equals(e.get("input_classify").toString())) {
+                        e.put("input_classify", "环境检查");
+                    }
                 }else{
                     e.put("input_classify","其他");
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -571,7 +571,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
         iRoutePointItemDao.saveAll(routePointList);
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void updateRoutePointInputItemNew(Long routeId, Long pointId, List<Long> inputItemIds) {
         Long[] pointIds = {pointId};
         List<RoutePoint> oldRoutePointList = iRoutePointDao.queryRoutePoint(routeId, pointIds);
@@ -583,7 +583,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
            }else{
                RoutePoint.setExcludeItems(null);
            }
-            iRoutePointDao.save(RoutePoint);
+            iRoutePointDao.saveAndFlush(RoutePoint);
         }
     }
 

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -208,13 +208,13 @@
 		ppi.order_no as pOrderNo,
 		ppi.id as pointItemId,
 		ppc.name as classifyNames,
-		ppc.id as classifyIds,
-		prpi.id  as routePointItemId
+		ppc.id as classifyIds
+<!--		,prpi.id  as routePointItemId-->
 		FROM
 		p_point_classify ppc
 		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
-		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id
+<!--		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id-->
 		WHERE pii.is_delete = '0'
 		<if test="classifyId!=null and classifyId !='' "> AND ppc.id = #{classifyId}</if>
 <!--		<if test="pointId!=null and pointId !='' "> AND ppc.point_id = #{pointId}</if>-->