|
|
@@ -34,6 +34,7 @@ import org.jeecg.ctop.finance.policy.service.*;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
+import org.jeecg.ctop.finance.policy.service.impl.CwjsCompanySubjectServiceImpl;
|
|
|
import org.jeecg.ctop.finance.policy.utils.Check;
|
|
|
import org.jeecg.ctop.finance.policy.utils.ListPageUtil;
|
|
|
import org.jeecg.ctop.finance.settlement.service.serviceImpl.ReportSettlementServiceImpl;
|
|
|
@@ -111,6 +112,8 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ICwjsCompanySubjectService cwjsCompanySubjectService;
|
|
|
/**
|
|
|
* 审核-master
|
|
|
* @param id 政策id
|
|
|
@@ -134,6 +137,10 @@ public class CwjsPolicyInfoController {
|
|
|
//获取 公司主题
|
|
|
Integer companySubjectId = cwjsPolicyInfo.getCompanySubjectId();
|
|
|
|
|
|
+ CwjsCompanySubject companySubject = cwjsCompanySubjectService.getById(companySubjectId);
|
|
|
+ cwjsPolicyInfo.setCompanyId(companySubject.getCompanyId());
|
|
|
+
|
|
|
+
|
|
|
//当前政策审核人
|
|
|
String approvalUser = cwjsPolicyInfo.getApprovedProgress();
|
|
|
|
|
|
@@ -215,7 +222,7 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
if(examineUser.getString("departName").contains("销售")){
|
|
|
//华北 ---> 自动转老板
|
|
|
- if (companySubjectId == 1){
|
|
|
+ if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")){
|
|
|
//查询 是否符合条件
|
|
|
List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(),cwjsPolicyInfo.getMediaType(),
|
|
|
cwjsPolicyInfo.getAdvancePay(),cwjsPolicyInfo.getRebateType(),cwjsPolicyInfo.getRebateRate());
|