fix(app):

1.部门门店创建逻辑修改

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppOrderController.java

@@ -1,43 +1,25 @@
 package org.jeecg.modules.system.app.controller;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.app.entity.AppOrder;
-import org.jeecg.modules.system.app.service.IAppOrderService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.system.app.entity.AppOrder;
+import org.jeecg.modules.system.app.service.IAppOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
  /**
  * @Description: 订单表
  * @Author: jeecg-boot
@@ -75,6 +57,22 @@ public class AppOrderController extends JeecgController<AppOrder, IAppOrderServi
 		IPage<AppOrder> pageList = appOrderService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+
+//	 /**
+//	  *
+//	  * @param appOrderPageForm
+//	  * @return
+//	  */
+//	 @Operation(summary="订单-分页列表查询")
+//	 @GetMapping(value = "/page")
+//	 public Result<IPage<AppOrder>> queryPage(@RequestBody AppOrderPageForm appOrderPageForm) {
+//
+//
+//		 QueryWrapper<AppOrder> queryWrapper = QueryGenerator.initQueryWrapper(appOrder, req.getParameterMap());
+//		 Page<AppOrder> page = new Page<AppOrder>(pageNo, pageSize);
+//		 IPage<AppOrder> pageList = appOrderService.page(page, queryWrapper);
+//		 return Result.OK(pageList);
+//	 }
 	
 	/**
 	 *   添加

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -712,6 +712,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
         if (ObjectUtils.notEqual(site.getTeachingDay(), schoolPlaceAddDTO.getTeachingDay()) || ObjectUtils.notEqual(site.getNoTeachingDay(), schoolPlaceAddDTO.getNoTeachingDay())) {
 
             site.setTeachingDay(schoolPlaceAddDTO.getTeachingDay());
+            site.setNoTeachingDay(schoolPlaceAddDTO.getNoTeachingDay());
 
             int year = DateUtils.getYear();
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -29,10 +29,7 @@ import org.jeecg.modules.system.app.dto.TeachingDayDTO;
 import org.jeecg.modules.system.app.dto.merchant.AddMerchantRequestDTO;
 import org.jeecg.modules.system.app.dto.merchant.FindByMerchantIdResponseDTO;
 import org.jeecg.modules.system.app.dto.merchant.FindMerchantResponseDTO;
-import org.jeecg.modules.system.app.entity.AppSite;
-import org.jeecg.modules.system.app.entity.AppSitePlace;
-import org.jeecg.modules.system.app.entity.AppSitePriceRules;
-import org.jeecg.modules.system.app.entity.AppTeachingTime;
+import org.jeecg.modules.system.app.entity.*;
 import org.jeecg.modules.system.app.mapper.AppSiteMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePlaceMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePriceRulesMapper;
@@ -248,6 +245,18 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
                         .setName(sysDepart.getDepartName())
                         .setType(sysDepart.getOrgCategory().equals("2") ? 0 : 1);
                 appSiteMapper.insert(site);
+                //若为包场
+                if (Objects.equals(sysDepart.getOrgCategory(), "4")) {
+                    //常见默认类目
+                    List<String> categoryNames = List.of("篮球","足球","羽毛球","乒乓球","排球");
+                    for (int i = 0; i < categoryNames.size(); i++) {
+                        AppCategory category = new AppCategory();
+                        category.setOrgCode(site.getOrgCode());
+                        category.setTenantId(site.getTenantId());
+                        category.setName(categoryNames.get(i));
+                        category.setSort(i);
+                    }
+                }
                 //创建学校场地表
                 if (Objects.equals(sysDepart.getOrgCategory(), "2")){
                     AppSitePlace place = new AppSitePlace();
@@ -366,9 +375,15 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
                     }
 
                     //存放集合
-                    appTeachingTimeMapper.insertList(appteachingList);
+                    for (AppTeachingTime appTeachingTime : appteachingList) {
+                        appTeachingTimeMapper.insert(appTeachingTime);
+                    }
+
                     //存放开放时段列表
-                    appSitePriceRulesMapper.insertList(appSitePriceRulesList);
+                    for (AppSitePriceRules appSitePriceRules : appSitePriceRulesList) {
+                        appSitePriceRulesMapper.insert(appSitePriceRules);
+                    }
+
                 }
             }