优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -118,7 +118,7 @@ public interface BaseVehmodelConfigFeign {
      */
     @ApiOperation("根据分公司查询车型配置关联表中的车型信息")
     @PostMapping("/selModelByUseOrgSid")
-    ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
+    ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid,@RequestParam(value = "name",required = false) String name);
 
     /**
      * 根据分公司sid查询车型和常用配置关联表

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@@ -94,7 +94,7 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
     }
 
     @Override
-    public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid) {
+    public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid, String name) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -141,5 +141,5 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     @Select("SELECT configurationItemsSid  FROM  base_vehmodel_config  WHERE modelSid = #{modelSid}")
     List<String> selectModelConfigSidByModelSid(@Param("modelSid") String modelSid);
 
-    List<BaseVehmodelConfigVos> selModelByUseOrgSid(String useOrgSid);
+    List<BaseVehmodelConfigVos> selModelByUseOrgSid(@Param(Constants.WRAPPER) QueryWrapper qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -372,10 +372,12 @@
 
     <select id="selModelByUseOrgSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos">
         SELECT DISTINCT bvm.`sid` AS modelSid,
-                        bvm.vehicleAlias
+        bvm.vehicleAlias
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm
+        LEFT JOIN base_vehicle_model bvm
-                ON bvc.`modelSid` = bvm.`sid`
+        ON bvc.`modelSid` = bvm.`sid`
-        WHERE useOrgSid = #{useOrgSid}
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -119,8 +119,8 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
     }
 
     @Override
-    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid,String orgSid) {
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid, String orgSid) {
-        return baseVehmodelConfigService.selectOne(modelSid, configSid,orgSid);
+        return baseVehmodelConfigService.selectOne(modelSid, configSid, orgSid);
     }
 
     @Override
@@ -131,8 +131,8 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
     }
 
     @Override
-    public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid) {
+    public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid, String name) {
-        return baseVehmodelConfigService.selModelByUseOrgSid(useOrgSid);
+        return baseVehmodelConfigService.selModelByUseOrgSid(useOrgSid, name);
     }
 
     @Override
@@ -189,12 +189,12 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
 
     @Override
     public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
-        return baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
+        return baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid, userSid);
     }
 
     @Override
     public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary1(String modelSid, String configSid, String orgSid) {
-        return baseVehmodelConfigService.selectCarConfigSummary1(modelSid, configSid,orgSid);
+        return baseVehmodelConfigService.selectCarConfigSummary1(modelSid, configSid, orgSid);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -942,9 +942,14 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return baseMapper.selectModelConfigSidByModelSid(modelSid);
     }
 
-    public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid) {
+    public ResultBean<List<BaseVehmodelConfigVos>> selModelByUseOrgSid(String useOrgSid, String name) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseMapper.selModelByUseOrgSid(useOrgSid);
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("bvc.useOrgSid", useOrgSid);
+        if (StringUtils.isNotBlank(name)) {
+            qw.like("bvm.vehicleAlias", name);
+        }
+        List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseMapper.selModelByUseOrgSid(qw);
         return rb.success().setData(baseVehmodelConfigVos);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -937,7 +937,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
         String businessTaskId = busSalesOrderReturnVehApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if (businessTaskId.equals(query.getTaskId())) {
+            if (query.getUserSid().equals(busSalesOrderReturnVehApply.getCreateBySid())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -947,7 +947,20 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
                 return rb.success().setData(resultBean.getData());
+            } else {
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(map);
+                    return rb.success().setData(resultBean.getData());
+                }
             }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsQuery.java

@@ -22,4 +22,6 @@ public class CreditReviewDetailsQuery implements Query {
     private String sourceSid;
     @ApiModelProperty("申诉来源 true贷前信用审核发起申诉 false申诉申请回显")
     private Boolean addNew;
+    @ApiModelProperty("查询条件")
+    private String name;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/IdentityDetailsVo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class IdentityDetailsVo implements Vo {
 
+    private String id;
     private String sid;
     @ApiModelProperty("人员类型key")
     private String dictKey;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -345,10 +345,11 @@ public class CreditReviewService {
     public ResultBean<List<IdentityDetailsVo>> selModelByUseOrgSid(CreditReviewDetailsQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-        List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseVehmodelConfigFeign.selModelByUseOrgSid(useOrgSid).getData();
+        List<BaseVehmodelConfigVos> baseVehmodelConfigVos = baseVehmodelConfigFeign.selModelByUseOrgSid(useOrgSid,query.getName()).getData();
         List<IdentityDetailsVo> identityDetailsVos = new ArrayList<>();
         for (BaseVehmodelConfigVos baseVehmodelConfigVo : baseVehmodelConfigVos) {
             IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
+            identityDetailsVo.setId(baseVehmodelConfigVo.getModelSid());
             identityDetailsVo.setSid(baseVehmodelConfigVo.getModelSid());
             identityDetailsVo.setDictKey(baseVehmodelConfigVo.getModelSid());
             identityDetailsVo.setDictValue(baseVehmodelConfigVo.getVehicleAlias());