From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java | 140 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 134 insertions(+), 6 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java b/service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java
index 62ac00c..9fc001a 100644
--- a/service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java
@@ -23,16 +23,24 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.RoomDto;
-import com.java110.dto.owner.OwnerDto;
+import com.java110.doc.annotation.*;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.owner.OwnerSettledApplyDto;
+import com.java110.dto.owner.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.po.ownerSettledApply.OwnerSettledApplyPo;
-import com.java110.po.ownerSettledRooms.OwnerSettledRoomsPo;
+import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.owner.OwnerSettledApplyPo;
+import com.java110.po.owner.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;
@@ -40,6 +48,60 @@
import java.util.List;
+@Java110CmdDoc(title = "涓氫富鍏ラ┗鐢宠",
+ description = "涓氫富浼佷笟鍏ラ┗鎴垮眿鐢宠",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/ownerSettled.saveOwnerSettledApply",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "ownerSettled.saveOwnerSettledApply",
+ seq = 15
+)
+
+@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':'鎴愬姛'}"
+)
/**
* 绫昏〃杩帮細淇濆瓨
* 鏈嶅姟缂栫爜锛歰wnerSettledApply.saveOwnerSettledApply
@@ -64,7 +126,19 @@
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) {
@@ -94,9 +168,12 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
OwnerSettledApplyPo ownerSettledApplyPo = BeanConvertUtil.covertBean(reqJson, OwnerSettledApplyPo.class);
ownerSettledApplyPo.setApplyId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ ownerSettledApplyPo.setCreateUserId(userId);
+ ownerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_WAIT);
int flag = ownerSettledApplyV1InnerServiceSMOImpl.saveOwnerSettledApply(ownerSettledApplyPo);
if (flag < 1) {
@@ -112,18 +189,69 @@
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());
}
}
--
Gitblit v1.8.0