处理安卓端提出的问题

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -25,6 +25,7 @@ import com.github.zuihou.cfg.WxPayCfg;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.service.WxPayService;
 import com.github.zuihou.utils.WxPayUtil;
 import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
@@ -93,6 +94,14 @@ public class AndroidApi {
     public R<List<EquGoodsDto>> goodsList(@RequestParam(name = "equId", required = true) Long equId) {
         BaseContextHandler.setTenant("0000");
         List<EquGoodsDto> equGoods = productionTenantResourceService.getEquGoods(equId);
+        equGoods.forEach((item) ->
+                {
+                    QueryWrap<Spe> speQueryWrap = new QueryWrap<>();
+                    speQueryWrap.eq("goods_id", item.getGoodsId());
+                    List<Spe> list = speService.list(speQueryWrap);
+                    item.setSpeList(list);
+                }
+        );
         return R.success(equGoods);
     }
 
@@ -201,13 +210,14 @@ public class AndroidApi {
     //料筒查询接口
 
     @ApiOperation("料筒查询接口")
-    @PostMapping({"/getBarrelList"})
+    @GetMapping({"/getBarrelList"})
     public R<List<EquBarrel>> getBarrelList(@RequestParam(name = "equId", required = true) Long equId) {
         BaseContextHandler.setTenant("0000");
-        HashMap<String, Object> paramMap = new HashMap<>();
-        paramMap.put("equId", equId);
-        List<EquBarrel> barrelList = barrelService.listByMap(paramMap);
-        return R.success(barrelList);
+
+        QueryWrap<EquBarrel> queryWrap = new QueryWrap<>();
+        queryWrap.eq("equ_id", equId);
+        List<EquBarrel> list = barrelService.list(queryWrap);
+        return R.success(list);
 
     }
 
@@ -452,7 +462,7 @@ public class AndroidApi {
         HashMap<String, String> saveMap = new HashMap<>();
         saveMap.put("status", equStatus);
         saveMap.put("errMsg", errMsg);
-        redisTemplate.opsForHash().putAll("equStatus" + equId,saveMap);
+        redisTemplate.opsForHash().putAll("equStatus" + equId, saveMap);
 //        redisTemplate.opsForHash().pu
 //
 //        redisTemplate.opsForHash().putIfAbsent("status" + equId, "equStatus", equStatus);

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productConfig/ProductConfigController.java

@@ -121,7 +121,7 @@ public class ProductConfigController extends SuperController<ProductConfigServic
         log.info("进入updateConfig");
 //        boolean b = baseService.updateById(productConfig);
 //        生产工艺更新成功
-        if (1==1) {
+        if (1 == 1) {
 //                更新工艺配方
             List<Formula> formulaList = productConfig.getFormula();
             if (formulaList != null) {