优化审核代码

java110-bean/src/main/java/com/java110/dto/ownerSettledApply/OwnerSettledApplyDto.java

@@ -23,6 +23,7 @@ public class OwnerSettledApplyDto extends OwnerSettledSettingDto implements Seri
     public static final String STATE_FAIT = "F"; //审核失败
 
     private String applyId;
+    private String[] applyIds;
     private String createUserId;
     private String remark;
     private String state;
@@ -139,4 +140,12 @@ public class OwnerSettledApplyDto extends OwnerSettledSettingDto implements Seri
     public void setRoomCount(String roomCount) {
         this.roomCount = roomCount;
     }
+
+    public String[] getApplyIds() {
+        return applyIds;
+    }
+
+    public void setApplyIds(String[] applyIds) {
+        this.applyIds = applyIds;
+    }
 }

java110-db/src/main/resources/mapper/user/OwnerSettledApplyV1ServiceDaoImplMapper.xml

@@ -29,6 +29,13 @@
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
+
+        <if test="applyIds !=null ">
+            and t.apply_id in
+            <foreach collection="applyIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>
@@ -96,6 +103,12 @@
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
+        <if test="applyIds !=null ">
+            and t.apply_id in
+            <foreach collection="applyIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>

service-user/src/main/java/com/java110/user/cmd/ownerSettled/AuditUndoOwnerSettledCmd.java

@@ -0,0 +1,95 @@
+package com.java110.user.cmd.ownerSettled;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+import com.java110.dto.visit.VisitDto;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
+import com.java110.po.ownerSettledApply.OwnerSettledApplyPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * 审核 放行
+ */
+@Java110Cmd(serviceCode = "ownerSettled.auditUndoOwnerSettled")
+public class AuditUndoOwnerSettledCmd extends Cmd {
+
+    @Autowired
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+
+    @Autowired
+    private IOwnerSettledApplyV1InnerServiceSMO ownerSettledApplyV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson, "taskId", "未包含任务");
+        Assert.hasKeyAndValue(reqJson, "applyId", "未包含applyId");
+        Assert.hasKeyAndValue(reqJson, "flowId", "未包含流程");
+        Assert.hasKeyAndValue(reqJson, "auditCode", "未包含状态");
+        Assert.hasKeyAndValue(reqJson, "auditMessage", "未包含状态说明");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String storeId = context.getReqHeaders().get("store-id");
+
+        OwnerSettledApplyDto ownerSettledApplyDto = new OwnerSettledApplyDto();
+        ownerSettledApplyDto.setApplyId(reqJson.getString("applyId"));
+        List<OwnerSettledApplyDto> ownerSettledApplyDtos = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplys(ownerSettledApplyDto);
+
+        Assert.listOnlyOne(ownerSettledApplyDtos, "入驻申请不存在");
+
+        //状态 W待审核 D 审核中 C 审核完成 D 审核失败
+        OwnerSettledApplyPo ownerSettledApplyPo = new OwnerSettledApplyPo();
+        ownerSettledApplyPo.setApplyId(ownerSettledApplyDtos.get(0).getApplyId());
+        reqJson.put("id",reqJson.getString("applyId"));
+        reqJson.put("storeId",storeId);
+
+
+        //业务办理
+        if ("1100".equals(reqJson.getString("auditCode"))
+                || "1500".equals(reqJson.getString("auditCode"))) { //办理操作
+            reqJson.put("nextUserId", reqJson.getString("staffId"));
+            boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
+            if (isLastTask) {
+                ownerSettledApplyPo.setState(VisitDto.STATE_C);
+            } else {
+                ownerSettledApplyPo.setState(VisitDto.STATE_D);
+            }
+            ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(ownerSettledApplyPo);
+            //完成当前流程 插入下一处理人
+        } else if ("1300".equals(reqJson.getString("auditCode"))) { //转单操作
+            reqJson.put("nextUserId", reqJson.getString("staffId"));
+            oaWorkflowUserInnerServiceSMOImpl.changeTaskToOtherUser(reqJson);
+            //reqJson.put("state", "1004"); //工单转单
+            ownerSettledApplyPo.setState(VisitDto.STATE_D);
+            ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(ownerSettledApplyPo);
+        } else if ("1200".equals(reqJson.getString("auditCode"))
+                || "1400".equals(reqJson.getString("auditCode"))
+        ) { //退回操作
+            oaWorkflowUserInnerServiceSMOImpl.goBackTask(reqJson);
+            //reqJson.put("state", "1003"); //工单退单
+            ownerSettledApplyPo.setState(VisitDto.STATE_F);
+            ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(ownerSettledApplyPo);
+        } else {
+            throw new IllegalArgumentException("不支持的类型");
+        }
+
+    }
+}

service-user/src/main/java/com/java110/user/cmd/ownerSettled/QueryFinishOwnerSettledCmd.java

@@ -0,0 +1,129 @@
+package com.java110.user.cmd.ownerSettled;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+import com.java110.dto.visit.VisitDto;
+import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.dto.workflow.WorkflowDto;
+import com.java110.entity.audit.AuditUser;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
+import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
+import com.java110.intf.community.IVisitV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询已办业主入驻
+ */
+@Java110Cmd(serviceCode = "ownerSettled.queryFinishOwnerSettled")
+public class QueryFinishOwnerSettledCmd extends Cmd {
+
+    @Autowired
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+
+
+
+    @Autowired
+    private IOwnerSettledApplyV1InnerServiceSMO ownerSettledApplyV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        String userId = context.getReqHeaders().get("user-id");
+        String storeId = context.getReqHeaders().get("store-id");
+
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setState(OaWorkflowDto.STATE_COMPLAINT);
+        oaWorkflowDto.setFlowType(OaWorkflowDto.FLOW_TYPE_OWNER_SETTLED);
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+
+        if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
+            return;
+        }
+        List<String> flowIds = new ArrayList<>();
+        for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+            flowIds.add(WorkflowDto.DEFAULT_PROCESS + tmpOaWorkflowDto.getFlowId());
+        }
+
+        AuditUser auditUser = new AuditUser();
+        auditUser.setProcessDefinitionKeys(flowIds);
+        auditUser.setUserId(userId);
+        auditUser.setStoreId(storeId);
+        auditUser.setPage(reqJson.getInteger("page"));
+        auditUser.setRow(reqJson.getInteger("row"));
+
+        long count = oaWorkflowUserInnerServiceSMOImpl.getDefinitionKeysUserHistoryTaskCount(auditUser);
+
+        List<JSONObject> datas = null;
+
+        if (count > 0) {
+            datas = oaWorkflowUserInnerServiceSMOImpl.getDefinitionKeysUserHistoryTasks(auditUser);
+            //刷新 表单数据
+            refreshFormData(datas, reqJson);
+
+        } else {
+            datas = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, datas);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        context.setResponseEntity(responseEntity);
+
+    }
+
+    private void refreshFormData(List<JSONObject> datas, JSONObject paramIn) {
+
+        List<String> ids = new ArrayList<>();
+        for (JSONObject data : datas) {
+            ids.add(data.getString("id"));
+        }
+        if (ids.size() < 1) {
+            return;
+        }
+
+        OwnerSettledApplyDto ownerSettledApplyDto = new OwnerSettledApplyDto();
+        ownerSettledApplyDto.setApplyIds(ids.toArray(new String[ids.size()]));
+        List<OwnerSettledApplyDto> ownerSettledApplyDtos = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplys(ownerSettledApplyDto);
+        if (ownerSettledApplyDtos == null || ownerSettledApplyDtos.size() < 1) {
+            return;
+        }
+        for (JSONObject data : datas) {
+            for (OwnerSettledApplyDto form : ownerSettledApplyDtos) {
+                if (data.getString("id").equals(form.getApplyId())) {
+                    data.putAll(BeanConvertUtil.beanCovertJson(form));
+                }
+            }
+        }
+    }
+
+
+}

service-user/src/main/java/com/java110/user/cmd/ownerSettled/QueryUndoOwnerSettledCmd.java

@@ -0,0 +1,127 @@
+package com.java110.user.cmd.ownerSettled;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+import com.java110.dto.visit.VisitDto;
+import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.dto.workflow.WorkflowDto;
+import com.java110.entity.audit.AuditUser;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
+import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
+import com.java110.intf.community.IVisitV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询 待审核业主入驻
+ */
+@Java110Cmd(serviceCode = "ownerSettled.queryUndoOwnerSettled")
+public class QueryUndoOwnerSettledCmd extends Cmd {
+
+    @Autowired
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+
+    @Autowired
+    private IOwnerSettledApplyV1InnerServiceSMO ownerSettledApplyV1InnerServiceSMOImpl;
+
+
+    @Autowired
+    private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        String userId = context.getReqHeaders().get("user-id");
+        String storeId = context.getReqHeaders().get("store-id");
+
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setState(OaWorkflowDto.STATE_COMPLAINT);
+        oaWorkflowDto.setFlowType(OaWorkflowDto.FLOW_TYPE_OWNER_SETTLED);
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+
+        if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
+            return;
+        }
+        List<String> flowIds = new ArrayList<>();
+        for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+            flowIds.add(WorkflowDto.DEFAULT_PROCESS + tmpOaWorkflowDto.getFlowId());
+        }
+
+        AuditUser auditUser = new AuditUser();
+        auditUser.setProcessDefinitionKeys(flowIds);
+        auditUser.setUserId(userId);
+        auditUser.setStoreId(storeId);
+        auditUser.setPage(reqJson.getInteger("page"));
+        auditUser.setRow(reqJson.getInteger("row"));
+
+        long count = oaWorkflowUserInnerServiceSMOImpl.getDefinitionKeysUserTaskCount(auditUser);
+
+        List<JSONObject> datas = null;
+
+        if (count > 0) {
+            datas = oaWorkflowUserInnerServiceSMOImpl.getDefinitionKeysUserTasks(auditUser);
+            //刷新 表单数据
+            refreshFormData(datas, reqJson);
+
+        } else {
+            datas = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, datas);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        context.setResponseEntity(responseEntity);
+
+    }
+
+    private void refreshFormData(List<JSONObject> datas, JSONObject paramIn) {
+
+        List<String> ids = new ArrayList<>();
+        for (JSONObject data : datas) {
+            ids.add(data.getString("id"));
+        }
+        if (ids.size() < 1) {
+            return;
+        }
+
+        OwnerSettledApplyDto ownerSettledApplyDto = new OwnerSettledApplyDto();
+        ownerSettledApplyDto.setApplyIds(ids.toArray(new String[ids.size()]));
+        List<OwnerSettledApplyDto> ownerSettledApplyDtos = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplys(ownerSettledApplyDto);
+        if (ownerSettledApplyDtos == null || ownerSettledApplyDtos.size() < 1) {
+            return;
+        }
+        for (JSONObject data : datas) {
+            for (OwnerSettledApplyDto form : ownerSettledApplyDtos) {
+                if (data.getString("id").equals(form.getApplyId())) {
+                    data.putAll(BeanConvertUtil.beanCovertJson(form));
+                }
+            }
+        }
+    }
+
+}

service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledApplyV1InnerServiceSMOImpl.java

@@ -16,8 +16,19 @@
 package com.java110.user.smo.impl;
 
 
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.dto.ownerSettledRooms.OwnerSettledRoomsDto;
 import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
+import com.java110.dto.visit.VisitDto;
+import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledRoomsV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
+import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomPo;
 import com.java110.user.dao.IOwnerSettledApplyV1ServiceDao;
 import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
 import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
@@ -50,6 +61,16 @@ public class OwnerSettledApplyV1InnerServiceSMOImpl extends BaseServiceSMO imple
     @Autowired
     private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerSettledRoomsV1InnerServiceSMO ownerSettledRoomsV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+
 
     @Override
     public int saveOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
@@ -60,6 +81,56 @@ public class OwnerSettledApplyV1InnerServiceSMOImpl extends BaseServiceSMO imple
     @Override
     public int updateOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
         int saveFlag = ownerSettledApplyV1ServiceDaoImpl.updateOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
+
+        if(saveFlag < 1 || !VisitDto.STATE_C.equals(ownerSettledApplyPo.getState())){
+            return saveFlag;
+        }
+
+        OwnerSettledApplyDto ownerSettledApplyDto = new OwnerSettledApplyDto();
+        ownerSettledApplyDto.setApplyId(ownerSettledApplyPo.getApplyId());
+        List<OwnerSettledApplyDto> ownerSettledApplyDtos = queryOwnerSettledApplys(ownerSettledApplyDto);
+
+        if(ownerSettledApplyDtos == null || ownerSettledApplyDtos.size()<1){
+            return saveFlag;
+        }
+
+        OwnerSettledRoomsDto ownerSettledRoomsDto = new OwnerSettledRoomsDto();
+        ownerSettledRoomsDto.setApplyId(ownerSettledApplyPo.getApplyId());
+        List<OwnerSettledRoomsDto> ownerSettledRoomsDtos = ownerSettledRoomsV1InnerServiceSMOImpl.queryOwnerSettledRoomss(ownerSettledRoomsDto);
+
+        if(ownerSettledRoomsDtos == null || ownerSettledRoomsDtos.size() < 1){
+            return saveFlag;
+        }
+        List<RoomDto> roomDtos = null;
+        OwnerRoomRelPo ownerRoomRelPo = null;
+        RoomPo roomPo = null;
+        for(OwnerSettledRoomsDto tmpOwnerSettledRoomsDto:ownerSettledRoomsDtos){
+            RoomDto roomDto = new RoomDto();
+            roomDto.setRoomId(tmpOwnerSettledRoomsDto.getRoomId());
+            roomDto.setCommunityId(tmpOwnerSettledRoomsDto.getCommunityId());
+            roomDto.setState(RoomDto.STATE_FREE);
+            roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
+            if(roomDtos == null || roomDtos.size() < 1){
+                continue;
+            }
+
+            ownerRoomRelPo = new OwnerRoomRelPo();
+            ownerRoomRelPo.setOwnerId(ownerSettledApplyDtos.get(0).getOwnerId());
+            ownerRoomRelPo.setRemark("审核入驻");
+            ownerRoomRelPo.setRoomId(tmpOwnerSettledRoomsDto.getRoomId());
+            ownerRoomRelPo.setRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+            ownerRoomRelPo.setState("2001");
+            ownerRoomRelPo.setStartTime(tmpOwnerSettledRoomsDto.getStartTime());
+            ownerRoomRelPo.setEndTime(tmpOwnerSettledRoomsDto.getEndTime());
+            ownerRoomRelPo.setUserId("-1");
+            ownerRoomRelV1InnerServiceSMOImpl.saveOwnerRoomRel(ownerRoomRelPo);
+
+            roomPo = new RoomPo();
+            roomPo.setRoomId(tmpOwnerSettledRoomsDto.getRoomId());
+            roomPo.setState(RoomDto.STATE_SELL);
+            roomV1InnerServiceSMOImpl.updateRoom(roomPo);
+        }
+
         return saveFlag;
     }