管理后台-打卡页面新增打卡地址展示；添加条件查询功能

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityClockCoreController.java

@@ -88,7 +88,7 @@ public class TemporaryActivityClockCoreController {
         }
 
         if (StringUtils.isBlank(clockVo.getClockPhoto())){
-            throw new ParamException(RCode.PHOTO_IS_NULL_ERROR, null);
+            throw new ParamException(RCode.NOT_CLOCK_PHOTO_ERROR, null);
         }
 
         long minuteBetween = DateUtil.between(clockVo.getLastClockTime(), new Date(), DateUnit.MINUTE);

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryClockWrapper.java

@@ -45,4 +45,8 @@ public class TemporaryClockWrapper {
     private List<Long> reportedIds;
 
     private Long reportedId;
+
+    private String createDateStart;
+    private String createDateEnd;
+    private String nameLike;
 }

src/main/resources/mapper/TemporaryActivityClockMapper.xml

@@ -12,12 +12,15 @@
             <result property="noonClockOutTime" column="noon_clock_out_time" jdbcType="TIMESTAMP"/>
             <result property="noonClockInTime" column="noon_clock_in_time" jdbcType="TIMESTAMP"/>
             <result property="clockOutTime" column="clock_out_time" jdbcType="TIMESTAMP"/>
-            <result property="createDate" column="create_date" jdbcType="CHAR"/>
             <result property="clockProvince" column="clock_province" jdbcType="VARCHAR"/>
             <result property="clockCity" column="clock_city" jdbcType="VARCHAR"/>
             <result property="createDate" column="create_date" jdbcType="VARCHAR"/>
             <result property="activityPatternId" column="activity_pattern_id" jdbcType="INTEGER"/>
             <result property="activityPattern" column="activity_pattern" jdbcType="VARCHAR"/>
+            <result property="clockInAddress" column="clock_in_address" jdbcType="VARCHAR"/>
+            <result property="noonClockOutAddress" column="noon_clock_out_address" jdbcType="VARCHAR"/>
+            <result property="noonClockInAddress" column="noon_clock_in_address" jdbcType="VARCHAR"/>
+            <result property="clockOutAddress" column="clock_out_address" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -46,17 +49,30 @@
         tc.clock_out_time,
         tc.clock_province,
         tc.clock_city,
-        tc.create_date,
+        tc.clock_in_address,
+        tc.noon_clock_out_address,
+        tc.noon_clock_in_address,
+        tc.clock_out_address,
         tc.activity_pattern_id,
         tc.activity_pattern,
         ti.dept_qc_org_name,
         ti.charger_name
         from temporary_info ti
         inner join temporary_activity_clock tc on ti.id = tc.temporary_id
-        where tc.is_delete = 1
-        <if test="tcw != null and tcw.clockOutTimeIsNull != null and tcw.clockOutTimeIsNull == true">
+        <where>
+            <if test="tcw != null">
+                <if test="tcw.clockOutTimeIsNull != null and tcw.clockOutTimeIsNull == true">
                     and tc.clock_out_time is null
                 </if>
+                <if test="tcw.createDateStart != null and tcw.createDateEnd != null">
+                    and (tc.create_date between #{tcw.createDateStart} and #{tcw.createDateEnd})
+                </if>
+                <if test="tcw.nameLike != null">
+                    and ti.name like concat('%',#{tcw.nameLike},'%')
+                </if>
+            </if>
+            and tc.is_delete = 1
+        </where>
         order by id desc
         limit #{skipNum}, #{pageSize};
     </select>