优化投诉审核单查询

Api/src/main/java/com/java110/api/listener/auditOrder/ListAuditComplaintsListener.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.common.IResourceEntryStoreInnerServiceSMO;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
-import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
-import com.java110.core.smo.complaint.IComplaintUserInnerServiceSMO;
+import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
 import com.java110.entity.audit.AuditUser;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeAuditUserConstant;
@@ -15,8 +12,6 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.complaint.ApiComplaintDataVo;
 import com.java110.vo.api.complaint.ApiComplaintVo;
-import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
-import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -75,6 +70,7 @@ public class ListAuditComplaintsListener extends AbstractServiceApiListener {
 
         AuditUser auditUser = new AuditUser();
         auditUser.setUserId(reqJson.getString("userId"));
+        auditUser.setStoreId(reqJson.getString("storeId"));
         auditUser.setPage(reqJson.getInteger("page"));
         auditUser.setRow(reqJson.getInteger("row"));
 

Api/src/main/java/com/java110/api/listener/complaint/SaveComplaintListener.java

@@ -4,14 +4,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.smo.complaint.IComplaintUserInnerServiceSMO;
+import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.utils.util.Assert;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.AppService;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ServiceCodeComplaintConstant;
 

CommonService/src/main/java/com/java110/common/CommonServiceApplicationStart.java

@@ -30,14 +30,22 @@ import java.nio.charset.Charset;
  * @date 2016年8月6日
  * @tag
  */
-@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.common",
-        "com.java110.core", "com.java110.cache", "com.java110.config.properties.code", "com.java110.db"},
+@SpringBootApplication(scanBasePackages = {
+        "com.java110.service",
+        "com.java110.common",
+        "com.java110.core",
+        "com.java110.cache",
+        "com.java110.config.properties.code",
+        "com.java110.db"},
         exclude = {LiquibaseAutoConfiguration.class,
                 org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.common.listener"})
-@EnableFeignClients(basePackages = {"com.java110.core.smo.user"})
+@EnableFeignClients(basePackages = {
+        "com.java110.core.smo.user",
+        "com.java110.core.smo.complaint"
+})
 public class CommonServiceApplicationStart {
 
     private static Logger logger = LoggerFactory.getLogger(CommonServiceApplicationStart.class);

CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -2,7 +2,9 @@ package com.java110.common.smo.impl;
 
 
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.complaint.IComplaintUserInnerServiceSMO;
+import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
+import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
+import com.java110.dto.FeeDto;
 import com.java110.dto.PageDto;
 import com.java110.dto.auditMessage.AuditMessageDto;
 import com.java110.dto.complaint.ComplaintDto;
@@ -13,7 +15,6 @@ import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.Comment;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskQuery;
@@ -39,6 +40,9 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
     @Autowired
     private TaskService taskService;
 
+    @Autowired
+    private IComplaintInnerServiceSMO complaintInnerServiceSMOImpl;
+
 
     /**
      * 启动流程
@@ -114,16 +118,22 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
             list = query.list();
         }
 
-        List<ComplaintDto> complaintDtos = new ArrayList<>();
-
+        List<String> complaintIds = new ArrayList<>();
         for (Task task : list) {
-            String id = task.getId();
-            //System.out.println("tasks:" + JSONObject.toJSONString(task));
-            ComplaintDto complaintDto = (ComplaintDto) taskService.getVariable(id, "complaintDto");
-            complaintDto.setTaskId(id);
-            complaintDtos.add(complaintDto);
+            String processInstanceId = task.getProcessInstanceId();
+            //3.使用流程实例，查询
+            ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+            //4.使用流程实例对象获取BusinessKey
+            String business_key = pi.getBusinessKey();
+            complaintIds.add(business_key);
         }
-        return complaintDtos;
+
+        //查询 投诉信息
+        ComplaintDto complaintDto = new ComplaintDto();
+        complaintDto.setStoreId(user.getStoreId());
+        complaintDto.setComplaintIds(complaintIds.toArray(new String[complaintIds.size()]));
+        List<ComplaintDto> tmpComplaintDtos = complaintInnerServiceSMOImpl.queryComplaints(complaintDto);
+        return tmpComplaintDtos;
     }
 
     public boolean completeTask(@RequestBody ComplaintDto complaintDto) {
@@ -165,4 +175,35 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
     }
 
 
+    public ProcessEngine getProcessEngine() {
+        return processEngine;
+    }
+
+    public void setProcessEngine(ProcessEngine processEngine) {
+        this.processEngine = processEngine;
+    }
+
+    public RuntimeService getRuntimeService() {
+        return runtimeService;
+    }
+
+    public void setRuntimeService(RuntimeService runtimeService) {
+        this.runtimeService = runtimeService;
+    }
+
+    public TaskService getTaskService() {
+        return taskService;
+    }
+
+    public void setTaskService(TaskService taskService) {
+        this.taskService = taskService;
+    }
+
+    public IComplaintInnerServiceSMO getComplaintInnerServiceSMOImpl() {
+        return complaintInnerServiceSMOImpl;
+    }
+
+    public void setComplaintInnerServiceSMOImpl(IComplaintInnerServiceSMO complaintInnerServiceSMOImpl) {
+        this.complaintInnerServiceSMOImpl = complaintInnerServiceSMOImpl;
+    }
 }

java110-bean/src/main/java/com/java110/dto/complaint/ComplaintDto.java

@@ -20,6 +20,7 @@ public class ComplaintDto extends PageDto implements Serializable {
     private String taskId;
 
     private String complaintId;
+    private String[] complaintIds;
     private String typeCd;
     private String typeCdName;
     private String context;
@@ -215,4 +216,12 @@ public class ComplaintDto extends PageDto implements Serializable {
     public void setCurrentUserId(String currentUserId) {
         this.currentUserId = currentUserId;
     }
+
+    public String[] getComplaintIds() {
+        return complaintIds;
+    }
+
+    public void setComplaintIds(String[] complaintIds) {
+        this.complaintIds = complaintIds;
+    }
 }

java110-bean/src/main/java/com/java110/entity/audit/AuditUser.java

@@ -14,6 +14,9 @@ public class AuditUser extends PageDto implements Serializable {
     // 审核用户ID
     private String userId;
 
+    //商户ID
+    private String storeId;
+
     private String userName;
 
     // 审核环节 如部门经理审核 ， 财务审核 ，采购人员采购
@@ -62,4 +65,12 @@ public class AuditUser extends PageDto implements Serializable {
     public void setAuditUserId(String auditUserId) {
         this.auditUserId = auditUserId;
     }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/complaint/IComplaintUserInnerServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.core.smo.complaint;
+package com.java110.core.smo.complaintUser;
 
 import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.auditMessage.AuditMessageDto;

java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml

@@ -109,6 +109,12 @@ operate,complaint_id,type_cd,context,complaint_name,tel,state,store_id,b_id,room
         <if test="complaintId !=null and complaintId != ''">
             and t.complaint_id= #{complaintId}
         </if>
+        <if test="complaintIds != null ">
+            and t.complaint_id in
+            <foreach collection="complaintIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="typeCd !=null and typeCd != ''">
             and t.type_cd= #{typeCd}
         </if>
@@ -188,6 +194,12 @@ operate,complaint_id,type_cd,context,complaint_name,tel,state,store_id,b_id,room
         <if test="complaintId !=null and complaintId != ''">
             and t.complaint_id= #{complaintId}
         </if>
+        <if test="complaintIds != null ">
+            and t.complaint_id in
+            <foreach collection="complaintIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="typeCd !=null and typeCd != ''">
             and t.type_cd= #{typeCd}
         </if>