工作流功能开发完成，熟悉清楚，并且删除单独记录审批 意见记录表

CommonService/src/main/java/com/java110/common/dao/IAuditMessageServiceDao.java

@@ -1,81 +0,0 @@
-package com.java110.common.dao;
-
-
-import com.java110.utils.exception.DAOException;
-import com.java110.entity.merchant.BoMerchant;
-import com.java110.entity.merchant.BoMerchantAttr;
-import com.java110.entity.merchant.Merchant;
-import com.java110.entity.merchant.MerchantAttr;
-
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 审核原因组件内部之间使用，没有给外围系统提供服务能力
- * 审核原因服务接口类，要求全部以字符串传输，方便微服务化
- * 新建客户，修改客户，删除客户，查询客户等功能
- *
- * Created by wuxw on 2016/12/27.
- */
-public interface IAuditMessageServiceDao {
-
-    /**
-     * 保存 审核原因信息
-     * @param businessAuditMessageInfo 审核原因信息 封装
-     * @throws DAOException 操作数据库异常
-     */
-    void saveBusinessAuditMessageInfo(Map businessAuditMessageInfo) throws DAOException;
-
-
-
-    /**
-     * 查询审核原因信息（business过程）
-     * 根据bId 查询审核原因信息
-     * @param info bId 信息
-     * @return 审核原因信息
-     * @throws DAOException DAO异常
-     */
-    List<Map> getBusinessAuditMessageInfo(Map info) throws DAOException;
-
-
-
-
-    /**
-     * 保存 审核原因信息 Business数据到 Instance中
-     * @param info
-     * @throws DAOException DAO异常
-     */
-    void saveAuditMessageInfoInstance(Map info) throws DAOException;
-
-
-
-
-    /**
-     * 查询审核原因信息（instance过程）
-     * 根据bId 查询审核原因信息
-     * @param info bId 信息
-     * @return 审核原因信息
-     * @throws DAOException DAO异常
-     */
-    List<Map> getAuditMessageInfo(Map info) throws DAOException;
-
-
-
-    /**
-     * 修改审核原因信息
-     * @param info 修改信息
-     * @throws DAOException DAO异常
-     */
-    void updateAuditMessageInfoInstance(Map info) throws DAOException;
-
-
-    /**
-     * 查询审核原因总数
-     *
-     * @param info 审核原因信息
-     * @return 审核原因数量
-     */
-    int queryAuditMessagesCount(Map info);
-
-}

CommonService/src/main/java/com/java110/common/dao/impl/AuditMessageServiceDaoImpl.java

@@ -1,134 +0,0 @@
-package com.java110.common.dao.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.dao.IAuditMessageServiceDao;
-import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 审核原因服务 与数据库交互
- * Created by wuxw on 2017/4/5.
- */
-@Service("auditMessageServiceDaoImpl")
-//@Transactional
-public class AuditMessageServiceDaoImpl extends BaseServiceDao implements IAuditMessageServiceDao {
-
-    private static Logger logger = LoggerFactory.getLogger(AuditMessageServiceDaoImpl.class);
-
-    /**
-     * 审核原因信息封装
-     *
-     * @param businessAuditMessageInfo 审核原因信息 封装
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public void saveBusinessAuditMessageInfo(Map businessAuditMessageInfo) throws DAOException {
-        businessAuditMessageInfo.put("month", DateUtil.getCurrentMonth());
-        // 查询business_user 数据是否已经存在
-        logger.debug("保存审核原因信息 入参 businessAuditMessageInfo : {}", businessAuditMessageInfo);
-        int saveFlag = sqlSessionTemplate.insert("auditMessageServiceDaoImpl.saveBusinessAuditMessageInfo", businessAuditMessageInfo);
-
-        if (saveFlag < 1) {
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存审核原因数据失败：" + JSONObject.toJSONString(businessAuditMessageInfo));
-        }
-    }
-
-
-    /**
-     * 查询审核原因信息
-     *
-     * @param info bId 信息
-     * @return 审核原因信息
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public List<Map> getBusinessAuditMessageInfo(Map info) throws DAOException {
-
-        logger.debug("查询审核原因信息 入参 info : {}", info);
-
-        List<Map> businessAuditMessageInfos = sqlSessionTemplate.selectList("auditMessageServiceDaoImpl.getBusinessAuditMessageInfo", info);
-
-        return businessAuditMessageInfos;
-    }
-
-
-    /**
-     * 保存审核原因信息 到 instance
-     *
-     * @param info bId 信息
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public void saveAuditMessageInfoInstance(Map info) throws DAOException {
-        logger.debug("保存审核原因信息Instance 入参 info : {}", info);
-
-        int saveFlag = sqlSessionTemplate.insert("auditMessageServiceDaoImpl.saveAuditMessageInfoInstance", info);
-
-        if (saveFlag < 1) {
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存审核原因信息Instance数据失败：" + JSONObject.toJSONString(info));
-        }
-    }
-
-
-    /**
-     * 查询审核原因信息（instance）
-     *
-     * @param info bId 信息
-     * @return List<Map>
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public List<Map> getAuditMessageInfo(Map info) throws DAOException {
-        logger.debug("查询审核原因信息 入参 info : {}", info);
-
-        List<Map> businessAuditMessageInfos = sqlSessionTemplate.selectList("auditMessageServiceDaoImpl.getAuditMessageInfo", info);
-
-        return businessAuditMessageInfos;
-    }
-
-
-    /**
-     * 修改审核原因信息
-     *
-     * @param info 修改信息
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public void updateAuditMessageInfoInstance(Map info) throws DAOException {
-        logger.debug("修改审核原因信息Instance 入参 info : {}", info);
-
-        int saveFlag = sqlSessionTemplate.update("auditMessageServiceDaoImpl.updateAuditMessageInfoInstance", info);
-
-        if (saveFlag < 1) {
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改审核原因信息Instance数据失败：" + JSONObject.toJSONString(info));
-        }
-    }
-
-    /**
-     * 查询审核原因数量
-     *
-     * @param info 审核原因信息
-     * @return 审核原因数量
-     */
-    @Override
-    public int queryAuditMessagesCount(Map info) {
-        logger.debug("查询审核原因数据 入参 info : {}", info);
-
-        List<Map> businessAuditMessageInfos = sqlSessionTemplate.selectList("auditMessageServiceDaoImpl.queryAuditMessagesCount", info);
-        if (businessAuditMessageInfos.size() < 1) {
-            return 0;
-        }
-
-        return Integer.parseInt(businessAuditMessageInfos.get(0).get("count").toString());
-    }
-
-
-}

