员工管理

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

@@ -7,15 +7,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.app.service.IDetailService;
 import org.jeecg.modules.app.vo.PlaceInfoVO;
-import org.jeecg.modules.app.vo.stadium.StadiumConcertsVO;
+import org.jeecg.modules.app.vo.stadium.StadiumConcertsResponseVO;
 import org.jeecg.modules.app.vo.stadium.StadiumFindById;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 
 @Slf4j
 @Tag(name = "App体育馆场次选择")
@@ -35,7 +33,7 @@ public class StadiumController {
      **/
     @GetMapping("/getPlaceInfo")
     @Operation(summary = "场次详情查询-缺少已定状态和可预约数逻辑 ")
-    public Result<List<StadiumConcertsVO>> findConcerts(StadiumFindById stadiumFindById){
+    public Result<StadiumConcertsResponseVO> findConcerts(StadiumFindById stadiumFindById){
         String site_id = "1942781931946946561";
         String category_id = "1942391828774895617";
         return iDetailService.findConcerts(site_id,category_id);

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

@@ -6,7 +6,7 @@ import org.jeecg.modules.app.vo.CourseInfoVO;
 import org.jeecg.modules.app.vo.PlaceInfoVO;
 import org.jeecg.modules.app.vo.course.CourseRequestVo;
 import org.jeecg.modules.app.vo.course.CourseResponseVo;
-import org.jeecg.modules.app.vo.stadium.StadiumConcertsVO;
+import org.jeecg.modules.app.vo.stadium.StadiumConcertsResponseVO;
 import org.jeecg.modules.system.app.entity.AppCategory;
 
 import java.util.List;
@@ -48,7 +48,7 @@ public interface IDetailService {
      **/
     PlaceInfoVO.theGymnasiumIsCharteredVO getPlaceInfoNoFixation(String id, String categoryId);
 
-    Result<List<StadiumConcertsVO>> findConcerts(String siteId, String categoryId);
+    Result<StadiumConcertsResponseVO> findConcerts(String siteId, String categoryId);
 
     /**
      * @Author SheepHy

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

@@ -15,6 +15,7 @@ import org.jeecg.modules.app.vo.PlaceInfoVO;
 import org.jeecg.modules.app.vo.course.CourseRequestVo;
 import org.jeecg.modules.app.vo.course.CourseResponseVo;
 import org.jeecg.modules.app.vo.stadium.ConcertsVO;
+import org.jeecg.modules.app.vo.stadium.StadiumConcertsResponseVO;
 import org.jeecg.modules.app.vo.stadium.StadiumConcertsVO;
 import org.jeecg.modules.system.app.entity.*;
 import org.jeecg.modules.system.app.mapper.*;
@@ -182,8 +183,12 @@ public class DetailServiceImpl implements IDetailService {
     }
 
     @Override
-    public Result<List<StadiumConcertsVO>> findConcerts(String siteId, String categoryId) {
+    public Result<StadiumConcertsResponseVO> findConcerts(String siteId, String categoryId) {
         List<NextSevenDayVo> nextSevenDays = TimeRangeFinder.getNextSevenDays();
+        StadiumConcertsResponseVO  stadiumConcertsResponseVO = appSitePlaceMapper.findBySidAndCid(siteId,categoryId);
+        if (stadiumConcertsResponseVO==null){
+            stadiumConcertsResponseVO = new StadiumConcertsResponseVO();
+        }
         List<StadiumConcertsVO> stadiumConcertsVOS = new ArrayList<>();
         for (NextSevenDayVo nextSevenDay : nextSevenDays) {
             StadiumConcertsVO stadiumConcertsVO = new StadiumConcertsVO();
@@ -197,7 +202,8 @@ public class DetailServiceImpl implements IDetailService {
             stadiumConcertsVO.setConcertsVOList(concertsVOList);
             stadiumConcertsVOS.add(stadiumConcertsVO);
         }
-        return Result.ok(stadiumConcertsVOS);
+        stadiumConcertsResponseVO.setStadiumConcertsVOList(stadiumConcertsVOS);
+        return Result.ok(stadiumConcertsResponseVO);
     }
 
     @Override

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/stadium/ConcertsDetailsVO.java

@@ -19,13 +19,13 @@ public class ConcertsDetailsVO {
     private String id;
     /**场所名称*/
     @Schema(description = "场所开始时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
-    @DateTimeFormat(pattern="HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
+    @DateTimeFormat(pattern="HH:mm")
     private Date startTime;
     /**场所明细*/
     @Schema(description = "场所结束时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
-    @DateTimeFormat(pattern="HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
+    @DateTimeFormat(pattern="HH:mm")
     private Date endTime;
     /**当天场次已预约数*/
     @Schema(description = "场所状态0-未预约；1-已预约")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppSitePlaceMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.system.app.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.app.vo.PlaceInfoVO;
 import org.jeecg.modules.app.vo.stadium.ConcertsVO;
+import org.jeecg.modules.app.vo.stadium.StadiumConcertsResponseVO;
 import org.jeecg.modules.system.app.entity.AppSitePlace;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -23,5 +24,7 @@ public interface AppSitePlaceMapper extends BaseMapper<AppSitePlace> {
      **/
     List<PlaceInfoVO.PlaceInfoGymMsgVO> getPlaceInfoNoFixation(@Param("id")String id);
 
-    List<ConcertsVO> findByConcerts(Integer weekDay, String siteId, String categoryId);
+    List<ConcertsVO> findByConcerts(@Param("weekDay")Integer weekDay, @Param("siteId")String siteId, @Param("categoryId")String categoryId);
+
+    StadiumConcertsResponseVO findBySidAndCid(@Param("siteId")String siteId,@Param("categoryId") String categoryId);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSitePlaceMapper.xml

@@ -42,4 +42,7 @@
         from nm_site_place a left join  nm_site_price_rules b on a.id = b.site_place_id
         where a.site_id = #{siteId} and b.category_id =#{categoryId} and b.day_of_week =#{weekDay}
     </select>
+    <select id="findBySidAndCid" resultType="org.jeecg.modules.app.vo.stadium.StadiumConcertsResponseVO">
+        select early_refund_time,buy_limit from nm_site_place where site_id = #{siteId} and category_id =#{categoryId} limit 1
+    </select>
 </mapper>

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

@@ -2,7 +2,6 @@ package org.jeecg.modules.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -11,12 +10,10 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ImportExcelUtil;
 import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.jeecg.modules.system.entity.SysDepart;
@@ -685,5 +682,15 @@ public class SysDepartController {
 		}
 		return Result.error("文件导入失败！");
 	}
+
+	/**
+	 * 查询当前用户所拥有的部门信息
+	 * @return
+	 */
+	@GetMapping("findByDeptList")
+	public Result<List<SysDepart>> findByDeptList() {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		return sysDepartService.findByDeptList(loginUser.getOrgCode());
+	}
 	
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -204,4 +204,6 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	Integer findByParentIdCount(@Param("parentId") String parentId);
 
 	FindByMerchantIdResponseDTO findByMerchntId(@Param("id")  String id);
+
+    String findByDeptList(@Param("orgCode") String orgCode);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -243,4 +243,7 @@
         where sd.del_flag=0 and sd.id= #{id};
 
     </select>
+    <select id="findByDeptList" resultType="java.lang.String">
+        select * from sys_depart where del_flag=0 and org_code like CONCAT('',#{orgCode},'%')
+    </select>
 </mapper>

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

@@ -253,4 +253,6 @@ public interface ISysDepartService extends IService<SysDepart>{
     Result<String> updateMerchntId(AddMerchantRequestDTO addMerchantRequestDTO);
 
     Result<String> resetPassword(String id);
+
+    Result<List<SysDepart>> findByDeptList(String orgCode);
 }

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

@@ -1495,6 +1495,11 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		return Result.ok("重置密码成功");
 	}
 
+	@Override
+	public Result<List<SysDepart>> findByDeptList(String orgCode) {
+		return Result.ok(departMapper.findByDeptList(orgCode));
+	}
+
 	/**
 	 * 寻找部门路径
 	 *