待办，已办增加搜索拦

mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

@@ -234,6 +234,8 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .and(query -> {
                     query.isNull("m.flow_key").or().ne("m.flow_key", FlowNodeEnum.COMPLETION.getKey());
                 });
+        deptWorkSearch(todoQuery, queryWrapper);
+
         Integer roleId = AdminThreadLocal.getRoleId();
         Integer deptId = AdminThreadLocal.getDeptId();
         String empNo = AdminThreadLocal.getEmpNo();
@@ -440,7 +442,21 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
             }
         }
     }
-
+    private void deptWorkSearch(MailQuery mailQuery, QueryWrapper<Work> queryWrapper) {
+        if (StrUtil.isNotBlank(mailQuery.getDeptId())) {
+            Dept dept = deptMapper.selectById(mailQuery.getDeptId());
+            switch (dept.getLevel()) {
+                case 1:
+                    break;
+                case 2:
+                    queryWrapper.eq("m.second_dept_id", dept.getId());
+                    break;
+                case 3:
+                    queryWrapper.eq("m.three_dept_id", dept.getId());
+                    break;
+            }
+        }
+    }
     public void export(HttpServletResponse response, String ids) throws IOException {
         List<String> data = JSON.parseArray(ids, String.class);
 

mailbox-lan/src/main/java/com/biutag/lan/service/impl/DutyServiceImpl.java

@@ -128,8 +128,8 @@ public class DutyServiceImpl implements IDutyService {
     @Override
     public void add(DutyCreateValidate createValidate) {
         Duty model = new Duty();
-        model.setStartTime(createValidate.getStartTime());
+        model.setStartTime(createValidate.getReportDate()[0]);
-        model.setEndTime(createValidate.getEndTime());
+        model.setEndTime(createValidate.getReportDate()[1]);
         model.setDepartId(createValidate.getDepartId());
         PoliceUser policeUser= policeUserMapper.selectOne(new QueryWrapper<PoliceUser>()
                 .select("id,name,emp_no,username,nickname,avatar," +
@@ -171,18 +171,20 @@ public class DutyServiceImpl implements IDutyService {
     public void edit(DutyUpdateValidate updateValidate) {
         Duty model = dutyMapper.selectOne(
                 new QueryWrapper<Duty>()
-                    .eq("id",  updateValidate.getId())
+                    .eq("emp_no",  updateValidate.getEmpNo())
                     .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
 
-        model.setId(updateValidate.getId());
+        model.setId(model.getId());
         model.setDepartId(updateValidate.getDepartId());
       //  model.setDepartName(updateValidate.getDepartName());
         model.setPoliceName(updateValidate.getPoliceName());
         model.setMobile(updateValidate.getMobile());
        // model.setRoleId(updateValidate.getRoleId());
         model.setEmpNo(updateValidate.getEmpNo());
+        model.setStartTime(updateValidate.getReportDate()[0]);
+        model.setEndTime(updateValidate.getReportDate()[1]);
        // model.setRoleName(updateValidate.getRoleName());
         model.setCreateTime(System.currentTimeMillis() / 1000);
         dutyMapper.updateById(model);

mailbox-lan/src/main/java/com/biutag/lan/validate/system/DutyCreateValidate.java

@@ -14,13 +14,17 @@ public class DutyCreateValidate implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-    @NotNull(message = "开始时间参数缺失")
+//    @NotNull(message = "开始时间参数缺失")
-    @ApiModelProperty(value = "开始时间")
+//    @ApiModelProperty(value = "开始时间")
-    private String startTime;
+//    private String startTime;
+//
+//    @NotNull(message = "结束时间参数缺失")
+//    @ApiModelProperty(value = "结束时间")
+//    private String endTime;
+    @NotNull(message = "时间参数缺失")
+    @ApiModelProperty(value = "时间")
+    private String[] reportDate;
 
-    @NotNull(message = "结束时间参数缺失")
-    @ApiModelProperty(value = "结束时间")
-    private String endTime;
 
     @NotNull(message = "结束时间参数缺失")
     @ApiModelProperty(value = "部门id")

mailbox-lan/src/main/java/com/biutag/lan/validate/system/DutyUpdateValidate.java

@@ -24,13 +24,17 @@ public class DutyUpdateValidate implements Serializable {
     private Long id;
 
 
-    @NotNull(message = "开始时间参数缺失")
+//    @NotNull(message = "开始时间参数缺失")
-    @ApiModelProperty(value = "开始时间")
+//    @ApiModelProperty(value = "开始时间")
-    private String startTime;
+//    private String startTime;
-
+//
-    @NotNull(message = "结束时间参数缺失")
+//    @NotNull(message = "结束时间参数缺失")
-    @ApiModelProperty(value = "结束时间")
+//    @ApiModelProperty(value = "结束时间")
-    private String endTime;
+//    private String endTime;
+
+    @NotNull(message = "时间参数缺失")
+    @ApiModelProperty(value = "时间")
+    private String[] reportDate;
 
     @NotNull(message = "结束时间参数缺失")
     @ApiModelProperty(value = "部门id")