소스 검색

八爪鱼操作记录中增加筛选条件:人数变更, 勾选该条件则过滤显示变更人数的记录

yurk 2 년 전
부모
커밋
22ca4e8f52

+ 5 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/OperationLogController.java

@@ -8,6 +8,7 @@ import com.management.platform.mapper.OperationLogMapper;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -31,9 +32,12 @@ public class OperationLogController {
     获取操作日志
      */
     @RequestMapping("list")
-    public HttpRespMsg list(Integer pageIndex, Integer pageSize) {
+    public HttpRespMsg list(Integer pageIndex, Integer pageSize, @RequestParam(defaultValue = "0") Integer personKey) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<OperationLog> queryWrapper = new QueryWrapper<>();
+        if(personKey==1){
+            queryWrapper.like("operation_content","人数");
+        }
         queryWrapper.orderByDesc("id");
         msg.data = operationLogMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
         return msg;

+ 19 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2022-10-17
+ * @since 2023-01-03
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -389,6 +389,24 @@ public class TimeType extends Model<TimeType> {
     @TableField("not_allowed_no_attendance")
     private Integer notAllowedNoAttendance;
 
+    /**
+     * 1为需要同步企业微信请假,0为不需要同步企业微信请假
+     */
+    @TableField("wx_leave")
+    private Integer wxLeave;
+
+    /**
+     * 是否开通【推送工时数据】 0-否 1-是
+     */
+    @TableField("push_report_data")
+    private Integer pushReportData;
+
+    /**
+     * 推送工时数据URL
+     */
+    @TableField("push_report_url")
+    private String pushReportUrl;
+
 
     @Override
     protected Serializable pkVal() {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 4 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/resources/mapper/TimeTypeMapper.xml