灵活业务h5端

sp-admin/sa-view/tb-item-type/tb-item.html

@@ -79,10 +79,11 @@
 					updateStatus: function(data) {
 						// 声明变量记录是否成功 
 						var isOk = false;
-						var oldValue = data.status;
-						var ajax = sa.ajax('/TbCostomer/updateStatus', {
-							id: data.id,
-							value: data.status
+						var oldValue = data.need;
+						var ajax = sa.ajax('/RelationTypeItem/updateStatus', {
+							itemId: data.id,
+							typeId:data.typeId,
+							need: data.need
 						}, function(res) {
 							isOk = true;
 							sa.msg('修改成功');
@@ -90,7 +91,7 @@
 						// 如果未能修改成功, 则回滚 
 						$.when(ajax).done(function() {
 							if (isOk == false) {
-								data.status = oldValue;
+								data.need = oldValue;
 							}
 						})
 					},

sp-server/app.pid

@@ -1 +1 @@
-27188
+14748

sp-server/src/main/java/com/pj/project/relation_type_item/RelationTypeItemController.java

@@ -64,5 +64,15 @@ public class RelationTypeItemController {
         return AjaxJson.getSuccess();
     }
 
+    @RequestMapping("updateStatus")
+    public AjaxJson updateStatus() {
+        SoMap so = SoMap.getRequestSoMap();
+        String typeId = so.getString("typeId");
+        String itemId = so.getString("itemId");
+        String need = so.getString("need");
+        relationTypeItemService.updateStatus(typeId, itemId,need);
+        return AjaxJson.getSuccess();
+    }
+
 
 }

sp-server/src/main/java/com/pj/project/relation_type_item/RelationTypeItemService.java

@@ -72,4 +72,13 @@ public class RelationTypeItemService extends ServiceImpl<RelationTypeItemMapper,
         relationTypeItem.setNeed("1").setItemId(itemId).setTypeId(typeId);
         this.save(relationTypeItem);
     }
+
+    public void updateStatus(String typeId, String itemId, String need) {
+        QueryWrapper<RelationTypeItem>ew=new QueryWrapper<>();
+        ew.eq("type_id",typeId);
+        ew.eq("item_id",itemId);
+        RelationTypeItem relationTypeItem= this.getOne(ew);
+        relationTypeItem.setNeed(need);
+        this.updateById(relationTypeItem);
+    }
 }

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfect.java

@@ -78,7 +78,7 @@ public class TbDisinfect extends Model<TbDisinfect> implements Serializable {
 	/**
 	 * 规格 
 	 */
-	private Double unit;	
+	private String unit;
 
 	/**
 	 * 包装 

sp-server/src/main/java/com/pj/project/tb_item/TbItemMapper.java

@@ -28,4 +28,6 @@ public interface TbItemMapper extends BaseMapper <TbItem> {
 
 
 	List<TbItem> getTypeItemList(SoMap soMap);
+
+    List<TbItem> getItemTypeById(String typeId);
 }

sp-server/src/main/java/com/pj/project/tb_item/TbItemMapper.xml

@@ -59,7 +59,7 @@
             a.min_length,
             a.min_weight,
             a.max_weight,
-            b.need,
+            b.need,b.type_id,
             a.unit
         FROM
             tb_item a,
@@ -67,6 +67,10 @@
         WHERE
             a.id = b.item_id
            	and b.type_id=#{typeId}
+           	and a.status=1
+    </select>
+	<select id="getItemTypeById" resultType="com.pj.project.tb_item.TbItem">
+        select a.*,b.need as need from tb_item a ,relation_type_item b where a.id=b.item_id and b.type_id=#{typeId} and a.status=1
     </select>
 
 

sp-server/src/main/java/com/pj/project/tb_item/TbItemService.java

@@ -51,9 +51,9 @@ public class TbItemService extends ServiceImpl<TbItemMapper, TbItem> implements
         return tbItemMapper.getTypeItemList(soMap);
     }
 
-    public List<TbItem> findByItemTypeId(String itemType) {
-        QueryWrapper<TbItem> ew = new QueryWrapper<>();
-        ew.eq("type_id", itemType);
-        return list(ew);
+
+
+    public List<TbItem> getItemTypeById(String typeId) {
+      return   tbItemMapper.getItemTypeById(typeId);
     }
 }

sp-server/src/main/java/com/pj/project/tb_item_type/TbItemTypeService.java

@@ -49,10 +49,7 @@ public class TbItemTypeService extends ServiceImpl<TbItemTypeMapper, TbItemType>
      * 查
      */
     TbItemType getById(String id) {
-        TbItemType itemType = super.getById(id);
-        List<TbItem> tbItems = tbItemService.findByItemTypeId(id);
-        itemType.setItems(tbItems);
-        return itemType;
+        return super.getById(id);
     }
 
     /**
@@ -65,11 +62,8 @@ public class TbItemTypeService extends ServiceImpl<TbItemTypeMapper, TbItemType>
 
     public TbItemType getItemTypeById(String id) {
         TbItemType tbItemType = super.getById(id);
-        List<RelationTypeItem> relationTypeItems = relationTypeItemService.findByTypeId(id);
-        List<String> itemIss = relationTypeItems.stream().map(RelationTypeItem::getItemId).collect(Collectors.toList());
-        if (!itemIss.isEmpty()){
-            tbItemType.setItems(tbItemService.listByIds(itemIss));
-        }
+       List<TbItem>items= tbItemService.getItemTypeById(id);
+       tbItemType.setItems(items);
         return tbItemType;
     }
 }