管控bug

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/TaskProcessInfo.java

@@ -20,7 +20,7 @@ public class TaskProcessInfo extends BaseEntity {
     private String taskName;
 
     @ApiModelProperty(value = "上报日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reportDate;
 
     @ApiModelProperty(value = "审核日期")

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ExMaByContractReturnedInfoVO.java

@@ -18,14 +18,14 @@ public class ExMaByContractReturnedInfoVO implements Serializable {
     @ApiModelProperty(value = "回款条件")
     private String returnedCondition;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "应回款时间")
     private LocalDate shouldReturnedTime;
 
     @ApiModelProperty(value = "应回款金额")
     private BigDecimal shouldReturnedMoney;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "实际回款时间")
     private LocalDate practicalReturnedTime;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/TaskProcessDetailBasicsVO.java

@@ -1,5 +1,6 @@
 package org.springblade.control.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -25,6 +26,7 @@ public class TaskProcessDetailBasicsVO implements Serializable {
     private String reportUser;
 
     @ApiModelProperty(value = "审批任务上报时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reportDate;
 
     @ApiModelProperty(value = "支付状态 1=已支付 0=待支付")

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -80,7 +80,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 queryWrapper.lambda().eq(TaskProcessInfo::getStatus, 1);
                 break;
             case "2":  //已审核、已驳回为已办任务
-                if (dto.getSelectStatus().equals("0") || dto.getSelectStatus().equals("1")) {
+                if (ObjectUtil.isNotEmpty(dto.getSelectStatus()) && (dto.getSelectStatus().equals("0") || dto.getSelectStatus().equals("1"))) {
                     var = false;
                     break;
                 }
@@ -91,11 +91,15 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 }
                 break;
             case "3":  //我发起的任务
-                queryWrapper.lambda().eq(TaskProcessInfo::getStatus, dto.getSelectStatus());
+                if (ObjectUtil.isNotEmpty(dto.getSelectStatus())) {
+                    queryWrapper.lambda().eq(TaskProcessInfo::getStatus, dto.getSelectStatus());
+                }
                 queryWrapper.lambda().eq(TaskProcessInfo::getReportUserId, SecureUtil.getUserId());
                 break;
             case "4":  //抄送给我的
-                queryWrapper.lambda().eq(TaskProcessInfo::getStatus, dto.getSelectStatus());
+                if (ObjectUtil.isNotEmpty(dto.getSelectStatus())) {
+                    queryWrapper.lambda().eq(TaskProcessInfo::getStatus, dto.getSelectStatus());
+                }
                 queryWrapper.lambda().like(TaskProcessInfo::getCcUserIds, SecureUtil.getUserId());
                 break;
         }
@@ -1225,7 +1229,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
      */
     public User getDepartmentHead(Long deptId) {
         if (ObjectUtil.isNotEmpty(deptId)) {
-            List<User> leaderUser = jdbcTemplate.query("select * from blade_user where tenant_id = " + SecureUtil.getUser().getTenantId() + " and dept_id like '%" + deptId + "%' and is_leader like '%" + deptId + "%'", new BeanPropertyRowMapper<>(User.class));
+            List<User> leaderUser = jdbcTemplate.query("select * from blade_user where tenant_id = " + SecureUtil.getUser().getTenantId() + " and dept_id = " + deptId + " and is_leader like '%" + deptId + "%'", new BeanPropertyRowMapper<>(User.class));
             if (leaderUser.size() == 1) {
                 return leaderUser.get(0);
             }
@@ -1332,7 +1336,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
         if (spPostIds.size() > 0) {
             List<User> spUserListAll = new LinkedList<>();
             for (String spPostId : spPostIds) {
-                List<User> spUserList = jdbcTemplate.query("select * from blade_user where tenant_id = " + SecureUtil.getUser().getTenantId() + " and role_id like '%" + spPostId + "%' and post_id like '%" + spPostId + "%'", new BeanPropertyRowMapper<>(User.class));
+                List<User> spUserList = jdbcTemplate.query("select * from blade_user where tenant_id = " + SecureUtil.getUser().getTenantId() + " and role_id = " + spPostId + " and post_id = " + spPostId, new BeanPropertyRowMapper<>(User.class));
                 spUserListAll.addAll(spUserList);
             }
             if (spUserListAll.size() > 0) {
@@ -1342,7 +1346,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
         if (zcPostIds.size() > 0) {
             List<User> zcUserListAll = new LinkedList<>();
             for (String zcPostId : zcPostIds) {
-                List<User> zcUserList = jdbcTemplate.query("select * from blade_user where tenant_id = " + SecureUtil.getUser().getTenantId() + " and role_id like '%" + zcPostId + "%' and post_id like '%" + zcPostId + "%'", new BeanPropertyRowMapper<>(User.class));
+                List<User> zcUserList = jdbcTemplate.query("select * from blade_user where tenant_id = " + SecureUtil.getUser().getTenantId() + " and role_id = " + zcPostId + " and post_id = " + zcPostId, new BeanPropertyRowMapper<>(User.class));
                 zcUserListAll.addAll(zcUserList);
             }
             if (zcUserListAll.size() > 0) {