Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -265,7 +265,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    IPage<SettleOrderVO> settleOrderList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitId") String websitId);
+    IPage<SettleOrderVO> settleOrderList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitIds") List<String> websitId);
 
     /**
      * 汇总结算单列表
@@ -273,7 +273,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    IPage<SettlePoolVO> settlePoolList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitId") String websitId);
+    IPage<SettlePoolVO> settlePoolList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitIds") List<String> websitId);
 
     /**
      * 汇总结算单明细

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -112,6 +112,14 @@ public class OrderBaseController {
     }
 
 
+    @PostMapping("/update")
+    @ApiOperation(value = "修改工单")
+    public ResponseHelper update(@Valid @RequestBody PgOrderBase pgOrderBase){
+         orderBaseLogic.update(pgOrderBase);
+        return ResponseHelper.success();
+    }
+
+
     @PostMapping("/save2")
     @ApiOperation(value = "保存工单(小程序端用)")
     public ResponseHelper save2(@Valid @RequestBody OrderAddBean2DTO orderAddBean2DTO){

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/OrderFlagEnum.java

@@ -28,6 +28,8 @@ public enum OrderFlagEnum implements BaseEnum {
     PARTS_ING("PARTS_ING","配件申请中",10),
     PARTS_END("PARTS_END","配件已到货",11),
     PARTS_CANCEL("PARTS_CANCEL","配件已取消",12),
+    ORDER4("ORDER4","4.0工单",13),
+    ORDER("ORDER4","自建工单",14),
     ;
 
     @EnumValue

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -95,9 +95,13 @@ public class AdminWebsitLogic {
             BeanUtils.copyProperties(adminWebsit, adminWebsitTree);
             trees.add(adminWebsitTree);
         }
-        AdminUserWebsitRela one = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
+        AdminUserWebsitRela one = adminUserWebsitRelaService.lambdaQuery()
+                .eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
+
         List<AdminWebsitTree> parentList = trees.stream()
-                .filter(x -> (one == null && x.getParentId().equals("0")) || (one != null && x.getWebsitId().equals(one.getAdminWebsitId()))).collect(Collectors.toList());
+                .filter(x -> (CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && x.getParentId().equals("0")) ||
+                        (!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && adminUser.getAdminWebsitIds().contains(x.getWebsitId())))
+                .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(parentList)) {
             parentList = trees.stream().filter(x -> x.getParentId().equals("0")).collect(Collectors.toList());
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -602,6 +602,7 @@ public class CountLogic {
         materialCount.setWebsitCheckNeverNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
                         flags.contains(item.getFlag())
+                        && item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
 
                 ).count())
         );
@@ -609,6 +610,7 @@ public class CountLogic {
         materialCount.setWebsitCheckYesNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
                         flags.contains(item.getFlag())
+                                && item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
 
                 ).count())
         );
@@ -662,7 +664,8 @@ public class CountLogic {
 
 
         materialCount.setWebsitOrderSaveNum(
-                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())).count())
+                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                        && item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())).count())
         );
 
         materialCount.setWebsitOrderSumbitNum(

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -347,6 +347,9 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setRemark(remark);
             pgOrderBase.insertOrUpdate();
 
+            //生成标签
+            orderFlagLogic.saveOrderFlag(Lists.newArrayList(pgOrderBase.getId()),OrderFlagEnum.ORDER);
+
             //生成待采集数据
             //orderBaseLogic.upOrderProduct(pgOrderBase.getId());
 
@@ -715,6 +718,9 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setUndoneNum(num);
             pgOrderBase.setOrderTitle(orderBaseLogic.getOrderTitle(pgOrderProducts));
             pgOrderBase.insertOrUpdate();
+
+            //生成标签
+            orderFlagLogic.saveOrderFlag(Lists.newArrayList(pgOrderBase.getId()),OrderFlagEnum.ORDER);
             //保存日志
             if (addFlag) {
                 //创建工单添加消息
@@ -1130,8 +1136,14 @@ public class OrderBaseExcelLogic {
                 pgOrderProducts.add(pgOrderProduct);
             }
             addPgOrderBase.add(pgOrderBase);
+
+
+
             pgOrderBase.insertOrUpdate();
 
+            //生成已完工标签
+            orderFlagLogic.saveOrderFlag(Lists.newArrayList(pgOrderBase.getId()),OrderFlagEnum.ORDER4);
+
         }
 
         //生成师傅信息

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -278,6 +278,9 @@ public class OrderBaseLogic {
         orderBase.setOrderTitle(orderTitle);
         orderBase.insertOrUpdate();
 
+        //生成已完工标签
+        orderFlagLogic.saveOrderFlag(Lists.newArrayList(orderBase.getId()),OrderFlagEnum.ORDER);
+
         //日志记录
         if (addFlag) {
             addLog(orderBase, "");
@@ -1655,4 +1658,10 @@ public class OrderBaseLogic {
         List<Map<String, Object>> maps = orderBaseCMapper.countOrderStatus2(adminUser.getCompanyWechatId(), adminUser.getAdminWebsitIds(), adminUser.getType(), orderSmallTypeText);
         return maps;
     }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PgOrderBase pgOrderBase) {
+        pgOrderBase.updateById();
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/SettleOrderLogic.java

@@ -51,9 +51,7 @@ public class SettleOrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.supplyParam(zfireParamBean, SettleOrderVO.class, adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
-        return commonMapper.settleOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, websitId);
+        return commonMapper.settleOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getAdminWebsitIds());
 
     }
 
@@ -370,9 +368,8 @@ public class SettleOrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.supplyParam(zfireParamBean, WebsitPurchaseVO.class, adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
-        return commonMapper.settlePoolList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, websitId);
+
+        return commonMapper.settlePoolList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getAdminWebsitIds());
 
     }
 

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -430,8 +430,13 @@
         ${ex.selected}
         FROM pg_settle_order a
         ${ex.query}
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="websitIds != null and websitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
@@ -444,8 +449,13 @@
         ${ex.selected}
         FROM pg_settle_pool a
         ${ex.query}
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="websitIds != null and websitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.pool_create_time DESC