Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/bean/result/SysNoticeResult.java

@@ -0,0 +1,35 @@
+package com.qmth.sop.business.bean.result;
+
+import com.qmth.sop.business.entity.SysCustom;
+import com.qmth.sop.business.entity.SysNotice;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 客户表
+ * </p>
+ *
+ * @author dhshu
+ * @since 2023-08-14
+ */
+
+public class SysNoticeResult extends SysNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "创建人")
+    private String createName;
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+}

sop-business/src/main/java/com/qmth/sop/business/mapper/SysNoticeMapper.java

@@ -2,6 +2,7 @@ package com.qmth.sop.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.sop.business.bean.result.SysNoticeResult;
 import com.qmth.sop.business.entity.SysNotice;
 import com.qmth.sop.common.enums.NoticeTypeEnum;
 import org.apache.ibatis.annotations.Param;
@@ -26,6 +27,6 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      * @param iPage
      * @return
      */
-    public IPage<SysNotice> query(IPage<Map> iPage, @Param("query") String query, @Param("status") String status, @Param("type") String type, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
+    public IPage<SysNoticeResult> query(IPage<Map> iPage, @Param("query") String query, @Param("status") String status, @Param("type") String type, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
 }

sop-business/src/main/java/com/qmth/sop/business/service/SysNoticeService.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.bean.result.SysNoticeResult;
 import com.qmth.sop.business.entity.SysNotice;
 import com.qmth.sop.common.enums.NoticeStatusEnum;
 import com.qmth.sop.common.enums.NoticeTypeEnum;
@@ -26,7 +27,7 @@ public interface SysNoticeService extends IService<SysNotice>{
     * @param iPage
     * @return
     */
-    IPage<SysNotice> query(IPage<Map> iPage, String query, NoticeStatusEnum status, NoticeTypeEnum type, Long startTime, Long endTime);
+    IPage<SysNoticeResult> query(IPage<Map> iPage, String query, NoticeStatusEnum status, NoticeTypeEnum type, Long startTime, Long endTime);
 
     /**
     * 新增修改公告表

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysNoticeServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
+import com.qmth.sop.business.bean.result.SysNoticeResult;
 import com.qmth.sop.business.entity.SysMessage;
 import com.qmth.sop.business.entity.SysNotice;
 import com.qmth.sop.business.entity.SysUser;
@@ -46,7 +47,7 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
      * @return
      */
     @Override
-    public IPage<SysNotice> query(IPage<Map> iPage, String query, NoticeStatusEnum status, NoticeTypeEnum type, Long startTime, Long endTime) {
+    public IPage<SysNoticeResult> query(IPage<Map> iPage, String query, NoticeStatusEnum status, NoticeTypeEnum type, Long startTime, Long endTime) {
         return this.baseMapper.query(iPage,query, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, startTime, endTime);
     }
 

sop-business/src/main/resources/mapper/SysNoticeMapper.xml

@@ -2,11 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.sop.business.mapper.SysNoticeMapper">
 
-    <select id="query" resultType="com.qmth.sop.business.entity.SysNotice">
-        select * from sys_notice a
+    <select id="query" resultType="com.qmth.sop.business.bean.result.SysNoticeResult">
+        select a.*,su.real_name as createName from sys_notice a
+        left join sys_user su on su.id = a.create_id
         <where>
             <if test="query != null and query != ''">
-                and a.name like concat('%', #{query} , '%')
+                and a.content like concat('%', #{query} , '%')
             </if>
             <if test="status != null and status != ''">
                 and a.status = #{status}

sop-server/src/main/java/com/qmth/sop/server/api/SysNoticeController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.sop.business.bean.result.SysNoticeResult;
 import com.qmth.sop.business.entity.SysNotice;
 import com.qmth.sop.business.service.SysNoticeService;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -42,7 +43,7 @@ public class SysNoticeController {
    
     @ApiOperation(value = "公告表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "公告表查询结果", response = SysNotice.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "公告表查询结果", response = SysNoticeResult.class)})
     public Result query(
                 @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
                 @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) NoticeStatusEnum status,
@@ -51,7 +52,7 @@ public class SysNoticeController {
                 @ApiParam(value = "发布时间结束", required = false) @RequestParam(required = false) Long endTime,
                 @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                 @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<SysNotice> resultIPage = sysNoticeService.query(new Page<>(pageNumber, pageSize),query,status,type,startTime,endTime);
+        IPage<SysNoticeResult> resultIPage = sysNoticeService.query(new Page<>(pageNumber, pageSize),query,status,type,startTime,endTime);
 
         return ResultUtil.ok(resultIPage);
     }

sop-server/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -52,7 +52,7 @@ public class TBDingController {
     @Resource
     AsyncDingCountExportService asyncDingCountExportService;
 
-    @Aac(auth = BOOL.FALSE)
+
     @ApiOperation(value = "考勤打卡统计查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤打卡统计查询结果", response = TBDingCountQueryResult.class)})
@@ -73,7 +73,7 @@ public class TBDingController {
     }
 
 
-    @Aac(auth = BOOL.FALSE)
+
     @ApiOperation(value = "考勤打卡统计接口")
     @RequestMapping(value = "/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤打卡统计结果", response = TBDingCountResult.class)})
@@ -89,7 +89,7 @@ public class TBDingController {
         return ResultUtil.ok(result);
     }
 
-    @Aac(auth = BOOL.FALSE)
+
     @ApiOperation(value = "考勤打卡统计导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})