Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/flow/interview/service/InterviewServiceImpl.java

@@ -25,6 +25,7 @@ import com.zjugis.business.flow.staff.entity.StaffDO;
 import com.zjugis.business.flow.staff.service.StaffService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
@@ -45,6 +46,7 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.*;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -85,6 +87,12 @@ public class InterviewServiceImpl implements InterviewService {
         validIdCard(vo.getSfzh());
         InterviewDO interviewDO = InterviewConvert.INSTANCE.convert(vo);
         update(interviewDO);
+
+
+        //保存时生成流程描述
+        String applyTime = LocalDateTimeUtils.format(interviewDO.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(interviewDO.getNickname(), applyTime, interviewDO.getDeptName()), "/");
+        workflowClient.saveFlowDescribe(interviewDO.getInstanceId(), flowDesc);
     }
 
     private void validIdCard(String idCard) {

zjugis-business/src/main/java/com/zjugis/business/flow/jobTransfer/service/impl/JobTransferServiceImpl.java

@@ -16,6 +16,7 @@ import com.zjugis.business.flow.regular.dao.RegularDAO;
 import com.zjugis.business.flow.regular.entity.RegularDO;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
@@ -25,15 +26,14 @@ import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.REGULAR_NOT_EXISTS;
 import static com.zjugis.business.enums.ErrorCodeConstants.TRANSFER_NOT_EXISTS;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -104,6 +104,10 @@ public class JobTransferServiceImpl implements JobTransferService {
         JobTransferDO jobTransferDO = JobTransferConvert.INSTANCE.convert(updateReqVO);
         jobTransferDAO.updateById(jobTransferDO);
 
+
+        String applyTime = LocalDateTimeUtils.format(jobTransferDO.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(jobTransferDO.getNickname(), applyTime, jobTransferDO.getDeptName()), "/");
+        workflowClient.saveFlowDescribe(jobTransferDO.getInstanceId(), flowDesc);
     }
 
     @Override

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/service/impl/RecruitDemandServiceImpl.java

@@ -22,6 +22,7 @@ import com.zjugis.business.flow.recruit.service.RecruitDemandService;
 import com.zjugis.business.flow.recruit.service.RecruitDetailService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.web.core.util.WebFrameworkUtils;
@@ -42,6 +43,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.RECRUIT_DEMAND_NOT_EXISTS;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zjugis.framework.common.util.collection.CollectionUtils.convertSet;
@@ -112,6 +114,12 @@ public class RecruitDemandServiceImpl implements RecruitDemandService {
                 recruitDetailDAO.insertBatch(detailDOS);
             }
         }
+
+
+
+        String applyTime = LocalDateTimeUtils.format(detailDO.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(detailDO.getUserNickname(), applyTime, detailDO.getDeptName()), "/");
+        workflowClient.saveFlowDescribe(detailDO.getInstanceId(), flowDesc);
     }
 
     @Transactional(rollbackFor = Exception.class)

zjugis-business/src/main/java/com/zjugis/business/flow/regular/service/impl/RegularServiceImpl.java

@@ -12,6 +12,7 @@ import com.zjugis.business.flow.regular.entity.RegularDO;
 import com.zjugis.business.flow.regular.service.RegularService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
@@ -21,15 +22,14 @@ import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.REGULAR_NOT_EXISTS;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -92,6 +92,10 @@ public class RegularServiceImpl implements RegularService {
         validateExists(updateReqVO.getId());
         RegularDO regularDO = RegularConvert.INSTANCE.convert(updateReqVO);
         regularDAO.updateById(regularDO);
+
+        String applyTime = LocalDateTimeUtils.format(regularDO.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(regularDO.getNickname(), applyTime, regularDO.getDeptName()), "/");
+        workflowClient.saveFlowDescribe(regularDO.getInstanceId(), flowDesc);
     }
 
     private void validateExists(String id) {

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignServiceImpl.java

@@ -22,6 +22,7 @@ import com.zjugis.business.flow.resignApply.entity.ResignApplyDO;
 import com.zjugis.business.flow.resignApply.service.ResignApplyService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.exception.BusinessException;
@@ -34,6 +35,7 @@ import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +45,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.*;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zjugis.framework.common.util.collection.CollectionUtils.convertSet;
@@ -168,6 +171,11 @@ public class ResignServiceImpl implements ResignService {
             resignDetailDAO.insertBatch(detailDOS);
         }
 
+
+        String applyTime = LocalDateTimeUtils.format(resignDO.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(resignDO.getNickname(), applyTime, resignDO.getDeptName()), "/");
+        workflowClient.saveFlowDescribe(resignDO.getInstanceId(), flowDesc);
+
     }
 
     @Transactional

zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/service/impl/ResignApplyApplyServiceImpl.java

@@ -12,6 +12,7 @@ import com.zjugis.business.flow.resignApply.entity.ResignApplyDO;
 import com.zjugis.business.flow.resignApply.service.ResignApplyService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
@@ -20,6 +21,7 @@ import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +30,7 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.RESIGN_APPLY_NOT_EXISTS;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -103,6 +106,10 @@ public class ResignApplyApplyServiceImpl implements ResignApplyService {
         validateExists(vo.getId());
         ResignApplyDO resignDO = ResignApplyConvert.INSTANCE.convert01(vo);
         resignApplyDAO.updateById(resignDO);
+
+        String applyTime = LocalDateTimeUtils.format(resignDO.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(resignDO.getNickname(), applyTime, resignDO.getDeptName()), "/");
+        workflowClient.saveFlowDescribe(resignDO.getInstanceId(), flowDesc);
     }
 
     @Transactional