CommonService/src/main/java/com/java110/common/listener/auditMessage/AbstractAuditMessageBusinessServiceDataFlowListener.java

@@ -1,89 +0,0 @@
-package com.java110.common.listener.auditMessage;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.dao.IAuditMessageServiceDao;
-import com.java110.entity.center.Business;
-import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.exception.ListenerExecuteException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 审核原因 服务侦听 父类
- * Created by wuxw on 2018/7/4.
- */
-public abstract class AbstractAuditMessageBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
-    private static Logger logger = LoggerFactory.getLogger(AbstractAuditMessageBusinessServiceDataFlowListener.class);
-
-
-    /**
-     * 获取 DAO工具类
-     *
-     * @return
-     */
-    public abstract IAuditMessageServiceDao getAuditMessageServiceDaoImpl();
-
-    /**
-     * 刷新 businessAuditMessageInfo 数据
-     * 主要将 数据库 中字段和 接口传递字段建立关系
-     *
-     * @param businessAuditMessageInfo
-     */
-    protected void flushBusinessAuditMessageInfo(Map businessAuditMessageInfo, String statusCd) {
-        businessAuditMessageInfo.put("newBId", businessAuditMessageInfo.get("b_id"));
-        businessAuditMessageInfo.put("auditOrderType", businessAuditMessageInfo.get("audit_order_type"));
-        businessAuditMessageInfo.put("operate", businessAuditMessageInfo.get("operate"));
-        businessAuditMessageInfo.put("auditMessageId", businessAuditMessageInfo.get("audit_message_id"));
-        businessAuditMessageInfo.put("auditOrderId", businessAuditMessageInfo.get("audit_order_id"));
-        businessAuditMessageInfo.put("state", businessAuditMessageInfo.get("state"));
-        businessAuditMessageInfo.put("storeId", businessAuditMessageInfo.get("store_id"));
-        businessAuditMessageInfo.put("userName", businessAuditMessageInfo.get("user_name"));
-        businessAuditMessageInfo.put("message", businessAuditMessageInfo.get("message"));
-        businessAuditMessageInfo.put("userId", businessAuditMessageInfo.get("user_id"));
-        businessAuditMessageInfo.remove("bId");
-        businessAuditMessageInfo.put("statusCd", statusCd);
-    }
-
-
-    /**
-     * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
-     *
-     * @param businessAuditMessage 审核原因信息
-     */
-    protected void autoSaveDelBusinessAuditMessage(Business business, JSONObject businessAuditMessage) {
-//自动插入DEL
-        Map info = new HashMap();
-        info.put("auditMessageId", businessAuditMessage.getString("auditMessageId"));
-        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
-        List<Map> currentAuditMessageInfos = getAuditMessageServiceDaoImpl().getAuditMessageInfo(info);
-        if (currentAuditMessageInfos == null || currentAuditMessageInfos.size() != 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息，入参错误或数据有问题，请检查" + info);
-        }
-
-        Map currentAuditMessageInfo = currentAuditMessageInfos.get(0);
-
-        currentAuditMessageInfo.put("bId", business.getbId());
-
-        currentAuditMessageInfo.put("auditOrderType", currentAuditMessageInfo.get("audit_order_type"));
-        currentAuditMessageInfo.put("operate", currentAuditMessageInfo.get("operate"));
-        currentAuditMessageInfo.put("auditMessageId", currentAuditMessageInfo.get("audit_message_id"));
-        currentAuditMessageInfo.put("auditOrderId", currentAuditMessageInfo.get("audit_order_id"));
-        currentAuditMessageInfo.put("state", currentAuditMessageInfo.get("state"));
-        currentAuditMessageInfo.put("storeId", currentAuditMessageInfo.get("store_id"));
-        currentAuditMessageInfo.put("userName", currentAuditMessageInfo.get("user_name"));
-        currentAuditMessageInfo.put("message", currentAuditMessageInfo.get("message"));
-        currentAuditMessageInfo.put("userId", currentAuditMessageInfo.get("user_id"));
-
-
-        currentAuditMessageInfo.put("operate", StatusConstant.OPERATE_DEL);
-        getAuditMessageServiceDaoImpl().saveBusinessAuditMessageInfo(currentAuditMessageInfo);
-    }
-
-
-}

CommonService/src/main/java/com/java110/common/listener/auditMessage/DeleteAuditMessageInfoListener.java

@@ -1,180 +0,0 @@
-package com.java110.common.listener.auditMessage;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.dao.IAuditMessageServiceDao;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.Business;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.utils.util.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 删除审核原因信息 侦听
- * <p>
- * 处理节点
- * 1、businessAuditMessage:{} 审核原因基本信息节点
- * 2、businessAuditMessageAttr:[{}] 审核原因属性信息节点
- * 3、businessAuditMessagePhoto:[{}] 审核原因照片信息节点
- * 4、businessAuditMessageCerdentials:[{}] 审核原因证件信息节点
- * 协议地址 ：https://github.com/java110/MicroCommunity/wiki/%E5%88%A0%E9%99%A4%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("deleteAuditMessageInfoListener")
-@Transactional
-public class DeleteAuditMessageInfoListener extends AbstractAuditMessageBusinessServiceDataFlowListener {
-
-    private final static Logger logger = LoggerFactory.getLogger(DeleteAuditMessageInfoListener.class);
-    @Autowired
-    IAuditMessageServiceDao auditMessageServiceDaoImpl;
-
-    @Override
-    public int getOrder() {
-        return 3;
-    }
-
-    @Override
-    public String getBusinessTypeCd() {
-        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_AUDIT_MESSAGE;
-    }
-
-    /**
-     * 根据删除信息 查出Instance表中数据 保存至business表 （状态写DEL） 方便撤单时直接更新回去
-     *
-     * @param dataFlowContext 数据对象
-     * @param business        当前业务对象
-     */
-    @Override
-    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
-        JSONObject data = business.getDatas();
-
-        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
-
-        //处理 businessAuditMessage 节点
-        if (data.containsKey("businessAuditMessage")) {
-            //处理 businessAuditMessage 节点
-            if (data.containsKey("businessAuditMessage")) {
-                Object _obj = data.get("businessAuditMessage");
-                JSONArray businessAuditMessages = null;
-                if (_obj instanceof JSONObject) {
-                    businessAuditMessages = new JSONArray();
-                    businessAuditMessages.add(_obj);
-                } else {
-                    businessAuditMessages = (JSONArray) _obj;
-                }
-                //JSONObject businessAuditMessage = data.getJSONObject("businessAuditMessage");
-                for (int _auditMessageIndex = 0; _auditMessageIndex < businessAuditMessages.size(); _auditMessageIndex++) {
-                    JSONObject businessAuditMessage = businessAuditMessages.getJSONObject(_auditMessageIndex);
-                    doBusinessAuditMessage(business, businessAuditMessage);
-                    if (_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("auditMessageId", businessAuditMessage.getString("auditMessageId"));
-                    }
-                }
-            }
-        }
-
-
-    }
-
-    /**
-     * 删除 instance数据
-     *
-     * @param dataFlowContext 数据对象
-     * @param business        当前业务对象
-     */
-    @Override
-    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
-        String bId = business.getbId();
-        //Assert.hasLength(bId,"请求报文中没有包含 bId");
-
-        //审核原因信息
-        Map info = new HashMap();
-        info.put("bId", business.getbId());
-        info.put("operate", StatusConstant.OPERATE_DEL);
-
-        //审核原因信息
-        List<Map> businessAuditMessageInfos = auditMessageServiceDaoImpl.getBusinessAuditMessageInfo(info);
-        if (businessAuditMessageInfos != null && businessAuditMessageInfos.size() > 0) {
-            for (int _auditMessageIndex = 0; _auditMessageIndex < businessAuditMessageInfos.size(); _auditMessageIndex++) {
-                Map businessAuditMessageInfo = businessAuditMessageInfos.get(_auditMessageIndex);
-                flushBusinessAuditMessageInfo(businessAuditMessageInfo, StatusConstant.STATUS_CD_INVALID);
-                auditMessageServiceDaoImpl.updateAuditMessageInfoInstance(businessAuditMessageInfo);
-                dataFlowContext.addParamOut("auditMessageId", businessAuditMessageInfo.get("audit_message_id"));
-            }
-        }
-
-    }
-
-    /**
-     * 撤单
-     * 从business表中查询到DEL的数据 将instance中的数据更新回来
-     *
-     * @param dataFlowContext 数据对象
-     * @param business        当前业务对象
-     */
-    @Override
-    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
-        String bId = business.getbId();
-        //Assert.hasLength(bId,"请求报文中没有包含 bId");
-        Map info = new HashMap();
-        info.put("bId", bId);
-        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
-
-        Map delInfo = new HashMap();
-        delInfo.put("bId", business.getbId());
-        delInfo.put("operate", StatusConstant.OPERATE_DEL);
-        //审核原因信息
-        List<Map> auditMessageInfo = auditMessageServiceDaoImpl.getAuditMessageInfo(info);
-        if (auditMessageInfo != null && auditMessageInfo.size() > 0) {
-
-            //审核原因信息
-            List<Map> businessAuditMessageInfos = auditMessageServiceDaoImpl.getBusinessAuditMessageInfo(delInfo);
-            //除非程序出错了，这里不会为空
-            if (businessAuditMessageInfos == null || businessAuditMessageInfos.size() == 0) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败（auditMessage），程序内部异常,请检查！ " + delInfo);
-            }
-            for (int _auditMessageIndex = 0; _auditMessageIndex < businessAuditMessageInfos.size(); _auditMessageIndex++) {
-                Map businessAuditMessageInfo = businessAuditMessageInfos.get(_auditMessageIndex);
-                flushBusinessAuditMessageInfo(businessAuditMessageInfo, StatusConstant.STATUS_CD_VALID);
-                auditMessageServiceDaoImpl.updateAuditMessageInfoInstance(businessAuditMessageInfo);
-            }
-        }
-    }
-
-
-    /**
-     * 处理 businessAuditMessage 节点
-     *
-     * @param business             总的数据节点
-     * @param businessAuditMessage 审核原因节点
-     */
-    private void doBusinessAuditMessage(Business business, JSONObject businessAuditMessage) {
-
-        Assert.jsonObjectHaveKey(businessAuditMessage, "auditMessageId", "businessAuditMessage 节点下没有包含 auditMessageId 节点");
-
-        if (businessAuditMessage.getString("auditMessageId").startsWith("-")) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "auditMessageId 错误，不能自动生成（必须已经存在的auditMessageId）" + businessAuditMessage);
-        }
-        //自动插入DEL
-        autoSaveDelBusinessAuditMessage(business, businessAuditMessage);
-    }
-
-    public IAuditMessageServiceDao getAuditMessageServiceDaoImpl() {
-        return auditMessageServiceDaoImpl;
-    }
-
-    public void setAuditMessageServiceDaoImpl(IAuditMessageServiceDao auditMessageServiceDaoImpl) {
-        this.auditMessageServiceDaoImpl = auditMessageServiceDaoImpl;
-    }
-}

CommonService/src/main/java/com/java110/common/listener/auditMessage/SaveAuditMessageInfoListener.java

