Merge remote-tracking branch 'origin/V0.0.8' into V0.0.8

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeController.java

@@ -1,6 +1,7 @@
 package com.xunmei.system.controller;
 
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
@@ -102,7 +103,13 @@ public class SysWorkTimeController extends BaseController {
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PostMapping("/saveOneWorkTime")
     public AjaxResult edit(@RequestBody SysWorkTime sysWorkTime) {
-        sysWorkTimeService.updateSysWorkTime(sysWorkTime);
+         if(ObjectUtil.isNull(sysWorkTime.getId()))
+         {
+             sysWorkTimeService.insertSysWorkTime(sysWorkTime);
+         }
+         else{
+             sysWorkTimeService.updateSysWorkTime(sysWorkTime);
+         }
         applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(
                 this, ListUtil.list(true, sysWorkTime.getOrgId()),ListUtil.toList(sysWorkTime)));
         return success();

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeSetController.java

@@ -78,6 +78,15 @@ public class SysWorkTimeSetController extends BaseController {
         return success(workTimeSet);
     }
 
+    /**
+     * 获取作息设置详细信息
+     */
+    @ApiOperation(value = "获取SysWorkTimeSet详细信息")
+//    @RequiresPermissions("system:set:query")
+    @GetMapping(value = "/orgId/{orgId}")
+    public AjaxResult getByOrgId(@PathVariable("orgId") Long orgId) {
+        return success(sysWorkTimeSetService.selectSysWorkTimeSetByOrgId(orgId));
+    }
 
     /**
      * 获取作息设置详细信息

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysWorkTimeSetMapper.java

@@ -28,6 +28,15 @@ public interface SysWorkTimeSetMapper extends BaseMapper<SysWorkTimeSet> {
      * @return 作息设置
      */
      SysWorkTimeSet selectSysWorkTimeSetById(Long id);
+
+    /**
+     * 查询作息设置
+     *
+     * @param orgId 作息设置主键
+     * @return 作息设置
+     */
+    SysWorkTimeSet selectSysWorkTimeSetByOrgId(Long orgId);
+
     @MapKey("id")
      IPage<SysWorkTimeSet> selectByPage(Page<SysWorkTimeSet> page,SysWorkTimeSet sysWorkTimeSet );
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysWorkTimeSetService.java

@@ -23,6 +23,14 @@ public interface ISysWorkTimeSetService extends IService<SysWorkTimeSet> {
      */
     SysWorkTimeSet selectSysWorkTimeSetById(Long id);
 
+    /**
+     * 查询作息设置
+     *
+     * @param orgId 作息设置主键
+     * @return 作息设置
+     */
+    SysWorkTimeSet selectSysWorkTimeSetByOrgId(Long orgId);
+
     AjaxResult add(SysWorkTimeSet request);
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -277,6 +277,41 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
     }
 
     /**
+     * 查询作息设置
+     *
+     * @param orgId 作息设置主键
+     * @return 作息设置
+     */
+    @Override
+    public SysWorkTimeSet selectSysWorkTimeSetByOrgId(Long orgId) {
+        SysWorkTimeSet sysWorkTimeSet = sysWorkTimeSetMapper.selectSysWorkTimeSetByOrgId(orgId);
+        if (sysWorkTimeSet != null) {
+            sysWorkTimeSet.setDayOfWeeks(sysWorkTimeSetDayofweekMapper.selectList(new QueryWrapper<SysWorkTimeSetDayofweek>().eq("work_time_set_id", sysWorkTimeSet.getId())));
+            for (SysWorkTimeSetDayofweek day :
+                    sysWorkTimeSet.getDayOfWeeks()) {
+                if (day.getDayOfWeek() == 1) {
+                    day.setDayOfWeekText("星期天");
+                } else if (day.getDayOfWeek() == 2) {
+                    day.setDayOfWeekText("星期一");
+                } else if (day.getDayOfWeek() == 3) {
+                    day.setDayOfWeekText("星期二");
+                } else if (day.getDayOfWeek() == 4) {
+                    day.setDayOfWeekText("星期三");
+                } else if (day.getDayOfWeek() == 5) {
+                    day.setDayOfWeekText("星期四");
+                } else if (day.getDayOfWeek() == 6) {
+                    day.setDayOfWeekText("星期五");
+                } else if (day.getDayOfWeek() == 7) {
+                    day.setDayOfWeekText("星期六");
+                }
+            }
+        }
+        return sysWorkTimeSet;
+    }
+
+
+
+    /**
      * 1）配置模版后立即自动生成生效日期到今年和次年的作息，
      * 2）定时任务在每年11月15日自动生成下一年的作息。
      * 3）修改作息模版后，自动修改生效日期后的已生成的作息

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysWorkTimeSetMapper.xml

@@ -111,6 +111,11 @@
             <include refid="selectSysWorkTimeSetVo"/>
             where id = #{id}
     </select>
+    <select id="selectSysWorkTimeSetByOrgId" parameterType="Long"
+            resultMap="SysWorkTimeSetResult">
+        <include refid="selectSysWorkTimeSetVo"/>
+        where org_id = #{orgId}
+    </select>
     <select id="selectByPage" resultType="com.xunmei.system.domain.SysWorkTimeSet">
 
 select  * from sys_work_time_set