优化代码

service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java

@@ -221,6 +221,8 @@ public class SaveItemReleaseCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+
+
         //启动任务
         JSONObject flowJson = new JSONObject();
         flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());

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

@@ -23,17 +23,25 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.dto.RoomDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledRoomsV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.po.ownerSettledApply.OwnerSettledApplyPo;
 import com.java110.po.ownerSettledRooms.OwnerSettledRoomsPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
@@ -41,6 +49,59 @@ import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
+@Java110CmdDoc(title = "业主入驻申请",
+        description = "业主企业入驻房屋申请",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/ownerSettled.saveOwnerSettledApply",
+        resource = "userDoc",
+        author = "吴学文",
+        serviceCode = "ownerSettled.saveOwnerSettledApply"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "typeId", length = 30, remark = "放行ID"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+        @Java110ParamDoc(name = "applyCompany", length = 30, remark = "申请单位"),
+        @Java110ParamDoc(name = "applyPerson", length = 30, remark = "申请人"),
+        @Java110ParamDoc(name = "idCard", length = 30, remark = "身份证"),
+        @Java110ParamDoc(name = "applyTel", length = 30, remark = "申请电话"),
+        @Java110ParamDoc(name = "passTime", length = 30, remark = "通信时间"),
+        @Java110ParamDoc(name = "amount", length = 30, remark = "数量"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\n" +
+                "\t\"irId\": \"\",\n" +
+                "\t\"typeId\": \"102023011264340006\",\n" +
+                "\t\"applyCompany\": \"123123\",\n" +
+                "\t\"applyPerson\": \"12312\",\n" +
+                "\t\"idCard\": \"12312\",\n" +
+                "\t\"applyTel\": \"18909711443\",\n" +
+                "\t\"passTime\": \"2023-01-13 11:55:00\",\n" +
+                "\t\"resNames\": [{\n" +
+                "\t\t\"resName\": \"123\",\n" +
+                "\t\t\"amount\": \"123\"\n" +
+                "\t}],\n" +
+                "\t\"state\": \"\",\n" +
+                "\t\"carNum\": \"123123\",\n" +
+                "\t\"remark\": \"123\",\n" +
+                "\t\"audit\": {\n" +
+                "\t\t\"assignee\": \"-2\",\n" +
+                "\t\t\"staffId\": \"\",\n" +
+                "\t\t\"staffName\": \"\",\n" +
+                "\t\t\"taskId\": \"\"\n" +
+                "\t},\n" +
+                "\t\"communityId\": \"2022120695590004\"\n" +
+                "}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：保存
  * 服务编码：ownerSettledApply.saveOwnerSettledApply
@@ -64,9 +125,21 @@ public class SaveOwnerSettledApplyCmd extends Cmd {
     @Autowired
     private IOwnerSettledRoomsV1InnerServiceSMO ownerSettledRoomsV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
+
     @Autowired
     private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "ownerId", "请求报文中未包含ownerId");
@@ -116,18 +189,69 @@ public class SaveOwnerSettledApplyCmd extends Cmd {
             roomDto.setCommunityId(ownerSettledApplyPo.getCommunityId());
             roomDto.setRoomId(room.getString("roomId"));
             roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
-            Assert.listOnlyOne(roomDtos,"房屋不存在"+roomDto.getRoomId());
+            Assert.listOnlyOne(roomDtos, "房屋不存在" + roomDto.getRoomId());
             OwnerSettledRoomsPo ownerSettledRoomsPo = BeanConvertUtil.covertBean(room, OwnerSettledRoomsPo.class);
             ownerSettledRoomsPo.setApplyId(ownerSettledApplyPo.getApplyId());
             ownerSettledRoomsPo.setCommunityId(ownerSettledApplyPo.getCommunityId());
             ownerSettledRoomsPo.setOsrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-            ownerSettledRoomsPo.setRoomName(roomDtos.get(0).getFloorNum()+"-"+roomDtos.get(0).getUnitNum()+"-"+roomDtos.get(0).getRoomNum());
+            ownerSettledRoomsPo.setRoomName(roomDtos.get(0).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum());
             flag = ownerSettledRoomsV1InnerServiceSMOImpl.saveOwnerSettledRooms(ownerSettledRoomsPo);
             if (flag < 1) {
                 throw new CmdException("保存数据失败");
             }
         }
 
+        OwnerSettledSettingDto ownerSettledSettingDto = new OwnerSettledSettingDto();
+        ownerSettledSettingDto.setCommunityId(reqJson.getString("communityId"));
+        ownerSettledSettingDto.setAuditWay("Y");
+        List<OwnerSettledSettingDto> ownerSettledSettingDtos
+                = ownerSettledSettingV1InnerServiceSMOImpl.queryOwnerSettledSettings(ownerSettledSettingDto);
+        //不需要走审核流程
+        if (ownerSettledSettingDtos == null || ownerSettledSettingDtos.size() < 1) {
+            OwnerSettledApplyPo tmpOwnerSettledApplyPo = new OwnerSettledApplyPo();
+            tmpOwnerSettledApplyPo.setApplyId(ownerSettledApplyPo.getApplyId());
+            tmpOwnerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_COMPLETE);
+            ownerSettledApplyV1InnerServiceSMOImpl.updateOwnerSettledApply(tmpOwnerSettledApplyPo);
+            return;
+        }
+
+
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setStoreId(ownerSettledSettingDtos.get(0).getStoreId());
+        oaWorkflowDto.setFlowId(ownerSettledSettingDtos.get(0).getFlowId());
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+        Assert.listOnlyOne(oaWorkflowDtos, "流程不存在");
+        if (!OaWorkflowDto.STATE_COMPLAINT.equals(oaWorkflowDtos.get(0).getState())) {
+            throw new IllegalArgumentException(oaWorkflowDtos.get(0).getFlowName() + "流程未部署");
+        }
+
+        if (StringUtil.isEmpty(oaWorkflowDtos.get(0).getProcessDefinitionKey())) {
+            throw new IllegalArgumentException(oaWorkflowDtos.get(0).getFlowName() + "流程未部署");
+        }
+
+        //启动任务
+        JSONObject flowJson = new JSONObject();
+        flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
+        flowJson.put("createUserId", userId);
+        flowJson.put("flowId", oaWorkflowDtos.get(0).getFlowId());
+        flowJson.put("id", ownerSettledApplyPo.getApplyId());
+        flowJson.put("auditMessage", "提交审核");
+        flowJson.put("storeId", ownerSettledSettingDtos.get(0).getStoreId());
+        reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
+        JSONObject result = oaWorkflowActivitiInnerServiceSMOImpl.startProcess(flowJson);
+
+        //提交者提交
+        flowJson = new JSONObject();
+        flowJson.put("processInstanceId", result.getString("processInstanceId"));
+        flowJson.put("createUserId", userId);
+        flowJson.put("nextUserId", reqJson.getJSONObject("audit").getString("staffId"));
+        flowJson.put("storeId", ownerSettledSettingDtos.get(0).getStoreId());
+        flowJson.put("id", ownerSettledApplyPo.getApplyId());
+        flowJson.put("flowId", oaWorkflowDtos.get(0).getFlowId());
+
+
+        oaWorkflowActivitiInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }