修复打卡接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/kaoqin/KaoQinController.java

@@ -224,6 +224,7 @@ public class KaoQinController extends BaseController {
                     Map<String, Object> userMap = new HashMap();
                     userMap.put("userName", value.get(0).getUserName());
                     userMap.put("deptName", value.get(0).getDeptName());
+                    userMap.put("list", value);
                     for (String dictValue : map.keySet()) {
                         String dictLabel = map.get(dictValue);
                         userMap.put(dictLabel, 0);

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -157,7 +157,7 @@ public class BaseController
      */
     protected AjaxResult toAjaxKaoQin(int rows)
     {
-        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+        return rows > 0 ? AjaxResult.success() : AjaxResult.errorKaoQin();
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain/KaoqinConfig.java

@@ -73,6 +73,19 @@ public class KaoqinConfig extends BaseEntity
     @Excel(name = "打卡时间 -下午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmOut;
 
+    /**
+     * 是否打卡需要照片 N:否 Y:是
+     */
+    private String isPhoto;
+
+    public String getIsPhoto() {
+        return isPhoto;
+    }
+
+    public void setIsPhoto(String isPhoto) {
+        this.isPhoto = isPhoto;
+    }
+
     public String getAncestors() {
         return ancestors;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/KaoqinRecord.java

@@ -89,22 +89,22 @@ public class KaoqinRecord extends BaseEntity
     private String kaAddressPmOut;
 
     /** 打卡时间 -上午上班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -上午上班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimeAmIn;
 
     /** 打卡时间 -上午下班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -上午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimeAmOut;
 
     /** 打卡时间 -下午上班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -下午上班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmIn;
 
     /** 打卡时间 -下午下班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -下午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmOut;
 
@@ -123,6 +123,22 @@ public class KaoqinRecord extends BaseEntity
     /** 打卡类别-下午下班 1正常 2:迟到 3:外勤 4:早退 */
     @Excel(name = "打卡类别-下午下班 1正常 2:迟到 3:外勤 4:早退")
     private String kaTypePmOut;
+    /**
+     * 上午上班-图片
+     */
+    private String kaAmInPhoto;
+    /**
+     * 上午下班-图片
+     */
+    private String kaAmOutPhoto;
+    /**
+     * 下午上班-图片
+     */
+    private String kaPmInPhoto;
+    /**
+     * 下午下班-图片
+     */
+    private String kaPmOutPhoto;
 
     /** 打卡状态 1正常 2异常 */
     @Excel(name = "打卡状态 1正常 2异常")
@@ -144,7 +160,39 @@ public class KaoqinRecord extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String remarkPmOut;
 
-    public void setRecordId(Long recordId) 
+    public String getKaAmInPhoto() {
+        return kaAmInPhoto;
+    }
+
+    public void setKaAmInPhoto(String kaAmInPhoto) {
+        this.kaAmInPhoto = kaAmInPhoto;
+    }
+
+    public String getKaAmOutPhoto() {
+        return kaAmOutPhoto;
+    }
+
+    public void setKaAmOutPhoto(String kaAmOutPhoto) {
+        this.kaAmOutPhoto = kaAmOutPhoto;
+    }
+
+    public String getKaPmInPhoto() {
+        return kaPmInPhoto;
+    }
+
+    public void setKaPmInPhoto(String kaPmInPhoto) {
+        this.kaPmInPhoto = kaPmInPhoto;
+    }
+
+    public String getKaPmOutPhoto() {
+        return kaPmOutPhoto;
+    }
+
+    public void setKaPmOutPhoto(String kaPmOutPhoto) {
+        this.kaPmOutPhoto = kaPmOutPhoto;
+    }
+
+    public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
     }

ruoyi-system/src/main/resources/mapper/system/KaoqinConfigMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="kaTimeAmOut"    column="ka_time_am_out"    />
         <result property="kaTimePmIn"    column="ka_time_pm_in"    />
         <result property="kaTimePmOut"    column="ka_time_pm_out"    />
+        <result property="isPhoto"    column="is_photo"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKaoqinConfigVo">
-        select kaoqin_id, dept_id, ka_address, ka_log, ka_lat, ka_num, ka_radius, ka_sort, ka_time_am_in, ka_time_am_out, ka_time_pm_in, ka_time_pm_out, create_by, create_time, update_by, update_time, remark from kaoqin_config
+        select kaoqin_id, dept_id, ka_address, ka_log, ka_lat, ka_num, ka_radius, ka_sort, ka_time_am_in, ka_time_am_out, ka_time_pm_in, ka_time_pm_out,is_photo, create_by, create_time, update_by, update_time, remark from kaoqin_config
     </sql>
 
     <select id="selectKaoqinConfigList" parameterType="KaoqinConfig" resultMap="KaoqinConfigResult">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTimeAmOut != null "> and ka_time_am_out = #{kaTimeAmOut}</if>
             <if test="kaTimePmIn != null "> and ka_time_pm_in = #{kaTimePmIn}</if>
             <if test="kaTimePmOut != null "> and ka_time_pm_out = #{kaTimePmOut}</if>
+            <if test="isPhoto != null and isPhoto!= ''"> and is_photo = #{isPhoto}</if>
         </where>
     </select>
     
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTimeAmOut != null">ka_time_am_out,</if>
             <if test="kaTimePmIn != null">ka_time_pm_in,</if>
             <if test="kaTimePmOut != null">ka_time_pm_out,</if>
+            <if test="isPhoto != null and isPhoto != ''">is_photo,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTimeAmOut != null">#{kaTimeAmOut},</if>
             <if test="kaTimePmIn != null">#{kaTimePmIn},</if>
             <if test="kaTimePmOut != null">#{kaTimePmOut},</if>
+            <if test="isPhoto != null and isPhoto != ''">#{isPhoto},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -104,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTimeAmOut != null">ka_time_am_out = #{kaTimeAmOut},</if>
             <if test="kaTimePmIn != null">ka_time_pm_in = #{kaTimePmIn},</if>
             <if test="kaTimePmOut != null">ka_time_pm_out = #{kaTimePmOut},</if>
+            <if test="isPhoto != null and isPhoto !=''">is_photo = #{isPhoto},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

ruoyi-system/src/main/resources/mapper/system/KaoqinRecordMapper.xml

@@ -30,7 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="kaTypeAmIn"    column="ka_type_am_in"    />
         <result property="kaTypeAmOut"    column="ka_type_am_out"    />
         <result property="kaTypePmIn"    column="ka_type_pm_in"    />
-        <result property="kaTypePmOut"    column="ka_type_pm_out"    />
+        <result property="kaTypePmOut"    column="ka_am_in_photo"    />
+        <result property="kaAmInPhoto"    column="ka_am_out_photo"    />
+        <result property="kaAmOutPhoto"    column="ka_type_pm_out"    />
+        <result property="kaPmInPhoto"    column="ka_pm_in_photo"    />
+        <result property="kaPmOutPhoto"    column="ka_pm_out_photo"    />
         <result property="kaStatus"    column="ka_status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -43,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKaoqinRecordVo">
-        select record_id, user_id, user_name, dept_id, dept_name, ancestors, ka_year, ka_month, ka_day, ka_week, ka_time, ka_address_am_in, ka_log, ka_lat, ka_sort, ka_address_am_out, ka_address_pm_in, ka_address_pm_out, ka_time_am_in, ka_time_am_out, ka_time_pm_in, ka_time_pm_out, ka_type_am_in, ka_type_am_out, ka_type_pm_in, ka_type_pm_out, ka_status, create_by, create_time, update_by, update_time, remark_am_in, remark_am_out, remark_pm_in, remark_pm_out from kaoqin_record
+        select record_id, user_id, user_name, dept_id, dept_name, ancestors, ka_year, ka_month, ka_day, ka_week, ka_time, ka_address_am_in, ka_log, ka_lat, ka_sort, ka_address_am_out, ka_address_pm_in, ka_address_pm_out, ka_time_am_in, ka_time_am_out, ka_time_pm_in, ka_time_pm_out, ka_type_am_in, ka_type_am_out, ka_type_pm_in, ka_type_pm_out,ka_am_in_photo,ka_am_out_photo,ka_pm_in_photo,ka_pm_out_photo, ka_status, create_by, create_time, update_by, update_time, remark_am_in, remark_am_out, remark_pm_in, remark_pm_out from kaoqin_record
     </sql>
 
     <select id="selectKaoqinRecordList" parameterType="KaoqinRecord" resultMap="KaoqinRecordResult">
@@ -115,6 +119,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTypeAmOut != null">ka_type_am_out,</if>
             <if test="kaTypePmIn != null">ka_type_pm_in,</if>
             <if test="kaTypePmOut != null">ka_type_pm_out,</if>
+            <if test="kaAmInPhoto != null">ka_type_pm_out,</if>
+            <if test="kaAmOutPhoto != null">ka_am_in_photo,</if>
+            <if test="kaPmInPhoto != null">ka_pm_in_photo,</if>
+            <if test="kaPmOutPhoto != null">ka_pm_out_photo,</if>
             <if test="kaStatus != null">ka_status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -151,6 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTypeAmOut != null">#{kaTypeAmOut},</if>
             <if test="kaTypePmIn != null">#{kaTypePmIn},</if>
             <if test="kaTypePmOut != null">#{kaTypePmOut},</if>
+            <if test="kaAmInPhoto != null">#{kaAmInPhoto},</if>
+            <if test="kaAmOutPhoto != null">#{kaAmOutPhoto},</if>
+            <if test="kaPmInPhoto != null">#{kaPmInPhoto},</if>
+            <if test="kaPmOutPhoto != null">#{kaPmOutPhoto},</if>
             <if test="kaStatus != null">#{kaStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -191,6 +203,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTypeAmOut != null">ka_type_am_out = #{kaTypeAmOut},</if>
             <if test="kaTypePmIn != null">ka_type_pm_in = #{kaTypePmIn},</if>
             <if test="kaTypePmOut != null">ka_type_pm_out = #{kaTypePmOut},</if>
+            <if test="kaAmInPhoto != null">ka_am_in_photo = #{kaAmInPhoto},</if>
+            <if test="kaAmOutPhoto != null">ka_am_out_photo = #{kaAmOutPhoto},</if>
+            <if test="kaPmInPhoto != null">ka_pm_in_photo = #{kaPmInPhoto},</if>
+            <if test="kaPmOutPhoto != null">ka_pm_out_photo = #{kaPmOutPhoto},</if>
             <if test="kaStatus != null">ka_status = #{kaStatus},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>