首页和待办

src/main/java/com/qdport/controller/PolicyLogController.java

@@ -1,6 +1,5 @@
 package com.qdport.controller;
 
-import lombok.AllArgsConstructor;
 import com.qdport.entity.PolicyLog;
 import com.qdport.service.PolicyLogService;
 import com.qdport.query.PolicyLogQuery;

src/main/java/com/qdport/controller/PolicyMessageController.java

@@ -1,9 +1,12 @@
 package com.qdport.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qdport.entity.PolicyMessage;
+import com.qdport.entity.PolicyShare;
 import com.qdport.service.PolicyMessageService;
 import com.qdport.query.PolicyMessageQuery;
+import com.qdport.service.PolicyShareService;
 import com.qdport.vo.PolicyMessageVO;
 import com.qdport.wrapper.PolicyMessageWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +34,8 @@ import java.util.List;
 public class PolicyMessageController extends QdportController {
     @Resource
     private PolicyMessageService policyMessageService;
+    @Resource
+    private PolicyShareService policyShareService;
 
     /**
      * 分页
@@ -49,6 +54,28 @@ public class PolicyMessageController extends QdportController {
         return R.data(page);
     }
 
+    @GetMapping("mesPage")
+    @ApiOperation(value = "分页", notes = "分页")
+    public R<IPage<PolicyMessageVO>> mesPage(@Valid PolicyMessageQuery query) {
+        IPage<PolicyMessage> page = new Page<>(query.getPage(), query.getSize());
+        QueryWrapper<PolicyMessage> wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("CREATE_TIME");
+        wrapper.ne("PARENT_ID", "0");
+        wrapper.ne("CREATE_ID", query.getCreateId());
+        wrapper.apply("(REPLY_ID = " + query.getCreateId() + " or REPLY_ID is null )");
+
+        page = policyMessageService.page(page, wrapper);
+
+        IPage<PolicyMessageVO> voPage = PolicyMessageWrapper.build().pageVO(page);
+        List<PolicyMessageVO> records = voPage.getRecords();
+        for (PolicyMessageVO model : records) {
+            PolicyShare share = policyShareService.getById(model.getRefId());
+            model.setPolicyName(share.getName());
+            model.setPolicyDocNo(share.getDocNo());
+        }
+        return R.data(voPage);
+    }
+
     /**
      * 详情
      */

src/main/java/com/qdport/controller/PolicyTodoController.java

@@ -1,8 +1,18 @@
 package com.qdport.controller;
 
+import com.qdport.entity.PolicyCase;
+import com.qdport.entity.PolicyShare;
+import com.qdport.entity.PolicyStrive;
+import com.qdport.enums.QDPortEnum;
+import com.qdport.modules.system.entity.SysDept;
 import com.qdport.modules.system.entity.SysUser;
+import com.qdport.modules.system.service.SysDeptService;
 import com.qdport.modules.system.service.TSysUserService;
+import com.qdport.service.PolicyCaseService;
+import com.qdport.service.PolicyShareService;
+import com.qdport.service.PolicyStriveService;
 import com.qdport.service.impl.PolicySystemService;
+import com.qdport.util.StringUtil;
 import com.qdport.vo.PolicyShareVO;
 import lombok.AllArgsConstructor;
 import com.qdport.entity.PolicyTodo;
@@ -37,9 +47,13 @@ public class PolicyTodoController extends QdportController {
     @Resource
     private PolicyTodoService policyTodoService;
     @Resource
-    private TSysUserService sysUserService;
+    private SysDeptService sysDeptService;
     @Resource
-    private PolicySystemService policySystemService;
+    private PolicyShareService policyShareService;
+    @Resource
+    private PolicyStriveService policyStriveService;
+    @Resource
+    private PolicyCaseService policyCaseService;
 
     /**
      * 分页
@@ -50,10 +64,32 @@ public class PolicyTodoController extends QdportController {
         IPage<PolicyTodoVO> page = policyTodoService.page(query);
         List<PolicyTodoVO> records = page.getRecords();
         for (PolicyTodoVO model : records) {
-            SysUser createUser = sysUserService.getById(model.getZcCreateId());
-            Map<String, String> resultMap = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
-            model.setZcDeptName(resultMap.get("deptName"));
-            model.setZcCompanyName(resultMap.get("companyName"));
+            SysDept dept = sysDeptService.getById(model.getZcDeptId());
+            model.setZcDeptName(dept.getName());
+            SysDept company = sysDeptService.getById(model.getZcCompanyId());
+            model.setZcCompanyName(company.getName());
+
+            if (QDPortEnum.POLICY_TODO_REFTYPE_POLICY_SHARE.getValue().equals(model.getRefType())) {
+                PolicyShare share = policyShareService.getById(model.getRefId());
+                if (StringUtil.isNotEmpty(share)) {
+                    model.setProcessInstanceId(share.getProcessInstanceId());
+                    model.setProcessTaskId(share.getProcessTaskId());
+                }
+            } else if (QDPortEnum.POLICY_TODO_REFTYPE_POLICY_STRIVE.getValue().equals(model.getRefType())) {
+                PolicyStrive strive = policyStriveService.getById(model.getRefId());
+                if (StringUtil.isNotEmpty(strive)) {
+                    model.setProcessInstanceId(strive.getProcessInstanceId());
+                    model.setProcessTaskId(strive.getProcessTaskId());
+                }
+            } else if (QDPortEnum.POLICY_TODO_REFTYPE_POLICY_CASE.getValue().equals(model.getRefType())) {
+                PolicyCase policyCase = policyCaseService.getById(model.getRefId());
+                if (StringUtil.isNotEmpty(policyCase)) {
+                    model.setProcessInstanceId(policyCase.getProcessInstanceId());
+                    model.setProcessTaskId(policyCase.getProcessTaskId());
+                }
+
+            }
+
         }
         return R.data(page);
     }

src/main/java/com/qdport/entity/PolicyMessage.java

@@ -71,4 +71,7 @@ public class PolicyMessage implements Serializable {
 
 	@ApiModelProperty(value = "父id")
 	private String parentId;
+
+	@ApiModelProperty(value = "是否已读")
+	private Integer isRead;
 }

src/main/java/com/qdport/entity/PolicyTodo.java

@@ -127,4 +127,15 @@ public class PolicyTodo implements Serializable {
 	)
 	private Date zcCreateTime;
 
+	@ApiModelProperty(value = "政策填报人部门id")
+	@JsonSerialize(
+			using = ToStringSerializer.class
+	)
+	private Long zcDeptId;
+
+	@ApiModelProperty(value = "政策填报人单位id")
+	@JsonSerialize(
+			using = ToStringSerializer.class
+	)
+	private Long zcCompanyId;
 }

src/main/java/com/qdport/query/PolicyMessageQuery.java

@@ -30,4 +30,6 @@ public class PolicyMessageQuery implements Serializable {
     private Long replyId;
     @Wrapper
     private String parentId;
+    @Wrapper
+    private Integer isRead;
 }

src/main/java/com/qdport/query/PolicyTodoQuery.java

@@ -48,4 +48,9 @@ public class PolicyTodoQuery implements Serializable {
             pattern = "yyyy-MM-dd HH:mm:ss"
     )
     private Date endCreateTime;
+
+    @Wrapper
+    private String status;
+    @Wrapper
+    private String refType;
 }

src/main/java/com/qdport/service/impl/PolicyTodoServiceImpl.java

@@ -66,7 +66,6 @@ public class PolicyTodoServiceImpl extends ServiceImpl<PolicyTodoMapper, PolicyT
 
     private QueryWrapper<PolicyTodo> getWrapper(PolicyTodoQuery query) {
         QueryWrapper<PolicyTodo> wrapper = QueryWrapperBuilder.buildQueryWrapper(query, PolicyTodo.class);
-        wrapper.eq("STATUS", QDPortEnum.POLICY_TODO_STATUS_ACTIVE.getValue());
         wrapper.orderByDesc("CREATE_TIME");
         return wrapper;
     }

src/main/java/com/qdport/vo/PolicyMessageVO.java

@@ -14,4 +14,7 @@ public class PolicyMessageVO extends PolicyMessage {
 	private static final long serialVersionUID = 1L;
 
 	private Long childrenCount;
+
+	private String policyName;
+	private String policyDocNo;
 }

src/main/java/com/qdport/vo/PolicyTodoVO.java

@@ -18,4 +18,9 @@ public class PolicyTodoVO extends PolicyTodo {
 	@ApiModelProperty(value = "公司名称")
 	private String zcCompanyName;
 
+	@ApiModelProperty(value = "流程任务id")
+	private String processTaskId;
+	@ApiModelProperty(value = "流程实例id")
+	private String processInstanceId;
+
 }