Skip to content

T
tcm-system
Commit 68b09b83 authored by tangfang's avatar tangfang
Browse files
Options

修改公司查询审核信息问题

parent 7cdfb1e3
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 31 deletions
src/main/java/com/pangding/web/authority/dao/impl/RoleAuthorityDaoImpl.java
View file @ 68b09b83
......@@ -19,7 +19,7 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
getSql(DaoConst.LOAD).setSql("select ra.role_id,ra.authority_id,a.id,a.pid,a.name," +
"a.type,a.alias,a.url,a.remark,a.open_mode,a.sort,a.attribute from pd_role_authority ra " +
"RIGHT JOIN pd_authority a on ra.authority_id = a.id {INNER} " +
"where 1=1 {WHERE} ORDER BY a.pid,a.attribute,a.sort" )
"where 1=1 {WHERE} ORDER BY a.pid,a.sort,a.attribute" )
.add("userId", "AND b.user_id = @userId",
"{INNER}", "INNER JOIN pd_user_role AS b ON ra.role_id = b.role_id")
.add("role", " AND ra.role_id = @role")
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 68b09b83
......@@ -18,8 +18,6 @@ import com.pangding.web.authority.util.RsaConstant;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.reqvo.CompanyDivideReqVo;
import com.pangding.web.authority.vo.reqvo.CompanySaveReqVo;
import com.pangding.web.authority.vo.reqvo.OldSaveCompanyReqVo;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.constant.CompanyConstant;
import com.pangding.web.constant.PangdConstant;
......@@ -37,7 +35,6 @@ import com.pangding.web.vo.system.req.CompanyMsgReqVo;
import com.pangding.web.vo.system.req.authority.RoleReqVo;
import com.pangding.web.vo.system.req.authority.UserRoleReqVo;
import com.pangding.web.vo.system.req.company.*;
import com.pangding.web.vo.system.req.company.GetCompanyReqVo;
import com.pangding.web.vo.system.res.company.*;
import com.pangding.web.vo.wechat.req.code.QrCodeReqVo;
import com.pangding.web.vo.wechat.req.code.Scene;
......@@ -1195,36 +1192,41 @@ public class CompanyServiceImpl implements CompanyService {
companyVo.setSigningTime(reqVo.getSigningTime());
companyDao.update(companyVo);
AgreementTemplateVo agreementTemplateVo = agreementTemplateDao.load(reqVo.getCompanyAgreementReqVo().getAgreementId(), AgreementTemplateVo.class);
if(StringHelper.isEmpty(agreementTemplateVo)){
throw new CodeException("未找到可签约的合同");
}
String id = StringHelper.getMD5Id(reqVo.getCompanyId(), reqVo.getCompanyAgreementReqVo().getAgreementId());
CompanyAgreementVo companyAgreementVo = companyAgreementDao.load(id, CompanyAgreementVo.class);
if (!StringHelper.isEmpty(companyAgreementVo)) {
ObjectHelper.writeWithFrom(companyAgreementVo, reqVo.getCompanyAgreementReqVo());
companyAgreementVo.setCompanyAgreementId(id);
companyAgreementVo.setCompanyId(reqVo.getCompanyId());
companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
companyAgreementVo.setAgreementFilePath(reqVo.getCompanyAgreementReqVo().getAgreementFilePath());
companyAgreementVo.setCreateTime(DateHelper.getNow());
companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
companyAgreementDao.update(companyAgreementVo);
}else{
companyAgreementVo = new CompanyAgreementVo();
ObjectHelper.writeWithFrom(companyAgreementVo, reqVo.getCompanyAgreementReqVo());
companyAgreementVo.setCompanyAgreementId(id);
companyAgreementVo.setCompanyId(reqVo.getCompanyId());
companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
companyAgreementVo.setAgreementFilePath(reqVo.getCompanyAgreementReqVo().getAgreementFilePath());
companyAgreementVo.setCreateTime(DateHelper.getNow());
companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
companyAgreementDao.create(companyAgreementVo);
if(!StringHelper.isEmpty(reqVo.getCompanyAgreementReqVo()) &&
!StringHelper.isEmpty(reqVo.getCompanyAgreementReqVo().getAgreementId())){
AgreementTemplateVo agreementTemplateVo = agreementTemplateDao.load(reqVo.getCompanyAgreementReqVo().getAgreementId(), AgreementTemplateVo.class);
if(StringHelper.isEmpty(agreementTemplateVo)){
throw new CodeException("未找到可签约的合同");
}
String id = StringHelper.getMD5Id(reqVo.getCompanyId(), reqVo.getCompanyAgreementReqVo().getAgreementId());
CompanyAgreementVo companyAgreementVo = companyAgreementDao.load(id, CompanyAgreementVo.class);
if (!StringHelper.isEmpty(companyAgreementVo)) {
ObjectHelper.writeWithFrom(companyAgreementVo, reqVo.getCompanyAgreementReqVo());
companyAgreementVo.setCompanyAgreementId(id);
companyAgreementVo.setCompanyId(reqVo.getCompanyId());
companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
companyAgreementVo.setAgreementFilePath(reqVo.getCompanyAgreementReqVo().getAgreementFilePath());
companyAgreementVo.setCreateTime(DateHelper.getNow());
companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
companyAgreementDao.update(companyAgreementVo);
}else{
companyAgreementVo = new CompanyAgreementVo();
ObjectHelper.writeWithFrom(companyAgreementVo, reqVo.getCompanyAgreementReqVo());
companyAgreementVo.setCompanyAgreementId(id);
companyAgreementVo.setCompanyId(reqVo.getCompanyId());
companyAgreementVo.setAgreementContent(agreementTemplateVo.getAgreementContent());
companyAgreementVo.setAgreementName(agreementTemplateVo.getAgreementName());
companyAgreementVo.setAgreementFilePath(reqVo.getCompanyAgreementReqVo().getAgreementFilePath());
companyAgreementVo.setCreateTime(DateHelper.getNow());
companyAgreementVo.setAgreementType(agreementTemplateVo.getAgreementType());
companyAgreementDao.create(companyAgreementVo);
}
}
// 更新或新增提现规则表
if (1 == reqVo.getDiscountRule()) {
saveCompanyRule(reqVo.getCompanyRuleVoList(), companyVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment