Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -398,7 +398,7 @@ public class DataboardController {
             if(i == 1){
                 item = "市外";
             }else{
-                item = "室内";
+                item = "市内";
             }
             Double amount = 0D;
             for (Map<String, Object> objectMap : list) {

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -35,6 +35,9 @@ import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.base.service.IWhitelistManagementService;
 import com.xjrsoft.module.hikvision.util.DataUtil;
+import com.xjrsoft.module.oa.dto.OfficialDocumentReceivedHandlePageDto;
+import com.xjrsoft.module.oa.service.IOfficialDocumentReceivedHandleService;
+import com.xjrsoft.module.oa.vo.OfficialDocumentReceivedHandlePageVo;
 import com.xjrsoft.module.organization.dto.*;
 import com.xjrsoft.module.organization.entity.*;
 import com.xjrsoft.module.organization.service.*;
@@ -125,6 +128,7 @@ public class UserController {
     private final IBaseNewStudentService baseNewStudentService;
 
     private final IWorkflowExtraService workflowExtraService;
+    private final IOfficialDocumentReceivedHandleService documentReceivedHandleService;
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "用户列表（不分页）")
@@ -462,6 +466,14 @@ public class UserController {
                         .leftJoin(WorkflowSchema.class, WorkflowSchema::getId, WorkflowCirculated::getSchemaId)
         );
         pendingCountDto.setCirculatedCount(circulatedCount);
+
+        //增加查询收文承办数量
+        OfficialDocumentReceivedHandlePageDto dto = new OfficialDocumentReceivedHandlePageDto();
+        dto.setLoginUserId(StpUtil.getLoginIdAsLong());
+        dto.setIsHandle(0);
+        Page<OfficialDocumentReceivedHandlePageVo> page = documentReceivedHandleService.getPage(new Page<>(1, 15), dto);
+        pendingCountDto.setDocumentReceivedHandleCount(page.getTotal());
+
         return RT.ok(pendingCountDto);
     }
 

src/main/java/com/xjrsoft/module/organization/vo/PendingCountDto.java

@@ -21,4 +21,7 @@ public class PendingCountDto implements Serializable {
 
     @ApiModelProperty("我的传阅数量")
     private long circulatedCount;
+
+    @ApiModelProperty("我的承办数量")
+    private long documentReceivedHandleCount;
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -1656,16 +1656,16 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 List<WorkflowRecord> recordList = mapRecords.get(task.getProcessInstanceId());
                 if (recordList != null && recordList.size() > 1) {
                     String comment = recordList.get(recordList.size() - 1).getMessage();
-                    if (comment.contains("【驳回】")) {
+                    if (StrUtil.isNotEmpty(comment) && comment.contains("【驳回】")) {
                         User rejectUser = userService.getById(recordList.get(recordList.size() - 1).getCreateUserId());
                         vo.setRejectState(rejectUser.getName() + "驳回");
-                    } else if (comment.contains("自动驳回")) {
+                    } else if (StrUtil.isNotEmpty(comment) && comment.contains("自动驳回")) {
                         vo.setRejectState("系统自动驳回");
                     }
                 }
                 if (recordList != null && recordList.size() > 2) {
                     String comment2 = recordList.get(recordList.size() - 2).getMessage();
-                    if (comment2.contains("自动驳回")) {
+                    if (StrUtil.isNotEmpty(comment2) && comment2.contains("自动驳回")) {
                         vo.setRejectState("系统自动驳回");
                     }
                 }

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -48,6 +48,14 @@
         <if test="dto.handleDateStart != null and dto.handleDateEnd != ''">
             AND DATE_FORMAT(t1.handle_time, '%Y-%m-%d') between and #{dto.handleDateStart} and #{dto.handleDateEnd}
         </if>
+        <if test="dto.keyword != null and dto.keyword != ''">
+            AND (
+                t1.received_type like concat('%', #{dto.keyword},'%')
+                or t1.received_title like concat('%', #{dto.keyword},'%')
+                or t3.name like concat('%', #{dto.keyword},'%')
+                or t4.name like concat('%', #{dto.keyword},'%')
+            )
+        </if>
         order by t1.id desc
     </select>