|
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
import cn.com.ctop.common.module.entity.UserCompany;
|
|
import cn.com.ctop.common.module.entity.UserCompany;
|
|
import cn.com.ctop.common.module.mapper.MailLogMapper;
|
|
import cn.com.ctop.common.module.mapper.MailLogMapper;
|
|
import cn.com.ctop.common.module.mapper.SysUserMapper;
|
|
import cn.com.ctop.common.module.mapper.SysUserMapper;
|
|
|
|
+import cn.com.ctop.common.module.service.ISysUserService;
|
|
import cn.com.ctop.common.module.service.IUserCompanyService;
|
|
import cn.com.ctop.common.module.service.IUserCompanyService;
|
|
import cn.com.ctop.common.module.utils.CorpWexinUtils;
|
|
import cn.com.ctop.common.module.utils.CorpWexinUtils;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -85,6 +86,8 @@ public class CwjsPolicyInfoController {
|
|
CorpWexinUtils corpWexinUtils;
|
|
CorpWexinUtils corpWexinUtils;
|
|
@Resource
|
|
@Resource
|
|
MailLogMapper mailLogMapper;
|
|
MailLogMapper mailLogMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysUserService sysUserService;
|
|
|
|
|
|
@GetMapping(value = "/queryApprovalRejectReason")
|
|
@GetMapping(value = "/queryApprovalRejectReason")
|
|
public Result<CwjsPolicyApprovalLog> queryApprovalRejectReason(@RequestParam(name="id",required=true) Integer id){
|
|
public Result<CwjsPolicyApprovalLog> queryApprovalRejectReason(@RequestParam(name="id",required=true) Integer id){
|
|
@@ -110,12 +113,31 @@ public class CwjsPolicyInfoController {
|
|
Integer companySubjectId= cwjsPolicyInfoEntity.getCompanySubjectId();
|
|
Integer companySubjectId= cwjsPolicyInfoEntity.getCompanySubjectId();
|
|
CwjsCompanyApprovalUser cwjsCompanyApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndUserId(companySubjectId, userId);
|
|
CwjsCompanyApprovalUser cwjsCompanyApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndUserId(companySubjectId, userId);
|
|
if(type == 1){ //审核提交 等于新增的时候
|
|
if(type == 1){ //审核提交 等于新增的时候
|
|
-// cwjsPolicyInfoEntity.setApprovedStatus(1);
|
|
|
|
- if(!Check.isNull(cwjsCompanyApprovalUser)){//当前登录的用户所提交的政策是审核链里的人的提交的 直接状态到2给终审的人员
|
|
|
|
- cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
|
- }else{ //除了销售总监提交的申请都是-待审核
|
|
|
|
- cwjsPolicyInfoEntity.setApprovedStatus(1);
|
|
|
|
- }
|
|
|
|
|
|
+ List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUsers = companyApprovalUserMapper.queryByCompanySubjectId(companySubjectId);
|
|
|
|
+ if(Check.isNull(cwjsCompanyApprovalUsers)){
|
|
|
|
+ return Result.errorMsg("此业务线暂时无审核人员,提交审核无效,请联系开发人员添加此区域主体的审核人员");
|
|
|
|
+ }
|
|
|
|
+ //普通销售,审核都是1,审核进度的人都是等级为0的审核人id
|
|
|
|
+ cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser2 -> {
|
|
|
|
+ if(cwjsCompanyApprovalUser2.getLevel() == 0){
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(1);
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedProgress(cwjsCompanyApprovalUser2.getApprovalUserId());
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ //如果满足有审核人员等于当前创建的人,并且
|
|
|
|
+ cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser2 -> {
|
|
|
|
+ if(cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfoEntity.getCreateUserId())){
|
|
|
|
+ CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser2.getLevel()+1);
|
|
|
|
+ if(Check.isNull(approvalUserNext)){
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(3);
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedProgress(null);
|
|
|
|
+ }else{
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedProgress(approvalUserNext.getApprovalUserId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfoEntity.getApprovedProgress());
|
|
JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfoEntity.getApprovedProgress());
|
|
StringBuilder text = new StringBuilder();
|
|
StringBuilder text = new StringBuilder();
|
|
text.append("您有一条销售政策需要审核,该客户为:");
|
|
text.append("您有一条销售政策需要审核,该客户为:");
|
|
@@ -258,10 +280,24 @@ public class CwjsPolicyInfoController {
|
|
String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
List<JSONObject> allSaleList;
|
|
List<JSONObject> allSaleList;
|
|
if("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode)){
|
|
if("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode)){
|
|
- allSaleList = cwjsPolicyInfoService.getAllSale();
|
|
|
|
|
|
+ allSaleList = cwjsPolicyInfoService.getAllSale(); //所有销售角色和管理员
|
|
}else{
|
|
}else{
|
|
allSaleList = cwjsPolicyInfoService.getAllSaleByUserId(userId);
|
|
allSaleList = cwjsPolicyInfoService.getAllSaleByUserId(userId);
|
|
|
|
+ List<JSONObject> allSubordinate = cwjsPolicyInfoService.getAllSubordinate2(userId);
|
|
|
|
+ if(!Check.isNull(allSubordinate)){
|
|
|
|
+ allSaleList.addAll(allSubordinate);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if(Check.isNull(allSaleList)){
|
|
|
|
+ allSaleList = new ArrayList<>();
|
|
|
|
+ SysUser sysUser = sysUserService.getById(userId);
|
|
|
|
+ JSONObject jo = new JSONObject();
|
|
|
|
+ jo.put("userId",sysUser.getId());
|
|
|
|
+ jo.put("userName",sysUser.getRealname());
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
return Result.OK(allSaleList);
|
|
return Result.OK(allSaleList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -298,7 +334,7 @@ public class CwjsPolicyInfoController {
|
|
public Result<CwjsPolicyInfo> add(@RequestBody CwjsPolicyInfo cwjsPolicyInfo) {
|
|
public Result<CwjsPolicyInfo> add(@RequestBody CwjsPolicyInfo cwjsPolicyInfo) {
|
|
Result<CwjsPolicyInfo> result = new Result<>();
|
|
Result<CwjsPolicyInfo> result = new Result<>();
|
|
try {
|
|
try {
|
|
- cwjsPolicyInfo.setApprovedStatus(1); //新增出来的政策全部都是待审核状态
|
|
|
|
|
|
+
|
|
String companySubjectName = cwjsPolicyInfo.getCompanySubjectName();
|
|
String companySubjectName = cwjsPolicyInfo.getCompanySubjectName();
|
|
String areaInfo = cwjsPolicyInfo.getAreaInfo();
|
|
String areaInfo = cwjsPolicyInfo.getAreaInfo();
|
|
Integer companySubjectId = companySubjectMapper.queryIdBySubjectNameAndArea(companySubjectName, areaInfo);
|
|
Integer companySubjectId = companySubjectMapper.queryIdBySubjectNameAndArea(companySubjectName, areaInfo);
|
|
@@ -310,11 +346,33 @@ public class CwjsPolicyInfoController {
|
|
if(Check.isNull(cwjsCompanyApprovalUsers)){
|
|
if(Check.isNull(cwjsCompanyApprovalUsers)){
|
|
return Result.errorMsg("此业务线暂时无审核人员,提交审核无效,请联系开发人员添加此区域主体的审核人员");
|
|
return Result.errorMsg("此业务线暂时无审核人员,提交审核无效,请联系开发人员添加此区域主体的审核人员");
|
|
}
|
|
}
|
|
|
|
+ //普通销售,新增都是1,审核进度的人都是等级为0的审核人id
|
|
cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
|
|
cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
|
|
if(cwjsCompanyApprovalUser.getLevel() == 0){
|
|
if(cwjsCompanyApprovalUser.getLevel() == 0){
|
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(1);
|
|
cwjsPolicyInfo.setApprovedProgress(cwjsCompanyApprovalUser.getApprovalUserId());
|
|
cwjsPolicyInfo.setApprovedProgress(cwjsCompanyApprovalUser.getApprovalUserId());
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+ //如果满足有审核人员等于当前创建的人,并且
|
|
|
|
+ cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
|
|
|
|
+ if(cwjsCompanyApprovalUser.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfo.getCreateUserId())){
|
|
|
|
+ CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel()+1);
|
|
|
|
+ if(Check.isNull(approvalUserNext)){
|
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
|
+ cwjsPolicyInfo.setApprovedProgress(null);
|
|
|
|
+ }else{
|
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(2);
|
|
|
|
+ cwjsPolicyInfo.setApprovedProgress(approvalUserNext.getApprovalUserId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ if(cwjsPolicyInfo.getAdvancePay() == 1){
|
|
|
|
+ cwjsPolicyInfo.setIsDianPay(null);
|
|
|
|
+ cwjsPolicyInfo.setDianPayCompanyName(null);
|
|
|
|
+ cwjsPolicyInfo.setDianPayCompanyRebateRate(null);
|
|
|
|
+ }
|
|
|
|
+
|
|
cwjsPolicyInfoService.save(cwjsPolicyInfo);
|
|
cwjsPolicyInfoService.save(cwjsPolicyInfo);
|
|
JSONArray products = cwjsPolicyInfo.getPolicyProductName();
|
|
JSONArray products = cwjsPolicyInfo.getPolicyProductName();
|
|
List<CwjsPolicyProduct> policyProductList = new ArrayList<>();
|
|
List<CwjsPolicyProduct> policyProductList = new ArrayList<>();
|
|
@@ -376,13 +434,14 @@ public class CwjsPolicyInfoController {
|
|
policyProductList.add(policyProduct);
|
|
policyProductList.add(policyProduct);
|
|
});
|
|
});
|
|
cwjsPolicyProductService.saveBatch(policyProductList);
|
|
cwjsPolicyProductService.saveBatch(policyProductList);
|
|
-
|
|
|
|
- boolean ok = cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
|
- if(ok) {
|
|
|
|
- result.success("修改成功!");
|
|
|
|
|
|
+ if(cwjsPolicyInfo.getAdvancePay() == 1){
|
|
|
|
+ cwjsPolicyInfo.setIsDianPay(null);
|
|
|
|
+ cwjsPolicyInfo.setDianPayCompanyName(null);
|
|
|
|
+ cwjsPolicyInfo.setDianPayCompanyRebateRate(null);
|
|
}
|
|
}
|
|
|
|
+ cwjsPolicyInfoService.updatePolicyInfoById(cwjsPolicyInfo);
|
|
|
|
+ result.success("修改成功!");
|
|
}
|
|
}
|
|
-
|
|
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|