优化代码

java110-bean/src/main/java/com/java110/dto/oaWorkflow/OaWorkflowDto.java

@@ -18,6 +18,7 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public static final String STATE_WAIT = "W";//待部署
     public static final String STATE_COMPLAINT = "C";//部署完成
 
+    private String userId;
     private String describle;
     private String modelId;
     private String flowKey;
@@ -28,6 +29,7 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     private String processDefinitionKey;
     private String state;
     private String curFormId;
+    private long undoCount;
 
     private Date createTime;
 
@@ -130,4 +132,20 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public void setCurFormId(String curFormId) {
         this.curFormId = curFormId;
     }
+
+    public long getUndoCount() {
+        return undoCount;
+    }
+
+    public void setUndoCount(long undoCount) {
+        this.undoCount = undoCount;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }

service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffRepairsListener.java

@@ -71,13 +71,13 @@ public class ListStaffRepairsListener extends AbstractServiceApiListener {
         String userId = reqJson.getString("userId");
         String viewListStaffRepairs = MappingCache.getValue("viewListStaffRepairs");
         List<Map> privileges = null;
-//        if("ON".equals(viewListStaffRepairs)) {//是否让管理员看到所有工单
+        if("ON".equals(viewListStaffRepairs)) {//是否让管理员看到所有工单
             //报修待办查看所有记录权限
             BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
             basePrivilegeDto.setResource("/viewListStaffRepairs");
             basePrivilegeDto.setUserId(userId);
             privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
-//        }
+        }
         if (privileges == null || privileges.size() == 0) {
             ownerRepairDto.setStaffId(reqJson.getString("userId"));
         }

service-front/src/main/java/com/java110/front/smo/undo/impl/UndoSMOImpl.java

@@ -49,7 +49,6 @@ public class UndoSMOImpl extends AbstractComponentSMO implements IUndoSMO {
         headers.put("store-id", result.getStoreId());
         paramIn.put("storeId", result.getStoreId());
         paramIn.put("userId", result.getUserId());
-        paramIn.put("staffId", result.getUserId());
 
         JSONObject doing = new JSONObject();
         //查询 报修待办
@@ -64,6 +63,8 @@ public class UndoSMOImpl extends AbstractComponentSMO implements IUndoSMO {
         } else {
             doing.put("repair", "0");
         }
+        paramIn.put("staffId", result.getUserId());
+
 
         apiUrl = ServiceConstant.SERVICE_API_URL + "/api/auditUser.listAuditComplaints" + mapToUrlParam(paramIn);
         responseEntity = this.callCenterService(restTemplate, pd, "",

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -29,12 +29,7 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -155,6 +150,7 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+                                                  @RequestHeader(value = "user-id") String userId,
                                                   @RequestParam(value = "flowId", required = false) String flowId,
                                                   @RequestParam(value = "state", required = false) String state,
                                                   @RequestParam(value = "page") int page,
@@ -165,6 +161,7 @@ public class OaWorkflowApi {
         oaWorkflowDto.setStoreId(storeId);
         oaWorkflowDto.setFlowId(flowId);
         oaWorkflowDto.setState(state);
+        oaWorkflowDto.setUserId(userId);
         return getOaWorkflowBMOImpl.get(oaWorkflowDto);
     }
 

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/GetOaWorkflowBMOImpl.java

@@ -1,8 +1,13 @@
 package com.java110.oa.bmo.oaWorkflow.impl;
 
 import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
+import com.java110.entity.audit.AuditUser;
+import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
 import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO;
+import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -18,6 +23,11 @@ public class GetOaWorkflowBMOImpl implements IGetOaWorkflowBMO {
     @Autowired
     private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
 
+
+    @Autowired
+    private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+
     /**
      * @param oaWorkflowDto
      * @return 订单服务能够接受的报文
@@ -30,6 +40,7 @@ public class GetOaWorkflowBMOImpl implements IGetOaWorkflowBMO {
         List<OaWorkflowDto> oaWorkflowDtos = null;
         if (count > 0) {
             oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+            computeUserUndoOrder(oaWorkflowDtos);
         } else {
             oaWorkflowDtos = new ArrayList<>();
         }
@@ -41,4 +52,31 @@ public class GetOaWorkflowBMOImpl implements IGetOaWorkflowBMO {
         return responseEntity;
     }
 
+    private void computeUserUndoOrder(List<OaWorkflowDto> oaWorkflowDtos) {
+
+        for(OaWorkflowDto oaWorkflowDto: oaWorkflowDtos){
+            if(!"C".equals(oaWorkflowDto.getState())){
+                continue;
+            }
+
+            doComputeUserUndoOrder(oaWorkflowDto);
+        }
+    }
+
+    private void doComputeUserUndoOrder(OaWorkflowDto oaWorkflowDto) {
+
+
+        AuditUser auditUser = new AuditUser();
+        auditUser.setProcessDefinitionKey(oaWorkflowDto.getProcessDefinitionKey());
+        auditUser.setFlowId(oaWorkflowDto.getFlowId());
+        auditUser.setUserId(oaWorkflowDto.getUserId());
+        auditUser.setStoreId(oaWorkflowDto.getStoreId());
+        auditUser.setPage(1);
+        auditUser.setRow(10);
+
+        long count = oaWorkflowUserInnerServiceSMOImpl.getUserTaskCount(auditUser);
+
+        oaWorkflowDto.setUndoCount(count);
+    }
+
 }