1、开发签到记录接口筛选

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -918,6 +918,11 @@ public class RiskPlanAppController extends BaseController {
     public AjaxResult saveSign(RiskSignRecord riskSignRecord
             , @RequestParam(value = "file[]", required = false) MultipartFile[] file)
     {
+        //判断当前人、当前项目今天是否加班
+        if(!riskSignRecordService.checkByUserIdAndProjectIdDate(riskSignRecord.getUserId(),riskSignRecord.getProjectId()
+                ,riskSignRecord.getType(),new Date())){
+            return AjaxResult.error("当前项目今天您已提交"+(riskSignRecord.getType()?"签到":"签退")+"记录！");
+        }
         riskSignRecord.setCreateBy(getLoginUser().getUsername());
         riskSignRecord.setCreateTime(new Date());
         if (file != null) {

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskSignRecordController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.censoft.censoftrongtong.domain.RiskSignRecord;
+import com.censoft.censoftrongtong.domain.dto.RiskSignRecordShowDto;
 import com.censoft.censoftrongtong.service.IRiskSignRecordService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +41,10 @@ public class RiskSignRecordController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:record:list')")
     @GetMapping("/list")
-    public TableDataInfo list(RiskSignRecord riskSignRecord)
+    public TableDataInfo list(RiskSignRecordShowDto riskSignRecordShowDto)
     {
         startPage();
-        List<RiskSignRecord> list = riskSignRecordService.selectRiskSignRecordList(riskSignRecord);
+        List<RiskSignRecordShowDto> list = riskSignRecordService.selectRiskSignRecordShowDtoList(riskSignRecordShowDto);
         return getDataTable(list);
     }
 
@@ -55,7 +56,7 @@ public class RiskSignRecordController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, RiskSignRecord riskSignRecord)
     {
-        List<RiskSignRecord> list = riskSignRecordService.selectRiskSignRecordList(riskSignRecord);
+        List<RiskSignRecord> list = riskSignRecordService.selectRiskSignRecordShowDtoList(riskSignRecord);
         ExcelUtil<RiskSignRecord> util = new ExcelUtil<RiskSignRecord>(RiskSignRecord.class);
         util.exportExcel(response, list, "签到签退记录数据");
     }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskSignRecordShowDto.java

+package com.censoft.censoftrongtong.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 签到签退记录表 risk_sign_record
+ * 
+ * @author ruoyi
+ * @date 2023-06-26
+ */
+@Data
+public class RiskSignRecordShowDto{
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 0-签到 1-签退 */
+    private Boolean type;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 用户id */
+    private String userName;
+
+    /** 项目id */
+    private Long projectId;
+
+    /** 项目id */
+    private String projectName;
+
+    /** deptid */
+    private Long deptId;
+
+    /** deptid */
+    private String deptName;
+
+    /** 文件ids */
+    private String fileIds;
+
+    private Date createTime;
+
+    private String remark;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskSignRecordMapper.java

@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LawList;
 import com.censoft.censoftrongtong.domain.RiskSignRecord;
+import com.censoft.censoftrongtong.domain.dto.RiskSignRecordShowDto;
 import com.github.yulichang.base.MPJBaseMapper;
 
 import java.util.List;
@@ -63,4 +64,5 @@ public interface RiskSignRecordMapper extends  MPJBaseMapper<RiskSignRecord>
     public int deleteRiskSignRecordByIds(Long[] ids);
 
 
+    List<RiskSignRecordShowDto> selectRiskSignRecordShowDtoList(RiskSignRecordShowDto riskSignRecord);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskSignRecordService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskSignRecord;
+import com.censoft.censoftrongtong.domain.dto.RiskSignRecordShowDto;
 import com.github.yulichang.base.MPJBaseService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,7 +32,7 @@ public interface IRiskSignRecordService extends MPJBaseService<RiskSignRecord> {
      * @param riskSignRecord 签到签退记录
      * @return 签到签退记录集合
      */
-    public List<RiskSignRecord> selectRiskSignRecordList(RiskSignRecord riskSignRecord);
+    public List<RiskSignRecordShowDto> selectRiskSignRecordShowDtoList(RiskSignRecordShowDto riskSignRecord);
 
     /**
      * 新增签到签退记录
@@ -64,4 +66,14 @@ public interface IRiskSignRecordService extends MPJBaseService<RiskSignRecord> {
      */
     public int deleteRiskSignRecordById(Long id);
 
+    boolean checkByUserIdAndProjectIdDate(Long userId, Long projectId, Boolean type, Date date);
+
+
+    /**
+     * 查询签到签退记录列表
+     *
+     * @param riskSignRecord 签到签退记录
+     * @return 签到签退记录集合
+     */
+    public List<RiskSignRecord> selectRiskSignRecordShowDtoList(RiskSignRecord riskSignRecord);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskSignRecordServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.censoft.censoftrongtong.domain.LawList;
 import com.censoft.censoftrongtong.domain.RiskSignRecord;
-import com.censoft.censoftrongtong.mapper.LawListMapper;
+import com.censoft.censoftrongtong.domain.dto.RiskSignRecordShowDto;
 import com.censoft.censoftrongtong.mapper.RiskSignRecordMapper;
-import com.censoft.censoftrongtong.service.ILawListService;
 import com.censoft.censoftrongtong.service.IRiskSignRecordService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +54,11 @@ public class RiskSignRecordServiceImpl
         return riskSignRecordMapper.selectRiskSignRecordById(id);
     }
 
+    @Override
+    public List<RiskSignRecordShowDto> selectRiskSignRecordShowDtoList(RiskSignRecordShowDto riskSignRecord) {
+        return riskSignRecordMapper.selectRiskSignRecordShowDtoList(riskSignRecord);
+    }
+
     /**
      * 查询签到签退记录列表
      *
@@ -60,7 +66,7 @@ public class RiskSignRecordServiceImpl
      * @return 签到签退记录
      */
     @Override
-    public List<RiskSignRecord> selectRiskSignRecordList(RiskSignRecord riskSignRecord)
+    public List<RiskSignRecord> selectRiskSignRecordShowDtoList(RiskSignRecord riskSignRecord)
     {
         return riskSignRecordMapper.selectRiskSignRecordList(riskSignRecord);
     }
@@ -115,4 +121,25 @@ public class RiskSignRecordServiceImpl
         return riskSignRecordMapper.deleteRiskSignRecordById(id);
     }
 
+    @Override
+    public boolean checkByUserIdAndProjectIdDate(Long userId, Long projectId, Boolean type, Date date) {
+        LambdaQueryWrapper<RiskSignRecord> queryWrapper = new LambdaQueryWrapper<>();
+        if (userId != null) {
+            queryWrapper = queryWrapper.eq(RiskSignRecord::getUserId,userId);
+        }
+        if (projectId != null) {
+            queryWrapper = queryWrapper.eq(RiskSignRecord::getProjectId,projectId);
+        }
+        if (type != null) {
+            queryWrapper = queryWrapper.eq(RiskSignRecord::getType,type);
+        }
+        if (date != null) {
+            DateTime beginOfDate = DateUtil.beginOfDay(date);
+            DateTime endOfDate = DateUtil.endOfDay(date);
+            queryWrapper = queryWrapper.ge(RiskSignRecord::getCreateTime,beginOfDate);
+            queryWrapper = queryWrapper.le(RiskSignRecord::getCreateTime,endOfDate);
+        }
+        return list(queryWrapper).isEmpty();
+    }
+
 }

censoft-rongtong/src/main/resources/mapper/system/RiskSignRecordMapper.xml

@@ -36,6 +36,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRiskSignRecordVo"/>
         where id = #{id}
     </select>
+    <select id="selectRiskSignRecordShowDtoList"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskSignRecordShowDto">
+        SELECT
+            rsr.id,
+            rsr.type,
+            rsr.user_id AS userId,
+            su.nick_name AS userName,
+            rsr.project_id AS projectId,
+            lp.`name` AS projectName,
+            sd.dept_id AS deptId,
+            sd.dept_name AS deptName,
+            rsr.file_ids AS fileIds,
+            rsr.create_time AS createTime,
+            rsr.remark AS remark
+        FROM
+            risk_sign_record rsr
+                LEFT JOIN sys_user su ON su.user_id = rsr.user_id
+                LEFT JOIN ledger_project lp ON lp.id = rsr.project_id
+                LEFT JOIN sys_dept sd ON sd.dept_id = lp.dept_id
+        <where>
+            <if test="type != null "> and rsr.type = #{type}</if>
+            <if test="userName != null and userName != ''"> and su.nick_name like concat('%', #{userName}, '%')</if>
+            <if test="projectName != null and projectName != '' "> and lp.`name` like concat('%', #{projectName}, '%')</if>
+            <if test="deptName != null and deptName != '' "> and sd.dept_name like concat('%', #{deptName}, '%')</if>
+        </where>
+            order by rsr.create_time desc
+    </select>
 
     <insert id="insertRiskSignRecord" parameterType="com.censoft.censoftrongtong.domain.RiskSignRecord" useGeneratedKeys="true" keyProperty="id">
         insert into risk_sign_record