优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -75,6 +75,11 @@
     </select>
 
     <select id="selectByOrdersSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
-        select * from bus_sales_order_vehicle where salesOrderSid = #{sid} and (borrowerSid is null or borrowerSid = '')
+        select a.* from(select bv.* from bus_sales_order_vehicle bv where bv.salesOrderSid = #{sid} and (bv.borrowerSid is null or bv.borrowerSid = '')
+                          union all
+                          select bv.* from bus_sales_order_vehicle bv
+                                               left join bus_sales_order_borrower bob on bv.borrowerSid = bob.sid
+                          where bv.salesOrderSid =#{sid} and length(bv.borrowerSid)>0 and bob.state = 0) a group by a.sid
+
     </select>
 </mapper>

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSetting.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSetting extends BaseEntity {
+    private static final long serialVersionUID = 5546089724912096395L;
+    @ApiModelProperty("表名key")
+    private String tableNameKey;
+    @ApiModelProperty("表名value")
+    private String tableNameValue;
+    @ApiModelProperty("列名")
+    private String columnName;
+    @ApiModelProperty("注释")
+    private String columnComment;
+    @ApiModelProperty("创建人机构sid")
+    private String createOrgSid;
+    @ApiModelProperty("分公司全路径")
+    private String orgSidPath;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeign.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Api(tags = "统计参数设置")
+@FeignClient(
+        contextId = "anrui-portal-SysParameterSetting",
+        name = "anrui-portal",
+        path = "v1/SysParameterSetting",
+        fallback = SysParameterSettingFeignFallback.class)
+public interface SysParameterSettingFeign {
+
+    @ApiOperation("分页")
+    @PostMapping("/listPage")
+    ResultBean<PagerVo<SysParameterSettingVo>> listPage(@RequestBody PagerQuery<SysParameterSettingQuery> pagerQuery);
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Component
+public class SysParameterSettingFeignFallback {
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSettingQuery implements Query {
+    private static final long serialVersionUID = 8109733209988872255L;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSettingVo {
+
+    private String sid;
+    @ApiModelProperty("表名key")
+    private String tableNameKey;
+    @ApiModelProperty("表名value")
+    private String tableNameValue;
+    @ApiModelProperty("列名")
+    private String columnName;
+    @ApiModelProperty("注释")
+    private String columnComment;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparametersetting/SysParameterSettingRest.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.portal.biz.sysparametersetting;
+
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingFeign;
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingQuery;
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Api(tags = "统计参数设置")
+@RestController
+@RequestMapping("v1/SysParameterSetting")
+public class SysParameterSettingRest implements SysParameterSettingFeign {
+    @Override
+    public ResultBean<PagerVo<SysParameterSettingVo>> listPage(PagerQuery<SysParameterSettingQuery> pagerQuery) {
+        return null;
+    }
+}