加入业主入驻审核流程

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

@@ -1,6 +1,7 @@
 package com.java110.dto.ownerSettledApply;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class OwnerSettledApplyDto extends PageDto implements Serializable {
+public class OwnerSettledApplyDto extends OwnerSettledSettingDto implements Serializable {
 
     //状态 W待审核 D 审核中 C 审核完成 D 审核失败
     public static final String STATE_WAIT = "W"; //W待审核

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

@@ -21,8 +21,12 @@ import com.java110.core.annotation.Java110Transactional;
 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.ownerSettledSetting.OwnerSettledSettingDto;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledRoomsV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
 import com.java110.po.ownerSettledApply.OwnerSettledApplyPo;
 import com.java110.po.ownerSettledRooms.OwnerSettledRoomsPo;
 import com.java110.utils.exception.CmdException;
@@ -33,6 +37,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：删除
  * 服务编码：ownerSettledApply.deleteOwnerSettledApply
@@ -53,6 +59,12 @@ public class DeleteOwnerSettledApplyCmd extends Cmd {
     @Autowired
     private IOwnerSettledRoomsV1InnerServiceSMO ownerSettledRoomsV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
@@ -80,6 +92,20 @@ public class DeleteOwnerSettledApplyCmd extends Cmd {
             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) {
+
+            return;
+        }
+
+        //oaWorkflowActivitiInnerServiceSMOImpl.
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

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

@@ -16,6 +16,8 @@
 package com.java110.user.smo.impl;
 
 
+import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
+import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
 import com.java110.user.dao.IOwnerSettledApplyV1ServiceDao;
 import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
 import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
@@ -45,28 +47,31 @@ public class OwnerSettledApplyV1InnerServiceSMOImpl extends BaseServiceSMO imple
     @Autowired
     private IOwnerSettledApplyV1ServiceDao ownerSettledApplyV1ServiceDaoImpl;
 
+    @Autowired
+    private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
+
 
     @Override
-    public int saveOwnerSettledApply(@RequestBody  OwnerSettledApplyPo ownerSettledApplyPo) {
+    public int saveOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
         int saveFlag = ownerSettledApplyV1ServiceDaoImpl.saveOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
         return saveFlag;
     }
 
-     @Override
-    public int updateOwnerSettledApply(@RequestBody  OwnerSettledApplyPo ownerSettledApplyPo) {
+    @Override
+    public int updateOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
         int saveFlag = ownerSettledApplyV1ServiceDaoImpl.updateOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
         return saveFlag;
     }
 
-     @Override
-    public int deleteOwnerSettledApply(@RequestBody  OwnerSettledApplyPo ownerSettledApplyPo) {
-       ownerSettledApplyPo.setStatusCd("1");
-       int saveFlag = ownerSettledApplyV1ServiceDaoImpl.updateOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
-       return saveFlag;
+    @Override
+    public int deleteOwnerSettledApply(@RequestBody OwnerSettledApplyPo ownerSettledApplyPo) {
+        ownerSettledApplyPo.setStatusCd("1");
+        int saveFlag = ownerSettledApplyV1ServiceDaoImpl.updateOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyPo));
+        return saveFlag;
     }
 
     @Override
-    public List<OwnerSettledApplyDto> queryOwnerSettledApplys(@RequestBody  OwnerSettledApplyDto ownerSettledApplyDto) {
+    public List<OwnerSettledApplyDto> queryOwnerSettledApplys(@RequestBody OwnerSettledApplyDto ownerSettledApplyDto) {
 
         //校验是否传了 分页信息
 
@@ -78,12 +83,28 @@ public class OwnerSettledApplyV1InnerServiceSMOImpl extends BaseServiceSMO imple
 
         List<OwnerSettledApplyDto> ownerSettledApplys = BeanConvertUtil.covertBeanList(ownerSettledApplyV1ServiceDaoImpl.getOwnerSettledApplyInfo(BeanConvertUtil.beanCovertMap(ownerSettledApplyDto)), OwnerSettledApplyDto.class);
 
+        if (ownerSettledApplys == null || ownerSettledApplys.size() < 1) {
+            return ownerSettledApplys;
+        }
+        OwnerSettledSettingDto ownerSettledSettingDto = new OwnerSettledSettingDto();
+        ownerSettledSettingDto.setCommunityId(ownerSettledApplys.get(0).getCommunityId());
+       List<OwnerSettledSettingDto> settings = ownerSettledSettingV1InnerServiceSMOImpl.queryOwnerSettledSettings(ownerSettledSettingDto);
+
+        if (settings == null || settings.size() < 1) {
+            return ownerSettledApplys;
+        }
+
+        for(OwnerSettledApplyDto tmpOwnerSettledApplyDto: ownerSettledApplys){
+            BeanConvertUtil.covertBean(settings.get(0),tmpOwnerSettledApplyDto);
+        }
+
         return ownerSettledApplys;
     }
 
 
     @Override
     public int queryOwnerSettledApplysCount(@RequestBody OwnerSettledApplyDto ownerSettledApplyDto) {
-        return ownerSettledApplyV1ServiceDaoImpl.queryOwnerSettledApplysCount(BeanConvertUtil.beanCovertMap(ownerSettledApplyDto));    }
+        return ownerSettledApplyV1ServiceDaoImpl.queryOwnerSettledApplysCount(BeanConvertUtil.beanCovertMap(ownerSettledApplyDto));
+    }
 
 }