|
@@ -3,12 +3,14 @@ package com.zjugis.business.service.impl;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.zjugis.business.bean.dto.ContractApplyDto;
|
|
import com.zjugis.business.bean.dto.ContractApplyDto;
|
|
|
|
+import com.zjugis.business.bean.entity.Contract;
|
|
import com.zjugis.business.bean.entity.ContractApply;
|
|
import com.zjugis.business.bean.entity.ContractApply;
|
|
import com.zjugis.business.bean.response.ContractApplyResp;
|
|
import com.zjugis.business.bean.response.ContractApplyResp;
|
|
import com.zjugis.business.constants.ContractApplyConstants;
|
|
import com.zjugis.business.constants.ContractApplyConstants;
|
|
import com.zjugis.business.constants.FlowStatusConstants;
|
|
import com.zjugis.business.constants.FlowStatusConstants;
|
|
import com.zjugis.business.mapper.ContractApplyMapper;
|
|
import com.zjugis.business.mapper.ContractApplyMapper;
|
|
import com.zjugis.business.service.ContractApplyService;
|
|
import com.zjugis.business.service.ContractApplyService;
|
|
|
|
+import com.zjugis.business.service.ContractService;
|
|
import com.zjugis.framework.common.pojo.CommonResult;
|
|
import com.zjugis.framework.common.pojo.CommonResult;
|
|
import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
|
|
import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
|
|
import com.zjugis.framework.workflow.model.ProcessDto;
|
|
import com.zjugis.framework.workflow.model.ProcessDto;
|
|
@@ -32,6 +34,10 @@ public class ContractApplyServiceImpl implements ContractApplyService {
|
|
@Autowired
|
|
@Autowired
|
|
private ContractApplyMapper contractApplyMapper;
|
|
private ContractApplyMapper contractApplyMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ContractService contractService;
|
|
|
|
+
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private AdminUserApi adminUserApi;
|
|
private AdminUserApi adminUserApi;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -118,6 +124,10 @@ public class ContractApplyServiceImpl implements ContractApplyService {
|
|
ContractApply contractApply = new ContractApply();
|
|
ContractApply contractApply = new ContractApply();
|
|
contractApply.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
|
|
contractApply.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
|
|
contractApply.setProjectId(projectId);
|
|
contractApply.setProjectId(projectId);
|
|
|
|
+ Contract contract = contractService.selectMainByProject(projectId);
|
|
|
|
+ if(contract != null){
|
|
|
|
+ contractApply.setContractId(contract.getId());
|
|
|
|
+ }
|
|
contractApply.setIsSign(1);
|
|
contractApply.setIsSign(1);
|
|
contractApply.setApplyType(ContractApplyConstants.TYPE_SUB_APPLY);
|
|
contractApply.setApplyType(ContractApplyConstants.TYPE_SUB_APPLY);
|
|
contractApply.setApplyWorker(userResp.getCheckedData().getNickname());
|
|
contractApply.setApplyWorker(userResp.getCheckedData().getNickname());
|
|
@@ -139,6 +149,10 @@ public class ContractApplyServiceImpl implements ContractApplyService {
|
|
ContractApply entity = new ContractApply();
|
|
ContractApply entity = new ContractApply();
|
|
entity.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
|
|
entity.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
|
|
entity.setProjectId(projectId);
|
|
entity.setProjectId(projectId);
|
|
|
|
+ Contract contract = contractService.selectMainByProject(projectId);
|
|
|
|
+ if(contract != null){
|
|
|
|
+ entity.setContractId(contract.getId());
|
|
|
|
+ }
|
|
entity.setApplyType(ContractApplyConstants.TYPE_OUT_APPLY);
|
|
entity.setApplyType(ContractApplyConstants.TYPE_OUT_APPLY);
|
|
entity.setApplyWorker(userResp.getCheckedData().getNickname());
|
|
entity.setApplyWorker(userResp.getCheckedData().getNickname());
|
|
entity.setApplyWorkerId(userId);
|
|
entity.setApplyWorkerId(userId);
|