yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
62b6007f91 46ee7de29a
commit
b375a5108b
10 changed files with 107 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  2. 4
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java
  3. 4
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
  4. 15
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
  5. 5
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java
  6. 6
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
  7. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java
  8. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml
  9. 61
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java
  10. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -468,6 +468,7 @@
fsrd.collSid,
fsrd.purchaseSystemSid,
fsrd.purchaseSystemName,
fsrd.receivablesName,
(
fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS balance

4
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java
View File

@ -37,4 +37,8 @@ public interface FlowFeign {
@ResponseBody
ResultBean<List<FlowableMessageVo>> getMessageList(@RequestParam("minutes") int minutes);
@ApiOperation(value = "人工催办")
@GetMapping(value = "/getMessageReminder")
@ResponseBody
ResultBean<FlowableMessageVo> getMessageReminder(@RequestParam("proDefId") String proDefId, @RequestParam("proInstId") String proInstId);
}

4
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.flowable.api.flow.Flowable;
import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
import java.util.List;
@ -15,4 +17,6 @@ import java.util.List;
@Mapper
public interface FlowMapper extends BaseMapper<Flowable> {
List<FlowableMessageVo> getMessageList(int minutes);
FlowableMessageVo getMessageReminder(@Param("proDefId") String proDefId, @Param("proInstId") String proInstId);
}

15
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml
View File

@ -9,8 +9,21 @@
NAME_ as nodeName,
ASSIGNEE_ as assignee,
CREATE_TIME_ as createTime,
ID_ taskId,
ID_ taskId
from act_ru_task
HAVING yuTime > (#{minutes} * 60)
</select>
<select id="getMessageReminder" resultType="com.yxt.anrui.flowable.api.flow2.FlowableMessageVo">
select TIMESTAMPDIFF(SECOND, CREATE_TIME_, NOW()) as yuTime,
PROC_DEF_ID_ as proDefId,
PROC_INST_ID_ as procInstId,
TASK_DEF_KEY_ as taskDefKey,
NAME_ as nodeName,
ASSIGNEE_ as assignee,
CREATE_TIME_ as createTime,
ID_ taskId
from act_ru_task
where PROC_DEF_ID_ = #{proDefId} and PROC_INST_ID_ = #{proInstId}
</select>
</mapper>

5
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java
View File

@ -106,5 +106,10 @@ public class FlowRest implements FlowFeign {
return flowService.getMessageList(minutes);
}
@Override
public ResultBean<FlowableMessageVo> getMessageReminder(String proDefId, String proInstId) {
return flowService.getMessageReminder(proDefId,proInstId);
}
}

6
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
View File

@ -755,4 +755,10 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
return rb.success().setData(list);
}
public ResultBean<FlowableMessageVo> getMessageReminder(String proDefId, String proInstId) {
ResultBean<FlowableMessageVo> rb = ResultBean.fireFail();
FlowableMessageVo flowableMessageVo = baseMapper.getMessageReminder(proDefId,proInstId);
return rb.success().setData(flowableMessageVo);
}
}

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java
View File

@ -32,4 +32,12 @@ public class LoanFinBankQuery implements Query {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private String orgSidPath;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml
View File

@ -78,6 +78,6 @@
<select id="selectListByOrgSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo">
select sid, bankShortName name, bankName
from loan_fin_bank
where createOrgSid = #{orgSid}
where createOrgSid = #{orgSid} and isDelete = 0
</select>
</mapper>

61
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java
View File

@ -6,9 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanfinbank.*;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationQuery;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -52,6 +57,8 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
private FileUploadComponent fileUploadComponent;
@Autowired
private LoanFileService loanFileService;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<LoanFinBank> listPage(PagerQuery<LoanFinBankQuery> pq) {
LoanFinBankQuery query = pq.getParams();
@ -87,9 +94,59 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
}
public PagerVo<LoanFinBankVo> listPageVo(PagerQuery<LoanFinBankQuery> pq) {
LoanFinBankQuery query = pq.getParams();
QueryWrapper<LoanFinBank> qw = createQueryWrapper(query);
IPage<LoanFinBank> page = PagerUtil.queryToPage(pq);
LoanFinBankQuery pagerQuery = pq.getParams();
QueryWrapper<LoanFinBank> qw = new QueryWrapper<>();
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = pagerQuery.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", pagerQuery.getUserSid());
} else {
PagerVo<LoanFinBankVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanFinBankVo> p = new PagerVo<>();
return p;
}
//=======================
if (StringUtils.isNotBlank(pagerQuery.getManageName())) {
qw.like("bankName", pagerQuery.getManageName());
}
if (StringUtils.isNotBlank(pagerQuery.getName())) {
qw.like("contactor", pagerQuery.getName());
}
if (StringUtils.isNotBlank(pagerQuery.getMobile())) {
qw.like("mobile", pagerQuery.getMobile());
}
qw.eq("isDelete", 0);
qw.orderByDesc("createTime");
IPage<LoanFinBankVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanFinBankVo> p = PagerUtil.pageToVo(pagging, null);
return p;

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
View File

@ -1658,7 +1658,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setSzPrice(busSalesOrdersVo.getSzPrice());
solutionssVo.setFinalPrice(busSalesOrdersVo.getFinalPrice());
BusSalesOrderModel busSalesOrderModel = busSalesOrdersVo.getBusSalesOrderModel();
solutionssVo.setModelSid(busSalesOrderModel.getModelSid());
if(busSalesOrderModel != null){
solutionssVo.setModelSid(busSalesOrderModel.getModelSid());
}else{
return rb.setMsg("请先录入车型");
}
if (busSalesOrdersVo.getBusSalesOrder() != null) {
BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
//全款且为三方金融

Write Preview
Loading…
Cancel
Save