|
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.UserCompany;
|
|
|
import cn.com.ctop.common.module.mapper.MailLogMapper;
|
|
|
+import cn.com.ctop.common.module.mapper.SysUserMapper;
|
|
|
import cn.com.ctop.common.module.service.IUserCompanyService;
|
|
|
import cn.com.ctop.common.module.utils.CorpWexinUtils;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -19,6 +20,7 @@ import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.system.entity.SysUser;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
@@ -32,6 +34,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
import org.jeecg.ctop.finance.policy.utils.Check;
|
|
|
+import org.jeecg.ctop.finance.policy.utils.ListPageUtil;
|
|
|
+import org.jeecg.modules.ctop.service.IMaterialReportOverViewService;
|
|
|
import org.jeecg.modules.system.service.ISysRoleService;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
@@ -57,7 +61,7 @@ import io.swagger.annotations.ApiOperation;
|
|
|
@Slf4j
|
|
|
@Api(tags="政策模块")
|
|
|
@RestController
|
|
|
-@RequestMapping("/finance/cwjsPolicyInfo")
|
|
|
+@RequestMapping("/cwjsPolicyInfo")
|
|
|
public class CwjsPolicyInfoController {
|
|
|
@Autowired
|
|
|
private ICwjsPolicyInfoService cwjsPolicyInfoService;
|
|
@@ -93,46 +97,72 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
}
|
|
|
|
|
|
- @PostMapping(value = "/policyApproval")
|
|
|
+ @GetMapping(value = "/policyApproval")
|
|
|
public Result policyApproval(@RequestParam(name="id",required=true) Integer id,
|
|
|
@RequestParam(name="type",required=true) Integer type,
|
|
|
+ @RequestParam(name="userId",required=true) String userId,
|
|
|
@RequestParam(name="approvalContent",required=false) String approvalContent){
|
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
CwjsPolicyInfo cwjsPolicyInfoEntity = cwjsPolicyInfoService.getById(id);
|
|
|
if(cwjsPolicyInfoEntity==null) {
|
|
|
- return Result.error("未找到对应实体");
|
|
|
+ return Result.error("参数传递有误");
|
|
|
}
|
|
|
- String companyId = companySubjectService.getById(cwjsPolicyInfoEntity.getCompanySubjectId()).getCompanyId();
|
|
|
- CwjsCompanyApprovalUser cwjsCompanyApprovalUser = companyApprovalUserMapper.queryByCompanyIdAndUserId(companyId, user.getId());
|
|
|
-
|
|
|
+ Integer companySubjectId= cwjsPolicyInfoEntity.getCompanySubjectId();
|
|
|
+ CwjsCompanyApprovalUser cwjsCompanyApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndUserId(companySubjectId, userId);
|
|
|
if(type == 1){ //审核提交 等于新增的时候
|
|
|
+// cwjsPolicyInfoEntity.setApprovedStatus(1);
|
|
|
if(!Check.isNull(cwjsCompanyApprovalUser)){//当前登录的用户所提交的政策是审核链里的人的提交的 直接状态到2给终审的人员
|
|
|
cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
}else{ //除了销售总监提交的申请都是-待审核
|
|
|
cwjsPolicyInfoEntity.setApprovedStatus(1);
|
|
|
}
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfoEntity.getApprovedProgress());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策需要审核,该客户为:");
|
|
|
+ text.append(cwjsPolicyInfoEntity.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
}
|
|
|
- if(type == 2){ //审核通过 是不是终审,不是就给当前的下一个人发企业微信
|
|
|
- if(!Check.isNull(cwjsCompanyApprovalUser) && !"final".equalsIgnoreCase(cwjsCompanyApprovalUser.getLevel())){//不是终审的
|
|
|
- cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
- }else{ //是终审的就搞成3
|
|
|
+ if(type == 2){ //审核通过 是不是终审,不是就给当前的下一个人发企业微信
|
|
|
+ CwjsCompanyApprovalUser nextApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel() + 1);
|
|
|
+ if(!Check.isNull(cwjsCompanyApprovalUser) && Check.isNull(nextApprovalUser)){//没有下一个审核人员,是终审
|
|
|
cwjsPolicyInfoEntity.setApprovedStatus(3);
|
|
|
+ }else{ //不是终审
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
+ cwjsPolicyInfoEntity.setApprovedProgress(nextApprovalUser.getApprovalUserId()); //设置一下个人为审核人员
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(nextApprovalUser.getApprovalUserId());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策需要审核,该客户为:");
|
|
|
+ text.append(cwjsPolicyInfoEntity.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
}
|
|
|
CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
- policyApprovalLog.setCreateUserId(user.getId());
|
|
|
+ policyApprovalLog.setPolicyId(id);
|
|
|
+ policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
if(type == 3){ //审核拒绝 给申请人发企业微信
|
|
|
cwjsPolicyInfoEntity.setApprovedStatus(4);
|
|
|
CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
- policyApprovalLog.setCreateUserId(user.getId());
|
|
|
+ policyApprovalLog.setPolicyId(id);
|
|
|
+ policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
policyApprovalLog.setApprovalStatus(1);
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
+
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfoEntity.getCreateUserId());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策审核未通过,客户为:");
|
|
|
+ text.append(cwjsPolicyInfoEntity.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行政策修改,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
}
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfoEntity);
|
|
|
- return Result.successMsg("提交成功",null);
|
|
|
+ return Result.successMsg("成功",cwjsPolicyInfoEntity);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -148,89 +178,113 @@ public class CwjsPolicyInfoController {
|
|
|
public Result<PageInfo<CwjsPolicyInfo>> queryPageList(CwjsPolicyInfo cwjsPolicyInfo,
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
+ @RequestParam(name="userId",required=true) String userId,
|
|
|
HttpServletRequest req) {
|
|
|
|
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUserList = companyApprovalUserMapper.queryByUserId(user.getId());
|
|
|
- if(Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
- cwjsPolicyInfo.setCreateUserId(user.getId());
|
|
|
- }else{
|
|
|
- List<Integer> companySubjectIds = new ArrayList<>();
|
|
|
- cwjsCompanyApprovalUserList.forEach(cwjsCompanyApprovalUser -> {
|
|
|
- List<CwjsCompanySubject> cwjsCompanySubjects = companySubjectMapper.queryByCompanyId(cwjsCompanyApprovalUser.getCompanyId());
|
|
|
- cwjsCompanySubjects.forEach(cwjsCompanySubject -> companySubjectIds.add(cwjsCompanySubject.getId()));
|
|
|
- });
|
|
|
- cwjsPolicyInfo.setCompanySubjectIds(companySubjectIds);
|
|
|
+ String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
|
+ List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUserList = companyApprovalUserMapper.queryByUserId(userId);
|
|
|
+ List<CwjsPolicyInfo> cwjsPolicyInfoList = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
|
|
|
+ if(Check.isNull(cwjsPolicyInfoList)){
|
|
|
+ PageInfo<CwjsPolicyInfo> pageInfo = new PageInfo<>(cwjsPolicyInfoList);
|
|
|
+ return Result.successMsg("目前没有政策,请新增",pageInfo);
|
|
|
}
|
|
|
-// String roleCode = roleService.getRoleCodeByUserId(user.getId());
|
|
|
-// if (roleCode.equals("admin")&&Check.isNull(cwjsPolicyInfo.getCreateUserId())) { //1.当前登录用户为管理员角色,并且没有传递销售id来精确查询。 则不触发sql的过滤条件
|
|
|
-// cwjsPolicyInfo.setCreateUserIds(null);
|
|
|
-// }else if(roleCode.equals("admin")&&!Check.isNull(cwjsPolicyInfo.getCreateUserId())){//2.当前登录用户为管理员角色,并且传递了销售的id,则需要触发
|
|
|
-// List<String> userIds = new ArrayList<>();
|
|
|
-// userIds.add(cwjsPolicyInfo.getCreateUserId());
|
|
|
-// cwjsPolicyInfo.setCreateUserIds(userIds);
|
|
|
-// }else if(roleCode.equals("saleDirector")){ //3.如果是销售总监 查询自己和手下创建的所有政策
|
|
|
-// List<SysUser> allList = userMapper.selectAllUser();
|
|
|
-// List<SysUser> mulUserList = treeCategoryData(allList, user.getId());
|
|
|
-// List<String> userIds = new ArrayList<>();
|
|
|
-// mulUserList.forEach(sysUser -> userIds.add(sysUser.getId()));
|
|
|
-// userIds.add(user.getId());
|
|
|
-// cwjsPolicyInfo.setCreateUserIds(userIds);
|
|
|
-// if(!Check.isNull(cwjsPolicyInfo.getCreateUserId())&& userIds.contains(cwjsPolicyInfo.getCreateUserId())){//总监精确查询了某个销售id的政策,那么先看这个销售是不是他的手下
|
|
|
-// List<String> newUserIds = new ArrayList<>();
|
|
|
-// newUserIds.add(cwjsPolicyInfo.getCreateUserId());
|
|
|
-// cwjsPolicyInfo.setCreateUserIds(newUserIds);
|
|
|
-// }
|
|
|
-// }else { //其他的人,谁登录看谁自己的
|
|
|
-// List<String> userIds = new ArrayList<>();
|
|
|
-// userIds.add(user.getId());
|
|
|
-// cwjsPolicyInfo.setCreateUserIds(userIds);
|
|
|
-// }
|
|
|
-
|
|
|
- PageHelper.startPage(pageNo,pageSize);
|
|
|
- List<CwjsPolicyInfo> cwjsPolicyInfos = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
|
|
|
+ /**如果是管理员,就全部看,该搜索搜索,不搜索就全看*/
|
|
|
+
|
|
|
+ /**如果不是管理员,也不是审核人员。看自己和自己下属的所有政策。*/
|
|
|
+ if(!"admin".equalsIgnoreCase(roleCode) && !"finance".equalsIgnoreCase(roleCode) && Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
+// Set<String> userIds= materialReportOverViewService.recursiveQuerySubordinate(userId);
|
|
|
+ List<String> userIds = cwjsPolicyInfoService.getAllSubordinate(userId);
|
|
|
+ List<CwjsPolicyInfo> removeList = new ArrayList<>();
|
|
|
+ cwjsPolicyInfoList.forEach(cwjsPolicy -> {
|
|
|
+ if(!userIds.contains(cwjsPolicy.getCreateUserId())){
|
|
|
+ removeList.add(cwjsPolicy);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ cwjsPolicyInfoList.removeAll(removeList);
|
|
|
+ }
|
|
|
+ /**如果不是管理员,是审核人员。看自己创建的和自己下属的所有政策、和该自己审核。*/
|
|
|
+ if(!"admin".equalsIgnoreCase(roleCode) && !"finance".equalsIgnoreCase(roleCode) && !Check.isNull(cwjsCompanyApprovalUserList)){
|
|
|
+// Set<String> userIds= materialReportOverViewService.recursiveQuerySubordinate(userId);
|
|
|
+ List<String> userIds = cwjsPolicyInfoService.getAllSubordinate(userId);
|
|
|
+
|
|
|
+ List<CwjsPolicyInfo> removeList = new ArrayList<>();
|
|
|
+ cwjsPolicyInfoList.forEach(cwjsPolicy -> {
|
|
|
+ if(!userIds.contains(cwjsPolicy.getCreateUserId()) && !userId.equalsIgnoreCase(cwjsPolicy.getApprovedProgress())){
|
|
|
+ removeList.add(cwjsPolicy);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ cwjsPolicyInfoList.removeAll(removeList);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ cwjsPolicyInfoList.sort((CwjsPolicyInfo o1, CwjsPolicyInfo o2) -> o2.getCreateTime().after(o1.getCreateTime()) ? 1 : -1 );
|
|
|
+ List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
|
|
|
+
|
|
|
cwjsPolicyInfos.forEach(cwjsPolicy ->{
|
|
|
CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId()); //添加日志记录最新的第一条
|
|
|
if(!Check.isNull(log)){
|
|
|
cwjsPolicy.setApprovalContent(log.getApprovalContent());
|
|
|
}
|
|
|
- if(Check.isNull(cwjsCompanyApprovalUserList)){ //普通销售
|
|
|
- if(cwjsPolicy.getApprovedStatus() == 4){
|
|
|
- cwjsPolicy.setOperation("编辑|提交审核");
|
|
|
- }else{
|
|
|
- cwjsPolicy.setOperation("查看");
|
|
|
- }
|
|
|
- }else{ //审核人员
|
|
|
- if(cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2){
|
|
|
- cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
|
|
|
- }else{
|
|
|
- cwjsPolicy.setOperation("查看");
|
|
|
- }
|
|
|
- }
|
|
|
+ cwjsPolicy.setOperation("查看"); //所有人只要能看到就能有查看的按钮
|
|
|
+ if(userId.equals(cwjsPolicy.getCreateUserId()) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
|
|
|
+ cwjsPolicy.setOperation("查看|编辑|提交审核");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(userId.equals(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
|
|
|
+ cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
|
|
|
+ }
|
|
|
+
|
|
|
+ UserCompany userCompany = userCompanyService.getByUserId(cwjsPolicy.getCreateUserId());
|
|
|
|
|
|
+ if(!Check.isNull(userCompany) && Check.isNull(cwjsPolicy.getCreateUserName())){
|
|
|
+ cwjsPolicy.setCreateUserName(userCompany.getUserName());
|
|
|
+ }
|
|
|
+ CwjsCompanySubject cwjsCompanySubject = companySubjectService.getById(cwjsPolicy.getCompanySubjectId());
|
|
|
+ cwjsPolicy.setCompanySubjectName(cwjsCompanySubject.getCompanySubjectName());
|
|
|
+ cwjsPolicy.setAreaInfo(cwjsCompanySubject.getAreaInfo());
|
|
|
});
|
|
|
PageInfo<CwjsPolicyInfo> pageInfo = new PageInfo<>(cwjsPolicyInfos);
|
|
|
+ pageInfo.setTotal(cwjsPolicyInfoList.size());
|
|
|
+ pageInfo.setPageSize(pageSize);
|
|
|
+ pageInfo.setPageNum(pageNo);
|
|
|
return Result.successMsg("成功。",pageInfo);
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+ @ApiOperation(value="政策信息表-获取当前公司的销售", notes="政策信息表-获取当前公司的销售")
|
|
|
+ @GetMapping(value = "/getAllSaleList")
|
|
|
+ public Result getAllSaleList(@RequestParam(name="userId",required=true) String userId){
|
|
|
+ String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
|
+ List<JSONObject> allSaleList;
|
|
|
+ if("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode)){
|
|
|
+ allSaleList = cwjsPolicyInfoService.getAllSale();
|
|
|
+ }else{
|
|
|
+ allSaleList = cwjsPolicyInfoService.getAllSaleByUserId(userId);
|
|
|
+ }
|
|
|
+ return Result.OK(allSaleList);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
- * 分页列表查询
|
|
|
+ * 获取当前用户的公司、区域、和主体
|
|
|
* @param userId
|
|
|
* @return
|
|
|
*/
|
|
|
-
|
|
|
- @ApiOperation(value="政策信息表-分页列表查询", notes="政策信息表-分页列表查询")
|
|
|
+ @ApiOperation(value="政策信息表-获取当前用户的公司、区域、和主体", notes="政策信息表-获取当前用户的公司、区域、和主体")
|
|
|
@GetMapping(value = "/queryAeraByUserId")
|
|
|
- public Result<JSONObject> queryAeraByUserId(@RequestParam(name="userId",required=true) String userId) {
|
|
|
- Result<JSONObject> result = new Result<>();
|
|
|
- UserCompany userCompany = userCompanyService.getByUserId(userId);
|
|
|
- List<CwjsCompanySubject> companySubjects = companySubjectMapper.queryByCompanyId(userCompany.getCompanyId());
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("UserCompany",userCompany);
|
|
|
- jsonObject.put("companySubjects",companySubjects);
|
|
|
+ public Result<JSONArray> queryAeraByUserId(@RequestParam(name="userId",required=true) String userId) {
|
|
|
+ Result<JSONArray> result = new Result<>();
|
|
|
+ List<UserCompany> userCompany = userCompanyService.getAllByUserId(userId);
|
|
|
+ JSONArray res = new JSONArray();
|
|
|
+ userCompany.forEach(user -> {
|
|
|
+ List<CwjsCompanySubject> companySubjects = companySubjectMapper.queryAllSubjectName();
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ jsonObject.put("UserCompany",userCompany);
|
|
|
+ jsonObject.put("companySubjects",companySubjects);
|
|
|
+ res.add(jsonObject);
|
|
|
+ });
|
|
|
result.setSuccess(true);
|
|
|
- result.setResult(jsonObject);
|
|
|
+ result.setResult(res);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
@@ -244,7 +298,23 @@ public class CwjsPolicyInfoController {
|
|
|
public Result<CwjsPolicyInfo> add(@RequestBody CwjsPolicyInfo cwjsPolicyInfo) {
|
|
|
Result<CwjsPolicyInfo> result = new Result<>();
|
|
|
try {
|
|
|
- cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(1); //新增出来的政策全部都是待审核状态
|
|
|
+ String companySubjectName = cwjsPolicyInfo.getCompanySubjectName();
|
|
|
+ String areaInfo = cwjsPolicyInfo.getAreaInfo();
|
|
|
+ Integer companySubjectId = companySubjectMapper.queryIdBySubjectNameAndArea(companySubjectName, areaInfo);
|
|
|
+ if(Check.isNull(companySubjectId)){
|
|
|
+ return Result.errorMsg("您选择的区域和公司主体系统不支持,请联系开发人员开放");
|
|
|
+ }
|
|
|
+ cwjsPolicyInfo.setCompanySubjectId(companySubjectId);
|
|
|
+ List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUsers = companyApprovalUserMapper.queryByCompanySubjectId(companySubjectId);
|
|
|
+ if(Check.isNull(cwjsCompanyApprovalUsers)){
|
|
|
+ return Result.errorMsg("此业务线暂时无审核人员,提交审核无效,请联系开发人员添加此区域主体的审核人员");
|
|
|
+ }
|
|
|
+ cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
|
|
|
+ if(cwjsCompanyApprovalUser.getLevel() == 0){
|
|
|
+ cwjsPolicyInfo.setApprovedProgress(cwjsCompanyApprovalUser.getApprovalUserId());
|
|
|
+ }
|
|
|
+ });
|
|
|
cwjsPolicyInfoService.save(cwjsPolicyInfo);
|
|
|
JSONArray products = cwjsPolicyInfo.getPolicyProductName();
|
|
|
List<CwjsPolicyProduct> policyProductList = new ArrayList<>();
|
|
@@ -257,7 +327,13 @@ public class CwjsPolicyInfoController {
|
|
|
policyProductList.add(policyProduct);
|
|
|
});
|
|
|
cwjsPolicyProductService.saveBatch(policyProductList);
|
|
|
- //先给first发企业微信
|
|
|
+ //先给first发企业微信 -- 先注释掉
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfo.getApprovedProgress());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策需要审核,该客户为:");
|
|
|
+ text.append(cwjsPolicyInfo.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
result.success("添加成功!");
|
|
|
} catch (Exception e) {
|
|
|
log.error(e.getMessage(),e);
|
|
@@ -279,6 +355,28 @@ public class CwjsPolicyInfoController {
|
|
|
if(cwjsPolicyInfoEntity==null) {
|
|
|
result.error500("未找到对应实体");
|
|
|
}else {
|
|
|
+ String companySubjectName = cwjsPolicyInfo.getCompanySubjectName();
|
|
|
+ String areaInfo = cwjsPolicyInfo.getAreaInfo();
|
|
|
+ Integer companySubjectId = companySubjectMapper.queryIdBySubjectNameAndArea(companySubjectName, areaInfo);
|
|
|
+ if(Check.isNull(companySubjectId)){
|
|
|
+ return Result.errorMsg("您要修改的区域和公司主体系统不支持,请联系开发人员开放");
|
|
|
+ }
|
|
|
+ cwjsPolicyInfo.setCompanySubjectId(companySubjectId);
|
|
|
+ //删除旧的产品
|
|
|
+ cwjsPolicyProductService.deleteProductsByPolicyId(cwjsPolicyInfo.getId());
|
|
|
+ //保存新的产品
|
|
|
+ List<CwjsPolicyProduct> policyProductList = new ArrayList<>();
|
|
|
+ JSONArray products = cwjsPolicyInfo.getPolicyProductName();
|
|
|
+ products.forEach(productName -> {
|
|
|
+ CwjsPolicyProduct policyProduct = new CwjsPolicyProduct();
|
|
|
+ policyProduct.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
+ policyProduct.setDelFlag(0);
|
|
|
+ policyProduct.setPolicyProductName((String) productName);
|
|
|
+ policyProduct.setPolicyId(cwjsPolicyInfo.getId());
|
|
|
+ policyProductList.add(policyProduct);
|
|
|
+ });
|
|
|
+ cwjsPolicyProductService.saveBatch(policyProductList);
|
|
|
+
|
|
|
boolean ok = cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
if(ok) {
|
|
|
result.success("修改成功!");
|
|
@@ -297,7 +395,7 @@ public class CwjsPolicyInfoController {
|
|
|
*/
|
|
|
@ApiOperation(value="政策信息表-通过id查询", notes="政策信息表-通过id查询")
|
|
|
@GetMapping(value = "/queryById")
|
|
|
- public Result<CwjsPolicyInfo> queryById(@RequestParam(name="id",required=true) String id) throws ParseException {
|
|
|
+ public Result<CwjsPolicyInfo> queryById(@RequestParam(name="id",required=true) Integer id) throws ParseException {
|
|
|
Result<CwjsPolicyInfo> result = new Result<>();
|
|
|
CwjsPolicyInfo cwjsPolicyInfo = cwjsPolicyInfoService.getById(id);
|
|
|
Date startDate = DateUtils.parseDate(cwjsPolicyInfo.getPolicyStartDate(),"yyyy-MM-dd");
|
|
@@ -427,4 +525,47 @@ public class CwjsPolicyInfoController {
|
|
|
return Result.ok("文件导入失败!");
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @GetMapping(value = "/weiXinNotice")
|
|
|
+ public Result weiXinNotice(){
|
|
|
+ CwjsPolicyInfo cwjsPolicyInfo = new CwjsPolicyInfo();
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
+ //待审核的状态的 政策
|
|
|
+ List<CwjsPolicyInfo> cwjsPolicyInfoListStatus1 = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
|
|
|
+ cwjsPolicyInfoListStatus1.forEach(cwjsPolicy -> {
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicy.getApprovedProgress());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策需要审核,该客户为:");
|
|
|
+ text.append(cwjsPolicy.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
+ });
|
|
|
+
|
|
|
+ //审核中的状态的政策
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(2);
|
|
|
+ List<CwjsPolicyInfo> cwjsPolicyInfoListStatus2 = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
|
|
|
+ cwjsPolicyInfoListStatus2.forEach(cwjsPolicy -> {
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicy.getApprovedProgress());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策需要审核,该客户为:");
|
|
|
+ text.append(cwjsPolicy.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
+ });
|
|
|
+
|
|
|
+ //审核拒绝的状态的政策
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(4);
|
|
|
+ List<CwjsPolicyInfo> cwjsPolicyInfoListStatus4 = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
|
|
|
+ cwjsPolicyInfoListStatus4.forEach(cwjsPolicy -> {
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicy.getCreateUserId());
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策审核未通过,该客户为:");
|
|
|
+ text.append(cwjsPolicy.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行政策修改,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
+ });
|
|
|
+
|
|
|
+ return Result.OK();
|
|
|
+ }
|
|
|
+
|
|
|
}
|