优化查看历史

service-common/src/main/java/com/java110/common/cmd/auditUser/ListAuditHistoryComplaintsCmd.java

@@ -2,15 +2,19 @@ package com.java110.common.cmd.auditUser;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.audit.AuditUser;
+import com.java110.dto.complaint.ComplaintDto;
 import com.java110.intf.common.IComplaintUserInnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import com.java110.vo.api.complaint.ApiComplaintDataVo;
 import com.java110.vo.api.complaint.ApiComplaintVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +30,11 @@ public class ListAuditHistoryComplaintsCmd extends Cmd {
     @Autowired
     private IComplaintUserInnerServiceSMO complaintUserInnerServiceSMOImpl;
 
+    @Autowired
+    private IComplaintV1InnerServiceSMO complaintV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
-        Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
         Assert.hasKeyAndValue(reqJson, "communityId", "必填，请填写小区ID");
         Assert.hasKeyAndValue(reqJson, "row", "必填，请填写每页显示数");
         Assert.hasKeyAndValue(reqJson, "page", "必填，请填写页数");
@@ -39,34 +44,29 @@ public class ListAuditHistoryComplaintsCmd extends Cmd {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        AuditUser auditUser = new AuditUser();
-        auditUser.setUserId(reqJson.getString("userId"));
-        auditUser.setStoreId(reqJson.getString("storeId"));
-        auditUser.setCommunityId(reqJson.getString("communityId"));
-        auditUser.setPage(reqJson.getInteger("page"));
-        auditUser.setRow(reqJson.getInteger("row"));
+        String userId = CmdContextUtils.getUserId(context);
 
-        if(reqJson.containsKey("process")&& !StringUtil.isEmpty(reqJson.getString("process"))){
-            auditUser.setAuditLink(reqJson.getString("process"));
-        }
+        ComplaintDto complaintDto = new ComplaintDto();
+        complaintDto.setStaffId(userId);
+        complaintDto.setStoreId(reqJson.getString("storeId"));
+        complaintDto.setCommunityId(reqJson.getString("communityId"));
+        complaintDto.setPage(reqJson.getInteger("page"));
+        complaintDto.setRow(reqJson.getInteger("row"));
+        complaintDto.setState(ComplaintDto.STATE_FINISH);
 
-        long count = complaintUserInnerServiceSMOImpl.getUserHistoryTaskCount(auditUser);
+        long count = complaintV1InnerServiceSMOImpl.queryStaffComplaintCount(complaintDto);
 
-        List<ApiComplaintDataVo> auditComplaints = null;
+        List<ComplaintDto> complaintDtos = null;
 
         if (count > 0) {
-            auditComplaints = BeanConvertUtil.covertBeanList(complaintUserInnerServiceSMOImpl.getUserHistoryTasks(auditUser), ApiComplaintDataVo.class);
+            complaintDtos = complaintV1InnerServiceSMOImpl.queryStaffComplaints(complaintDto);
         } else {
-            auditComplaints = new ArrayList<>();
+            complaintDtos = new ArrayList<>();
         }
 
-        ApiComplaintVo apiComplaintVo = new ApiComplaintVo();
-
-        apiComplaintVo.setTotal((int) count);
-        apiComplaintVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
-        apiComplaintVo.setComplaints(auditComplaints);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, complaintDtos);
 
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiComplaintVo), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
     }