@@ -1,175 +0,0 @@
-package com.java110.common.listener.auditMessage;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.dao.IAuditMessageServiceDao;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.entity.center.Business;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.util.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 保存 审核原因信息 侦听
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("saveAuditMessageInfoListener")
-@Transactional
-public class SaveAuditMessageInfoListener extends AbstractAuditMessageBusinessServiceDataFlowListener{
-
-    private static Logger logger = LoggerFactory.getLogger(SaveAuditMessageInfoListener.class);
-
-    @Autowired
-    private IAuditMessageServiceDao auditMessageServiceDaoImpl;
-
-    @Override
-    public int getOrder() {
-        return 0;
-    }
-
-    @Override
-    public String getBusinessTypeCd() {
-        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_AUDIT_MESSAGE;
-    }
-
-    /**
-     * 保存审核原因信息 business 表中
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
-        JSONObject data = business.getDatas();
-        Assert.notEmpty(data,"没有datas 节点，或没有子节点需要处理");
-
-        //处理 businessAuditMessage 节点
-        if(data.containsKey("businessAuditMessage")){
-            Object bObj = data.get("businessAuditMessage");
-            JSONArray businessAuditMessages = null;
-            if(bObj instanceof JSONObject){
-                businessAuditMessages = new JSONArray();
-                businessAuditMessages.add(bObj);
-            }else {
-                businessAuditMessages = (JSONArray)bObj;
-            }
-            //JSONObject businessAuditMessage = data.getJSONObject("businessAuditMessage");
-            for (int bAuditMessageIndex = 0; bAuditMessageIndex < businessAuditMessages.size();bAuditMessageIndex++) {
-                JSONObject businessAuditMessage = businessAuditMessages.getJSONObject(bAuditMessageIndex);
-                doBusinessAuditMessage(business, businessAuditMessage);
-                if(bObj instanceof JSONObject) {
-                    dataFlowContext.addParamOut("auditMessageId", businessAuditMessage.getString("auditMessageId"));
-                }
-            }
-        }
-    }
-
-    /**
-     * business 数据转移到 instance
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
-        JSONObject data = business.getDatas();
-
-        Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_ADD);
-
-        //审核原因信息
-        List<Map> businessAuditMessageInfo = auditMessageServiceDaoImpl.getBusinessAuditMessageInfo(info);
-        if( businessAuditMessageInfo != null && businessAuditMessageInfo.size() >0) {
-            reFreshShareColumn(info, businessAuditMessageInfo.get(0));
-            auditMessageServiceDaoImpl.saveAuditMessageInfoInstance(info);
-            if(businessAuditMessageInfo.size() == 1) {
-                dataFlowContext.addParamOut("auditMessageId", businessAuditMessageInfo.get(0).get("audit_message_id"));
-            }
-        }
-    }
-
-
-    /**
-     * 刷 分片字段
-     *
-     * @param info         查询对象
-     * @param businessInfo 小区ID
-     */
-    private void reFreshShareColumn(Map info, Map businessInfo) {
-
-        if (info.containsKey("storeId")) {
-            return;
-        }
-
-        if (!businessInfo.containsKey("store_id")) {
-            return;
-        }
-
-        info.put("storeId", businessInfo.get("store_id"));
-    }
-    /**
-     * 撤单
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
-        String bId = business.getbId();
-        //Assert.hasLength(bId,"请求报文中没有包含 bId");
-        Map info = new HashMap();
-        info.put("bId",bId);
-        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
-        Map paramIn = new HashMap();
-        paramIn.put("bId",bId);
-        paramIn.put("statusCd",StatusConstant.STATUS_CD_INVALID);
-        //审核原因信息
-        List<Map> auditMessageInfo = auditMessageServiceDaoImpl.getAuditMessageInfo(info);
-        if(auditMessageInfo != null && auditMessageInfo.size() > 0){
-            reFreshShareColumn(paramIn, auditMessageInfo.get(0));
-            auditMessageServiceDaoImpl.updateAuditMessageInfoInstance(paramIn);
-        }
-    }
-
-
-
-    /**
-     * 处理 businessAuditMessage 节点
-     * @param business 总的数据节点
-     * @param businessAuditMessage 审核原因节点
-     */
-    private void doBusinessAuditMessage(Business business,JSONObject businessAuditMessage){
-
-        Assert.jsonObjectHaveKey(businessAuditMessage,"auditMessageId","businessAuditMessage 节点下没有包含 auditMessageId 节点");
-
-        if(businessAuditMessage.getString("auditMessageId").startsWith("-")){
-            //刷新缓存
-            //flushAuditMessageId(business.getDatas());
-
-            businessAuditMessage.put("auditMessageId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_auditMessageId));
-
-        }
-
-        businessAuditMessage.put("bId",business.getbId());
-        businessAuditMessage.put("operate", StatusConstant.OPERATE_ADD);
-        //保存审核原因信息
-        auditMessageServiceDaoImpl.saveBusinessAuditMessageInfo(businessAuditMessage);
-
-    }
-
-    public IAuditMessageServiceDao getAuditMessageServiceDaoImpl() {
-        return auditMessageServiceDaoImpl;
-    }
-
-    public void setAuditMessageServiceDaoImpl(IAuditMessageServiceDao auditMessageServiceDaoImpl) {
-        this.auditMessageServiceDaoImpl = auditMessageServiceDaoImpl;
-    }
-}

CommonService/src/main/java/com/java110/common/listener/auditMessage/UpdateAuditMessageInfoListener.java

@@ -1,190 +0,0 @@
-package com.java110.common.listener.auditMessage;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.dao.IAuditMessageServiceDao;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.Business;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.utils.util.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 修改审核原因信息 侦听
- *
- * 处理节点
- * 1、businessAuditMessage:{} 审核原因基本信息节点
- * 2、businessAuditMessageAttr:[{}] 审核原因属性信息节点
- * 3、businessAuditMessagePhoto:[{}] 审核原因照片信息节点
- * 4、businessAuditMessageCerdentials:[{}] 审核原因证件信息节点
- * 协议地址 ：https://github.com/java110/MicroCommunity/wiki/%E4%BF%AE%E6%94%B9%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("updateAuditMessageInfoListener")
-@Transactional
-public class UpdateAuditMessageInfoListener extends AbstractAuditMessageBusinessServiceDataFlowListener {
-
-    private static Logger logger = LoggerFactory.getLogger(UpdateAuditMessageInfoListener.class);
-    @Autowired
-    private IAuditMessageServiceDao auditMessageServiceDaoImpl;
-
-    @Override
-    public int getOrder() {
-        return 2;
-    }
-
-    @Override
-    public String getBusinessTypeCd() {
-        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_AUDIT_MESSAGE;
-    }
-
-    /**
-     * business过程
-     * @param dataFlowContext 上下文对象
-     * @param business 业务对象
-     */
-    @Override
-    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
-
-        JSONObject data = business.getDatas();
-
-        Assert.notEmpty(data,"没有datas 节点，或没有子节点需要处理");
-
-        //处理 businessAuditMessage 节点
-        if(data.containsKey("businessAuditMessage")){
-            //处理 businessAuditMessage 节点
-            if(data.containsKey("businessAuditMessage")){
-                Object _obj = data.get("businessAuditMessage");
-                JSONArray businessAuditMessages = null;
-                if(_obj instanceof JSONObject){
-                    businessAuditMessages = new JSONArray();
-                    businessAuditMessages.add(_obj);
-                }else {
-                    businessAuditMessages = (JSONArray)_obj;
-                }
-                //JSONObject businessAuditMessage = data.getJSONObject("businessAuditMessage");
-                for (int _auditMessageIndex = 0; _auditMessageIndex < businessAuditMessages.size();_auditMessageIndex++) {
-                    JSONObject businessAuditMessage = businessAuditMessages.getJSONObject(_auditMessageIndex);
-                    doBusinessAuditMessage(business, businessAuditMessage);
-                    if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("auditMessageId", businessAuditMessage.getString("auditMessageId"));
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * business to instance 过程
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
-
-        JSONObject data = business.getDatas();
-
-        Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_ADD);
-
-        //审核原因信息
-        List<Map> businessAuditMessageInfos = auditMessageServiceDaoImpl.getBusinessAuditMessageInfo(info);
-        if( businessAuditMessageInfos != null && businessAuditMessageInfos.size() >0) {
-            for (int _auditMessageIndex = 0; _auditMessageIndex < businessAuditMessageInfos.size();_auditMessageIndex++) {
-                Map businessAuditMessageInfo = businessAuditMessageInfos.get(_auditMessageIndex);
-                flushBusinessAuditMessageInfo(businessAuditMessageInfo,StatusConstant.STATUS_CD_VALID);
-                auditMessageServiceDaoImpl.updateAuditMessageInfoInstance(businessAuditMessageInfo);
-                if(businessAuditMessageInfo.size() == 1) {
-                    dataFlowContext.addParamOut("auditMessageId", businessAuditMessageInfo.get("audit_message_id"));
-                }
-            }
-        }
-
-    }
-
-    /**
-     * 撤单
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
-
-        String bId = business.getbId();
-        //Assert.hasLength(bId,"请求报文中没有包含 bId");
-        Map info = new HashMap();
-        info.put("bId",bId);
-        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
-        Map delInfo = new HashMap();
-        delInfo.put("bId",business.getbId());
-        delInfo.put("operate",StatusConstant.OPERATE_DEL);
-        //审核原因信息
-        List<Map> auditMessageInfo = auditMessageServiceDaoImpl.getAuditMessageInfo(info);
-        if(auditMessageInfo != null && auditMessageInfo.size() > 0){
-
-            //审核原因信息
-            List<Map> businessAuditMessageInfos = auditMessageServiceDaoImpl.getBusinessAuditMessageInfo(delInfo);
-            //除非程序出错了，这里不会为空
-            if(businessAuditMessageInfos == null || businessAuditMessageInfos.size() == 0){
-                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败（auditMessage），程序内部异常,请检查！ "+delInfo);
-            }
-            for (int _auditMessageIndex = 0; _auditMessageIndex < businessAuditMessageInfos.size();_auditMessageIndex++) {
-                Map businessAuditMessageInfo = businessAuditMessageInfos.get(_auditMessageIndex);
-                flushBusinessAuditMessageInfo(businessAuditMessageInfo,StatusConstant.STATUS_CD_VALID);
-                auditMessageServiceDaoImpl.updateAuditMessageInfoInstance(businessAuditMessageInfo);
-            }
-        }
-
-    }
-
-
-
-    /**
-     * 处理 businessAuditMessage 节点
-     * @param business 总的数据节点
-     * @param businessAuditMessage 审核原因节点
-     */
-    private void doBusinessAuditMessage(Business business,JSONObject businessAuditMessage){
-
-        Assert.jsonObjectHaveKey(businessAuditMessage,"auditMessageId","businessAuditMessage 节点下没有包含 auditMessageId 节点");
-
-        if(businessAuditMessage.getString("auditMessageId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"auditMessageId 错误，不能自动生成（必须已经存在的auditMessageId）"+businessAuditMessage);
-        }
-        //自动保存DEL
-        autoSaveDelBusinessAuditMessage(business,businessAuditMessage);
-
-        businessAuditMessage.put("bId",business.getbId());
-        businessAuditMessage.put("operate", StatusConstant.OPERATE_ADD);
-        //保存审核原因信息
-        auditMessageServiceDaoImpl.saveBusinessAuditMessageInfo(businessAuditMessage);
-
-    }
-
-
-
-
-    public IAuditMessageServiceDao getAuditMessageServiceDaoImpl() {
-        return auditMessageServiceDaoImpl;
-    }
-
-    public void setAuditMessageServiceDaoImpl(IAuditMessageServiceDao auditMessageServiceDaoImpl) {
-        this.auditMessageServiceDaoImpl = auditMessageServiceDaoImpl;
-    }
-
-
-
-}

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

@@ -1,111 +0,0 @@
-package com.java110.common.smo.impl;
-
-
-import com.java110.common.dao.IAuditMessageServiceDao;
-import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.audit.IAuditMessageInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.dto.PageDto;
-import com.java110.dto.UserDto;
-import com.java110.dto.auditMessage.AuditMessageDto;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ClassName FloorInnerServiceSMOImpl
- * @Description 审核原因内部服务实现类
- * @Author wuxw
- * @Date 2019/4/24 9:20
- * @Version 1.0
- * add by wuxw 2019/4/24
- **/
-@RestController
-public class AuditMessageInnerServiceSMOImpl extends BaseServiceSMO implements IAuditMessageInnerServiceSMO {
-
-    @Autowired
-    private IAuditMessageServiceDao auditMessageServiceDaoImpl;
-
-    @Autowired
-    private IUserInnerServiceSMO userInnerServiceSMOImpl;
-
-    @Override
-    public List<AuditMessageDto> queryAuditMessages(@RequestBody  AuditMessageDto auditMessageDto) {
-
-        //校验是否传了 分页信息
-
-        int page = auditMessageDto.getPage();
-
-        if (page != PageDto.DEFAULT_PAGE) {
-            auditMessageDto.setPage((page - 1) * auditMessageDto.getRow());
-        }
-
-        List<AuditMessageDto> auditMessages = BeanConvertUtil.covertBeanList(auditMessageServiceDaoImpl.getAuditMessageInfo(BeanConvertUtil.beanCovertMap(auditMessageDto)), AuditMessageDto.class);
-
-        if (auditMessages == null || auditMessages.size() == 0) {
-            return auditMessages;
-        }
-
-        String[] userIds = getUserIds(auditMessages);
-        //根据 userId 查询用户信息
-        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
-
-        for (AuditMessageDto auditMessage : auditMessages) {
-            refreshAuditMessage(auditMessage, users);
-        }
-        return auditMessages;
-    }
-
-    /**
-     * 从用户列表中查询用户，将用户中的信息 刷新到 floor对象中
-     *
-     * @param auditMessage 小区审核原因信息
-     * @param users 用户列表
-     */
-    private void refreshAuditMessage(AuditMessageDto auditMessage, List<UserDto> users) {
-        for (UserDto user : users) {
-            if (auditMessage.getUserId().equals(user.getUserId())) {
-                BeanConvertUtil.covertBean(user, auditMessage);
-            }
-        }
-    }
-
-    /**
-     * 获取批量userId
-     *
-     * @param auditMessages 小区楼信息
-     * @return 批量userIds 信息
-     */
-    private String[] getUserIds(List<AuditMessageDto> auditMessages) {
-        List<String> userIds = new ArrayList<String>();
-        for (AuditMessageDto auditMessage : auditMessages) {
-            userIds.add(auditMessage.getUserId());
-        }
-
-        return userIds.toArray(new String[userIds.size()]);
-    }
-
-    @Override
-    public int queryAuditMessagesCount(@RequestBody AuditMessageDto auditMessageDto) {
-        return auditMessageServiceDaoImpl.queryAuditMessagesCount(BeanConvertUtil.beanCovertMap(auditMessageDto));    }
-
-    public IAuditMessageServiceDao getAuditMessageServiceDaoImpl() {
-        return auditMessageServiceDaoImpl;
-    }
-
-    public void setAuditMessageServiceDaoImpl(IAuditMessageServiceDao auditMessageServiceDaoImpl) {
-        this.auditMessageServiceDaoImpl = auditMessageServiceDaoImpl;
-    }
-
-    public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
-        return userInnerServiceSMOImpl;
-    }
-
-    public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
-        this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
-    }
-}

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

@@ -4,12 +4,16 @@ package com.java110.common.smo.impl;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.complaint.IComplaintUserInnerServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.auditMessage.AuditMessageDto;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.entity.audit.AuditUser;
 import org.activiti.engine.ProcessEngine;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +49,7 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         Map<String, Object> variables = new HashMap<String, Object>();
         variables.put("complaintDto", complaintDto);
         //开启流程
-        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("complaint", variables);
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("complaint", complaintDto.getComplaintId(), variables);
         //将得到的实例流程id值赋给之前设置的变量
         String processInstanceId = processInstance.getId();
         // System.out.println("流程开启成功.......实例流程id:" + processInstanceId);
@@ -75,13 +79,14 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
      */
     public List<ComplaintDto> getUserTasks(@RequestBody AuditUser user) {
         TaskService taskService = processEngine.getTaskService();
-        TaskQuery query = taskService.createTaskQuery().processDefinitionKey("complaint");;
+        TaskQuery query = taskService.createTaskQuery().processDefinitionKey("complaint");
+        ;
         query.taskAssignee(user.getUserId());
         query.orderByTaskCreateTime().desc();
         List<Task> list = null;
         if (user.getPage() != PageDto.DEFAULT_PAGE) {
             list = query.listPage(user.getPage(), user.getRow());
-        }else{
+        } else {
             list = query.list();
         }
 
@@ -97,33 +102,42 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         return complaintDtos;
     }
 
-    public boolean agreeCompleteTask(@RequestBody ComplaintDto complaintDto) {
+    public boolean completeTask(@RequestBody ComplaintDto complaintDto) {
         TaskService taskService = processEngine.getTaskService();
+        Task task = taskService.createTaskQuery().taskId(complaintDto.getTaskId()).singleResult();
+        String processInstanceId = task.getProcessInstanceId();
+        Authentication.setAuthenticatedUserId(complaintDto.getCurrentUserId());
+        taskService.addComment(complaintDto.getTaskId(), processInstanceId, complaintDto.getAuditMessage());
         Map<String, Object> variables = new HashMap<String, Object>();
         variables.put("auditCode", complaintDto.getAuditCode());
         taskService.complete(complaintDto.getTaskId(), variables);
-        return true;
-    }
 
-    public boolean refuteCompleteTask(@RequestBody ComplaintDto complaintDto) {
-        TaskService taskService = processEngine.getTaskService();
-        Map<String, Object> variables = new HashMap<String, Object>();
-        variables.put("auditCode", complaintDto.getAuditCode());
-        taskService.complete(complaintDto.getTaskId(), variables);
-        return true;
+        ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+        if (pi == null) {
+            return true;
+        }
+        return false;
     }
 
-    /**
-     * 审核 当前任务
-     *
-     * @param complaintDto 资源订单
-     * @return
-     */
-    public boolean complete(@RequestBody ComplaintDto complaintDto) {
+    public List<AuditMessageDto> getAuditMessage(@RequestBody ComplaintDto complaintDto) {
+
         TaskService taskService = processEngine.getTaskService();
+        Task task = taskService.createTaskQuery().taskId(complaintDto.getTaskId()).singleResult();
+        String processInstanceId = task.getProcessInstanceId();
+        List<Comment> comments = taskService.getProcessInstanceComments(processInstanceId);
+        List<AuditMessageDto> auditMessageDtos = new ArrayList<>();
+        if (comments == null || comments.size() < 1) {
+            return auditMessageDtos;
+        }
+        AuditMessageDto messageDto = null;
+        for (Comment comment : comments) {
+            messageDto = new AuditMessageDto();
+            messageDto.setCreateTime(comment.getTime());
+            messageDto.setUserId(comment.getUserId());
+            messageDto.setMessage(comment.getFullMessage());
+        }
 
-        taskService.complete(complaintDto.getTaskId());
-        return true;
+        return auditMessageDtos;
     }
 
 

java110-bean/src/main/java/com/java110/dto/auditMessage/AuditMessageDto.java

@@ -15,61 +15,12 @@ import java.util.Date;
  **/
 public class AuditMessageDto extends PageDto implements Serializable {
 
-    private String auditOrderType;
-    private String auditMessageId;
-    private String auditOrderId;
-    private String state;
-    private String storeId;
     private String userName;
     private String message;
     private String userId;
 
-
     private Date createTime;
 
-    private String statusCd = "0";
-
-
-    public String getAuditOrderType() {
-        return auditOrderType;
-    }
-
-    public void setAuditOrderType(String auditOrderType) {
-        this.auditOrderType = auditOrderType;
-    }
-
-    public String getAuditMessageId() {
-        return auditMessageId;
-    }
-
-    public void setAuditMessageId(String auditMessageId) {
-        this.auditMessageId = auditMessageId;
-    }
-
-    public String getAuditOrderId() {
-        return auditOrderId;
-    }
-
-    public void setAuditOrderId(String auditOrderId) {
-        this.auditOrderId = auditOrderId;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(String storeId) {
-        this.storeId = storeId;
-    }
-
     public String getUserName() {
         return userName;
     }
@@ -103,11 +54,4 @@ public class AuditMessageDto extends PageDto implements Serializable {
         this.createTime = createTime;
     }
 
-    public String getStatusCd() {
-        return statusCd;
-    }
-
-    public void setStatusCd(String statusCd) {
-        this.statusCd = statusCd;
-    }
 }

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

@@ -34,6 +34,8 @@ public class ComplaintDto extends PageDto implements Serializable {
     private String floorNum;
     private String communityId;
 
+    private String currentUserId;
+
     //
     private String auditCode;
 
@@ -205,4 +207,12 @@ public class ComplaintDto extends PageDto implements Serializable {
     public void setAuditMessage(String auditMessage) {
         this.auditMessage = auditMessage;
     }
+
+    public String getCurrentUserId() {
+        return currentUserId;
+    }
+
+    public void setCurrentUserId(String currentUserId) {
+        this.currentUserId = currentUserId;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/audit/IAuditMessageInnerServiceSMO.java

@@ -1,42 +0,0 @@
-package com.java110.core.smo.audit;
-
-import com.java110.core.feign.FeignConfiguration;
-import com.java110.dto.auditMessage.AuditMessageDto;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.util.List;
-
-/**
- * @ClassName IAuditMessageInnerServiceSMO
- * @Description 审核原因接口类
- * @Author wuxw
- * @Date 2019/4/24 9:04
- * @Version 1.0
- * add by wuxw 2019/4/24
- **/
-@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
-@RequestMapping("/auditMessageApi")
-public interface IAuditMessageInnerServiceSMO {
-
-    /**
-     * <p>查询小区楼信息</p>
-     *
-     *
-     * @param auditMessageDto 数据对象分享
-     * @return AuditMessageDto 对象数据
-     */
-    @RequestMapping(value = "/queryAuditMessages", method = RequestMethod.POST)
-    List<AuditMessageDto> queryAuditMessages(@RequestBody AuditMessageDto auditMessageDto);
-
-    /**
-     * 查询<p>小区楼</p>总记录数
-     *
-     * @param auditMessageDto 数据对象分享
-     * @return 小区下的小区楼记录数
-     */
-    @RequestMapping(value = "/queryAuditMessagesCount", method = RequestMethod.POST)
-    int queryAuditMessagesCount(@RequestBody AuditMessageDto auditMessageDto);
-}

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

@@ -1,6 +1,7 @@
 package com.java110.core.smo.complaint;
 
 import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.auditMessage.AuditMessageDto;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.entity.audit.AuditUser;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -40,18 +41,20 @@ public interface IComplaintUserInnerServiceSMO {
     public List<ComplaintDto> getUserTasks(@RequestBody AuditUser user);
 
 
-    @RequestMapping(value = "/agreeCompleteTask", method = RequestMethod.POST)
-    public boolean agreeCompleteTask(@RequestBody ComplaintDto complaintDto);
-
-    @RequestMapping(value = "/refuteCompleteTask", method = RequestMethod.POST)
-    public boolean refuteCompleteTask(@RequestBody ComplaintDto complaintDto);
+    /**
+     * 处理任务
+     * @param complaintDto
+     * @return true 为流程结束 false 为流程没有结束
+     */
+    @RequestMapping(value = "/completeTask", method = RequestMethod.POST)
+    public boolean completeTask(@RequestBody ComplaintDto complaintDto);
 
     /**
-     * 审核 当前任务
-     *
-     * @param complaintDto 资源订单
+     * 查询批注信息
+     * @param complaintDto
      * @return
      */
-    @RequestMapping(value = "/complete", method = RequestMethod.POST)
-    public boolean complete(@RequestBody ComplaintDto complaintDto);
+    @RequestMapping(value = "/getAuditMessage", method = RequestMethod.POST)
+    public List<AuditMessageDto> getAuditMessage(@RequestBody ComplaintDto complaintDto);
+
 }

java110-db/src/main/resources/mapper/common/AuditMessageServiceDaoImplMapper.xml

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="auditMessageServiceDaoImpl">
-
-    <!-- 保存审核原因信息 add by wuxw 2018-07-03 -->
-    <insert id="saveBusinessAuditMessageInfo" parameterType="Map">
-           insert into business_audit_message(
-            audit_order_type,operate,audit_message_id,audit_order_id,state,store_id,user_name,message,b_id,user_id
-            ) values (
-            #{auditOrderType},#{operate},#{auditMessageId},#{auditOrderId},#{state},#{storeId},#{userName},#{message},#{bId},#{userId}
-            )
-       </insert>
-
-
-    <!-- 查询审核原因信息（Business） add by wuxw 2018-07-03 -->
-    <select id="getBusinessAuditMessageInfo" parameterType="Map" resultType="Map">
-        select t.audit_order_type,t.audit_order_type auditOrderType,t.operate,t.audit_message_id,t.audit_message_id
-        auditMessageId,t.audit_order_id,t.audit_order_id auditOrderId,t.state,t.store_id,t.store_id
-        storeId,t.user_name,t.user_name userName,t.message,t.b_id,t.b_id bId,t.user_id,t.user_id userId
-        from business_audit_message t
-        where 1 =1
-        <if test="auditOrderType !=null and auditOrderType != ''">
-            and t.audit_order_type= #{auditOrderType}
-        </if>
-        <if test="operate !=null and operate != ''">
-            and t.operate= #{operate}
-        </if>
-        <if test="auditMessageId !=null and auditMessageId != ''">
-            and t.audit_message_id= #{auditMessageId}
-        </if>
-        <if test="auditOrderId !=null and auditOrderId != ''">
-            and t.audit_order_id= #{auditOrderId}
-        </if>
-        <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
-        </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
-        <if test="message !=null and message != ''">
-            and t.message= #{message}
-        </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
-
-    </select>
-
-
-    <!-- 保存审核原因信息至 instance表中 add by wuxw 2018-07-03 -->
-    <insert id="saveAuditMessageInfoInstance" parameterType="Map">
-        insert into audit_message(
-        audit_order_type,audit_message_id,audit_order_id,status_cd,state,store_id,user_name,message,b_id,user_id
-        ) select
-        t.audit_order_type,t.audit_message_id,t.audit_order_id,'0',t.state,t.store_id,t.user_name,t.message,t.b_id,t.user_id
-        from business_audit_message t where 1=1
-        <if test="auditOrderType !=null and auditOrderType != ''">
-            and t.audit_order_type= #{auditOrderType}
-        </if>
-        and t.operate= 'ADD'
-        <if test="auditMessageId !=null and auditMessageId != ''">
-            and t.audit_message_id= #{auditMessageId}
-        </if>
-        <if test="auditOrderId !=null and auditOrderId != ''">
-            and t.audit_order_id= #{auditOrderId}
-        </if>
-        <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
-        </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
-        <if test="message !=null and message != ''">
-            and t.message= #{message}
-        </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
-
-    </insert>
-
-
-    <!-- 查询审核原因信息 add by wuxw 2018-07-03 -->
-    <select id="getAuditMessageInfo" parameterType="Map" resultType="Map">
-        select t.audit_order_type,t.audit_order_type auditOrderType,t.audit_message_id,t.audit_message_id
-        auditMessageId,t.audit_order_id,t.audit_order_id auditOrderId,t.status_cd,t.status_cd
-        statusCd,t.state,t.store_id,t.store_id storeId,t.user_name,t.user_name userName,t.message,t.b_id,t.b_id
-        bId,t.user_id,t.user_id userId
-        from audit_message t
-        where 1 =1
-        <if test="auditOrderType !=null and auditOrderType != ''">
-            and t.audit_order_type= #{auditOrderType}
-        </if>
-        <if test="auditMessageId !=null and auditMessageId != ''">
-            and t.audit_message_id= #{auditMessageId}
-        </if>
-        <if test="auditOrderId !=null and auditOrderId != ''">
-            and t.audit_order_id= #{auditOrderId}
-        </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
-        <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
-        </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
-        <if test="message !=null and message != ''">
-            and t.message= #{message}
-        </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
-        <if test="page != -1 and page != null ">
-            limit #{page}, #{row}
-        </if>
-
-    </select>
-
-
-    <!-- 修改审核原因信息 add by wuxw 2018-07-03 -->
-    <update id="updateAuditMessageInfoInstance" parameterType="Map">
-        update audit_message t set t.status_cd = #{statusCd}
-        <if test="newBId != null and newBId != ''">
-            ,t.b_id = #{newBId}
-        </if>
-        <if test="auditOrderType !=null and auditOrderType != ''">
-            , t.audit_order_type= #{auditOrderType}
-        </if>
-        <if test="auditOrderId !=null and auditOrderId != ''">
-            , t.audit_order_id= #{auditOrderId}
-        </if>
-        <if test="state !=null and state != ''">
-            , t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            , t.store_id= #{storeId}
-        </if>
-        <if test="userName !=null and userName != ''">
-            , t.user_name= #{userName}
-        </if>
-        <if test="message !=null and message != ''">
-            , t.message= #{message}
-        </if>
-        <if test="userId !=null and userId != ''">
-            , t.user_id= #{userId}
-        </if>
-        where 1=1
-        <if test="auditMessageId !=null and auditMessageId != ''">
-            and t.audit_message_id= #{auditMessageId}
-        </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
-
-    </update>
-
-    <!-- 查询审核原因数量 add by wuxw 2018-07-03 -->
-    <select id="queryAuditMessagesCount" parameterType="Map" resultType="Map">
-        select count(1) count
-        from audit_message t
-        where 1 =1
-        <if test="auditOrderType !=null and auditOrderType != ''">
-            and t.audit_order_type= #{auditOrderType}
-        </if>
-        <if test="auditMessageId !=null and auditMessageId != ''">
-            and t.audit_message_id= #{auditMessageId}
-        </if>
-        <if test="auditOrderId !=null and auditOrderId != ''">
-            and t.audit_order_id= #{auditOrderId}
-        </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
-        <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
-        </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
-        <if test="message !=null and message != ''">
-            and t.message= #{message}
-        </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
-
-
-    </select>
-
-</mapper>