优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/flow/FlowableService.java

@@ -127,7 +127,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     }
 
     public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
-        return flowDefinitionFeign.pagerList(pageNum, pageSize);
+        return flowDefinitionFeign.pagerList(pageNum, pageSize,"");
     }
 
     public ResultBean todoTaskList(String userSid,PagerQuery<TaskQuery> pQuery) {

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java

@@ -34,7 +34,8 @@ public interface FlowDefinitionFeign {
     @PostMapping("/pagerList")
     @ResponseBody
     public ResultBean pagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum,
-                                @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize);
+                                @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize,
+                                @ApiParam(value = "名称", required = false) @RequestParam("name") String name);
 
     /**
      * 挂起后，就不可以再开启一个流程实例了，也就是 runtimeService.startProcessInstanceByKey("流程定义ID");会抛出异常

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java

@@ -21,7 +21,7 @@ public class FlowDefinitionFeignFallBack implements FlowDefinitionFeign {
     }
 
     @Override
-    public ResultBean pagerList(Integer pageNum, Integer pageSize) {
+    public ResultBean pagerList(Integer pageNum, Integer pageSize,String name) {
         return null;
     }
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -233,7 +233,7 @@ public class FlowableRest implements FlowableFeign {
     @Override
     public ResultBean processPagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum,
                                        @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize) {
-        return flowableService.processPagerList(pageNum, pageSize);
+        return flowableService.processPagerList(pageNum, pageSize,"");
     }
 
     @Override

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@@ -93,8 +93,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         return flowTaskService.businessMyprocessNew(userSid, pq);
     }
 
-    public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
-        return flowDefinitionService.pagerListNew(pageNum, pageSize);
+    public ResultBean processPagerList(Integer pageNum, Integer pageSize,String name) {
+        return flowDefinitionService.pagerListNew(pageNum, pageSize,name);
     }
 
     public ResultBean todoTaskList(String userSid, PagerQuery<TaskQuery> pQuery) {

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionRest.java

@@ -72,8 +72,8 @@ public class FlowDefinitionRest implements FlowDefinitionFeign {
     }
 
     @Override
-    public ResultBean pagerList(Integer pageNum, Integer pageSize) {
-        return flowDefinitionService.pagerListNew(pageNum, pageSize);
+    public ResultBean pagerList(Integer pageNum, Integer pageSize,String name) {
+        return flowDefinitionService.pagerListNew(pageNum, pageSize,name);
     }
 
     @Override

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java

@@ -76,11 +76,19 @@ public class FlowDefinitionService extends FlowServiceFactory {
         repositoryService.setProcessDefinitionCategory(definition.getId(), category);
     }
 
-    public Page<FlowDefinitionVo> list(Integer pageNum, Integer pageSize) {
+    public Page<FlowDefinitionVo> list(Integer pageNum, Integer pageSize,String name) {
         Page<FlowDefinitionVo> page = new Page<>();
         // 流程定义列表数据查询
-        ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
-                .orderByProcessDefinitionKey().asc();
+       /* ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+                .orderByProcessDefinitionKey().asc();*/
+        ProcessDefinitionQuery processDefinitionQuery = null;
+        if(StringUtils.isBlank(name)){
+            processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+                    .orderByProcessDefinitionKey().asc();
+        }else{
+            processDefinitionQuery = repositoryService.createProcessDefinitionQuery().processDefinitionNameLike("%"+name+"%")
+                    .orderByProcessDefinitionKey().asc();
+        }
         page.setTotal(processDefinitionQuery.count());
         List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage((pageNum - 1) * pageSize, pageSize);
 
@@ -338,8 +346,8 @@ public class FlowDefinitionService extends FlowServiceFactory {
         return resultBean;
     }
 
-    public ResultBean pagerListNew(Integer pageNum, Integer pageSize) {
-        Page<FlowDefinitionVo> pageList = list(pageNum, pageSize);
+    public ResultBean pagerListNew(Integer pageNum, Integer pageSize,String name) {
+        Page<FlowDefinitionVo> pageList = list(pageNum, pageSize,name);
         return ResultBean.fireSuccess().setData(pageList);
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -101,7 +101,7 @@ public class FlowableRest implements FlowableFeign {
 
     @Override
     public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
-        return flowableService.processPagerList(pageNum, pageSize);
+        return flowableService.processPagerList(pageNum, pageSize,"");
     }
 
     @Override

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -145,8 +145,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         return flowTaskFeign.businessMyprocess(userSid, pq);
     }
 
-    public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
-        return flowDefinitionFeign.pagerList(pageNum, pageSize);
+    public ResultBean processPagerList(Integer pageNum, Integer pageSize,String name) {
+        return flowDefinitionFeign.pagerList(pageNum, pageSize,name);
     }
 
     public ResultBean todoTaskList(String userSid, PagerQuery<TaskQuery> pQuery) {

doc/databases/risk_center.sql

@@ -1865,6 +1865,45 @@ CREATE TABLE `loan_settle_company_reduction`
   DEFAULT CHARSET = utf8 COMMENT ='公司结清费用减免情况';
 
 
+DROP TABLE IF EXISTS `loan_settle_vehicle`;
+CREATE TABLE `loan_settle_vehicle`
+(
+    `id`              int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`             varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`     int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`        int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`           int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`        int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `typeState`       varchar(64)          DEFAULT NULL COMMENT '结清类型key',
+    `typeStateValue`  varchar(64)          DEFAULT NULL COMMENT '结清类型value',
+    `useOrgName`      varchar(64)          DEFAULT NULL COMMENT '分公司',
+    `useOrgSid`       varchar(64)          DEFAULT NULL COMMENT '分公司sid',
+    `createDept`      varchar(64)          DEFAULT NULL COMMENT '销售部门',
+    `createDeptSid`   varchar(64)          DEFAULT NULL COMMENT '销售部门sid',
+    `orgSidPath`      text                 DEFAULT NULL COMMENT '组织机构全路径sid',
+    `loanContractNo`  varchar(64)          DEFAULT NULL COMMENT '贷款合同编号',
+    `vinNo`           varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `busVinSid`       varchar(64)          DEFAULT NULL COMMENT '销售订单车辆sid',
+    `vehMark`         varchar(64)          DEFAULT NULL COMMENT '车牌号',
+    `loanName`        varchar(64)          DEFAULT NULL COMMENT '贷款人',
+    `loanSid`         varchar(64)          DEFAULT NULL COMMENT '贷款人sid',
+    `peroid`          varchar(64)          DEFAULT NULL COMMENT '期数',
+    `settingDate`     varchar(64)          DEFAULT NULL COMMENT '结清日期',
+    `bankSettlePrice` decimal(10, 2)       DEFAULT NULL COMMENT '资方结清金额',
+    `settleAll`       decimal(10, 2)       DEFAULT NULL COMMENT '公司正常结清合计',
+    `amountTo`        decimal(10, 2)       DEFAULT NULL COMMENT '公司减免后结清合计',
+    `profit`          decimal(10, 2)       DEFAULT NULL COMMENT '结清利润',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='结清车辆台账';
+
+