localizer
lzq
parent
4a186d2397
commit
e6df5b63c4
|
|
@ -19,6 +19,7 @@ import lombok.AccessLevel;
|
|||
import lombok.NoArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Date;
|
||||
|
|
@ -107,14 +108,15 @@ public final class AliOSS {
|
|||
oe.getHostId(),
|
||||
bucketName,
|
||||
objectName);
|
||||
throw Exceptions.error("文件服务器错误");
|
||||
// throw Exceptions.error("文件服务器错误");
|
||||
} catch (ClientException ce) {
|
||||
log.error("阿里云下载文件失败,错误信息：{}、存储桶：{}、对象名称：{}",
|
||||
ce.getMessage(),
|
||||
bucketName,
|
||||
objectName);
|
||||
throw Exceptions.error("文件服务器错误");
|
||||
// throw Exceptions.error("文件服务器错误");
|
||||
}
|
||||
return Tuple2.create(new ByteArrayInputStream(new byte[0]), "");
|
||||
}
|
||||
|
||||
public static String uploadFile(String objectName, String contentType, InputStream inputStream) {
|
||||
|
|
|
|||
|
|
@ -18,4 +18,6 @@ public interface BizAuditConfigMapper extends BaseMapper<BizAuditConfigEntity> {
|
|||
IPage<SearchAuditConfigResult> paging(Page<Object> page, @Param("ew") QueryWrapper<BizAuditConfigEntity> ew);
|
||||
|
||||
void modify(@Param("id") Long id, @Param("cityRole") String cityRole, @Param("areaRole") String areaRole);
|
||||
|
||||
String getAreaName(@Param("area") String area);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ public class BizProjectEntity {
|
|||
* Id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
package com.njzscloud.supervisory.biz.pojo.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
|
||||
import com.njzscloud.supervisory.biz.contant.AuditStatus;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 车辆信息
|
||||
|
|
@ -67,7 +69,17 @@ public class BizTruckEntity {
|
|||
* 审核备注
|
||||
*/
|
||||
private String auditMemo;
|
||||
/**
|
||||
* 行驶证有效期
|
||||
*/
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> truckLicenseDate;
|
||||
|
||||
/**
|
||||
* 合格证有效期
|
||||
*/
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> qualificationDate;
|
||||
/**
|
||||
* 创建人 Id; sys_user.id
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public class SearchCompanyParam {
|
|||
*/
|
||||
private BizObj bizObj;
|
||||
|
||||
private String station;
|
||||
private Integer station;
|
||||
|
||||
/**
|
||||
* 企业名称
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import lombok.Getter;
|
|||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 车辆信息
|
||||
*/
|
||||
|
|
@ -63,4 +65,14 @@ public class SearchTruckResult {
|
|||
*/
|
||||
private String auditMemo;
|
||||
|
||||
/**
|
||||
* 行驶证有效期
|
||||
*/
|
||||
private List<String> truckLicenseDate;
|
||||
|
||||
/**
|
||||
* 合格证有效期
|
||||
*/
|
||||
private List<String> qualificationDate;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ public class BizAuditConfigService extends ServiceImpl<BizAuditConfigMapper, Biz
|
|||
/**
|
||||
* 新增
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void add(BizAuditConfigEntity bizAuditConfigEntity) {
|
||||
AppProperties.DefaultPlace defaultPlace = appProperties.getDefaultPlace();
|
||||
bizAuditConfigEntity.setProvince(defaultPlace.getProvince())
|
||||
|
|
@ -39,8 +40,12 @@ public class BizAuditConfigService extends ServiceImpl<BizAuditConfigMapper, Biz
|
|||
.setCityName(defaultPlace.getCityName());
|
||||
|
||||
|
||||
Assert.isTrue(StrUtil.isNotBlank(bizAuditConfigEntity.getArea()), () -> Exceptions.clierr("区县不能为空"));
|
||||
Assert.isTrue(StrUtil.isNotBlank(bizAuditConfigEntity.getAreaName()), () -> Exceptions.clierr("区县名称不能为空"));
|
||||
String area = bizAuditConfigEntity.getArea();
|
||||
Assert.isTrue(StrUtil.isNotBlank(area), () -> Exceptions.clierr("区县不能为空"));
|
||||
String areaName = baseMapper.getAreaName(area);
|
||||
Assert.isTrue(StrUtil.isNotBlank(areaName), () -> Exceptions.clierr("区县名称不能为空"));
|
||||
bizAuditConfigEntity.setAreaName(areaName);
|
||||
|
||||
String areaRole = bizAuditConfigEntity.getAreaRole();
|
||||
if (StrUtil.isNotBlank(areaRole)) {
|
||||
Assert.isTrue(StrUtil.isNotBlank(bizAuditConfigEntity.getCityRole()), () -> Exceptions.clierr("市级审核员不能为空"));
|
||||
|
|
|
|||
|
|
@ -173,10 +173,10 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
|
|||
AuditStatus auditStatus = searchCompanyParam.getAuditStatus();
|
||||
String companyName = searchCompanyParam.getCompanyName();
|
||||
String legalRepresentative = searchCompanyParam.getLegalRepresentative();
|
||||
Integer station = searchCompanyParam.getStation();
|
||||
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
|
||||
.eq("a.station", Boolean.FALSE)
|
||||
.eq("a.station", station != null && station == 1)
|
||||
.eq(auditStatus != null, "a.audit_status", auditStatus)
|
||||
.eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
|
||||
.in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
|
||||
.like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
|
||||
.like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@ package com.njzscloud.supervisory.biz.service;
|
|||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Assert;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njzscloud.common.core.ex.Exceptions;
|
||||
import com.njzscloud.common.core.ienum.Dict;
|
||||
import com.njzscloud.common.mp.support.PageParam;
|
||||
import com.njzscloud.common.mp.support.PageResult;
|
||||
import com.njzscloud.common.security.support.UserDetail;
|
||||
|
|
@ -50,6 +51,7 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
|
|||
.setBizObj(BizObj.SiJi)
|
||||
);
|
||||
BizDriverEntity bizDriverEntity = BeanUtil.copyProperties(addDriverParam, BizDriverEntity.class)
|
||||
.setAuditStatus(AuditStatus.DaiShenHe)
|
||||
.setUserId(driverUserId)
|
||||
.setCompanyId(searchCompanyResult.getId());
|
||||
this.save(bizDriverEntity);
|
||||
|
|
@ -94,12 +96,20 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
|
|||
public PageResult<BizDriverEntity> paging(PageParam pageParam, BizDriverEntity bizDriverEntity) {
|
||||
String driverName = bizDriverEntity.getDriverName();
|
||||
String phone = bizDriverEntity.getPhone();
|
||||
Wrapper<BizDriverEntity> queryWrapper = Wrappers.<BizDriverEntity>query()
|
||||
QueryWrapper<BizDriverEntity> ew = Wrappers.<BizDriverEntity>query()
|
||||
.like(StrUtil.isNotBlank(driverName), "d.driver_name", driverName)
|
||||
.like(StrUtil.isNotBlank(phone), "d.phone", phone);
|
||||
|
||||
UserDetail userDetail = SecurityUtil.loginUser();
|
||||
BizObj parse = Dict.parse(userDetail.getBizObj(), BizObj.values());
|
||||
if (parse == BizObj.QiYe
|
||||
|| parse == BizObj.GeTi
|
||||
) {
|
||||
SearchCompanyResult searchCompanyResult = baseMapper.selectCompanyByUserId(userDetail.getUserId());
|
||||
ew.eq("d.company_id", searchCompanyResult.getId());
|
||||
}
|
||||
Page<BizDriverEntity> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
|
||||
return PageResult.of(baseMapper.selectPageWithCompanyName(page, queryWrapper));
|
||||
return PageResult.of(baseMapper.selectPageWithCompanyName(page, ew));
|
||||
}
|
||||
|
||||
public PageResult<BizDriverEntity> dispensabilityList(PageParam pageParam, String keywords) {
|
||||
|
|
@ -123,7 +133,7 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public void audit(AuditDriverParam auditDriverParam) {
|
||||
Assert.isTrue(auditDriverParam.getAuditStatus() == AuditStatus.TongGuo ||
|
||||
auditDriverParam.getAuditStatus() == AuditStatus.BoHui, "错误的审核状态");
|
||||
auditDriverParam.getAuditStatus() == AuditStatus.BoHui, "错误的审核状态");
|
||||
|
||||
BizDriverEntity oldData = getById(auditDriverParam.getId());
|
||||
if (oldData == null) {
|
||||
|
|
|
|||
|
|
@ -3,15 +3,18 @@ package com.njzscloud.supervisory.biz.service;
|
|||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njzscloud.common.core.ex.Exceptions;
|
||||
import com.njzscloud.common.core.ienum.Dict;
|
||||
import com.njzscloud.common.mp.support.PageParam;
|
||||
import com.njzscloud.common.mp.support.PageResult;
|
||||
import com.njzscloud.common.security.support.UserDetail;
|
||||
import com.njzscloud.common.security.util.SecurityUtil;
|
||||
import com.njzscloud.supervisory.biz.contant.AuditStatus;
|
||||
import com.njzscloud.supervisory.biz.contant.BizObj;
|
||||
import com.njzscloud.supervisory.biz.mapper.BizTruckMapper;
|
||||
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
|
||||
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
|
||||
|
|
@ -83,11 +86,18 @@ public class BizTruckService extends ServiceImpl<BizTruckMapper, BizTruckEntity>
|
|||
String companyName = searchTruckParam.getCompanyName();
|
||||
String licensePlate = searchTruckParam.getLicensePlate();
|
||||
AuditStatus auditStatus = searchTruckParam.getAuditStatus();
|
||||
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<SearchTruckResult>query()
|
||||
QueryWrapper<SearchTruckResult> ew = Wrappers.<SearchTruckResult>query()
|
||||
.eq(auditStatus != null, "a.audit_status", auditStatus)
|
||||
.like(StrUtil.isNotBlank(companyName), "b.company_name", companyName)
|
||||
.like(StrUtil.isNotBlank(licensePlate), "a.license_plate", licensePlate)
|
||||
));
|
||||
.like(StrUtil.isNotBlank(licensePlate), "a.license_plate", licensePlate);
|
||||
UserDetail userDetail = SecurityUtil.loginUser();
|
||||
BizObj parse = Dict.parse(userDetail.getBizObj(), BizObj.values());
|
||||
if (parse == BizObj.QiYe
|
||||
|| parse == BizObj.GeTi
|
||||
) {
|
||||
ew.eq("b.user_id", userDetail.getUserId());
|
||||
}
|
||||
return PageResult.of(baseMapper.paging(pageParam.toPage(), ew));
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njzscloud.common.mp.support.PageParam;
|
||||
import com.njzscloud.common.mp.support.PageResult;
|
||||
import com.njzscloud.common.mqtt.util.MqttUtil;
|
||||
import com.njzscloud.supervisory.device.contant.DeviceCode;
|
||||
import com.njzscloud.supervisory.device.mapper.DeviceInfoMapper;
|
||||
import com.njzscloud.supervisory.device.pojo.entity.DeviceInfoEntity;
|
||||
|
|
@ -44,6 +43,10 @@ public class DeviceInfoService extends ServiceImpl<DeviceInfoMapper, DeviceInfoE
|
|||
* @param deviceInfoEntity 数据
|
||||
*/
|
||||
public void add(DeviceInfoEntity deviceInfoEntity) {
|
||||
Map<String, Object> config = deviceInfoEntity.getConfig();
|
||||
if (MapUtil.isEmpty(config)) {
|
||||
deviceInfoEntity.setConfig(MapUtil.empty());
|
||||
}
|
||||
this.save(deviceInfoEntity);
|
||||
}
|
||||
|
||||
|
|
@ -267,7 +270,7 @@ public class DeviceInfoService extends ServiceImpl<DeviceInfoMapper, DeviceInfoE
|
|||
Integer weight = data.getInteger("weight");
|
||||
String frontPhoto = data.getString("photoFront");
|
||||
String bodyPhoto = data.getString("photoBody");
|
||||
if (weight == null || weight <= 200) {
|
||||
if (weight == null || weight == 0) {
|
||||
// 播语音
|
||||
playVoice(sn, "{}磅重异常，请重新称重", licensePlate);
|
||||
return resBuilder
|
||||
|
|
@ -306,15 +309,18 @@ public class DeviceInfoService extends ServiceImpl<DeviceInfoMapper, DeviceInfoE
|
|||
}
|
||||
|
||||
private void open(String sn) {
|
||||
MqttUtil.publish("zsy/1/barrier", MapUtil.builder()
|
||||
log.info("开门: {}", sn);
|
||||
/* MqttUtil.publish("zsy/1/barrier", MapUtil.builder()
|
||||
.put("deviceNo", sn)
|
||||
.build());
|
||||
.build()); */
|
||||
}
|
||||
|
||||
private void playVoice(String sn, String content, Object... params) {
|
||||
MqttUtil.publish("zsy/1/voice", MapUtil.builder()
|
||||
String format = StrUtil.format(content, params);
|
||||
log.info("播语音: {} {}", sn, format);
|
||||
/* MqttUtil.publish("zsy/1/voice", MapUtil.builder()
|
||||
.put("deviceNo", sn)
|
||||
.put("text", StrUtil.format(content, params))
|
||||
.build());
|
||||
.put("text", format)
|
||||
.build()); */
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,9 @@ public class OrderPagingResult {
|
|||
*/
|
||||
private Long stationId;
|
||||
|
||||
private String stationName;
|
||||
|
||||
|
||||
/**
|
||||
* 车道
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||
orderItem.setColumn("a.create_time");
|
||||
orderItem.setAsc(false);
|
||||
page.addOrder(orderItem);
|
||||
return PageResult.of(baseMapper.paging(page, Wrappers.<OrderPagingResult>query()
|
||||
QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
|
||||
.like(StrUtil.isNotBlank(sn), "a.sn", sn)
|
||||
.like(StrUtil.isNotBlank(licensePlate), "a.license_plate", licensePlate)
|
||||
.like(StrUtil.isNotBlank(nickname), "h.nickname", nickname)
|
||||
|
|
@ -167,8 +167,22 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||
.in(CollUtil.isNotEmpty(orderStatusList), "a.order_status", orderStatusList)
|
||||
.eq(checkStatus != null, "a.check_status", checkStatus)
|
||||
.ge(startTime != null, "a.create_time", startTime)
|
||||
.le(endTime != null, "a.create_time", endTime)
|
||||
));
|
||||
.le(endTime != null, "a.create_time", endTime);
|
||||
UserDetail userDetail = SecurityUtil.loginUser();
|
||||
BizObj parse = Dict.parse(userDetail.getBizObj(), BizObj.values());
|
||||
if (parse == BizObj.GeRen
|
||||
|| parse == BizObj.WuYe
|
||||
|| parse == BizObj.ShiGongDanWei
|
||||
|| parse == BizObj.ChaiQian
|
||||
|| parse == BizObj.SheQu
|
||||
) {
|
||||
ew.eq("a.user_id", userDetail.getUserId());
|
||||
} else if (parse == BizObj.QiYe
|
||||
|| parse == BizObj.GeTi
|
||||
) {
|
||||
ew.eq("g.user_id", userDetail.getUserId());
|
||||
}
|
||||
return PageResult.of(baseMapper.paging(page, ew));
|
||||
}
|
||||
|
||||
public PageResult<OrderPagingResult> auditPaging(PageParam pageParam, OrderPagingSearchParam orderPagingSearchParam) {
|
||||
|
|
@ -465,7 +479,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||
imgType = ImgUtil.IMAGE_TYPE_JPG;
|
||||
}
|
||||
|
||||
String qrcode = QrCodeUtil.generateAsBase64(orderCertificateParam.getLink(), new QrConfig(width, height), imgType);
|
||||
String qrcode = QrCodeUtil.generateAsBase64(orderCertificateParam.getLink() + "?orderId=" + orderCertificateParam.getOrderId(), new QrConfig(width, height), imgType);
|
||||
|
||||
return new OrderCertificateResult()
|
||||
.setOrderDetail(this.detail(orderCertificateParam.getOrderId()))
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@ spring:
|
|||
url: jdbc:mysql://47.115.226.143:3306/njzscloud?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
|
||||
username: root
|
||||
password: zsy2022
|
||||
# url: jdbc:mysql://localhost:33061/njzscloud?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
|
||||
# username: root
|
||||
# password: admin888999
|
||||
security:
|
||||
auth-ignores:
|
||||
- /auth/obtain_code
|
||||
|
|
@ -11,6 +14,8 @@ spring:
|
|||
- /district/tree
|
||||
- /sys_sn_config/add
|
||||
- /test/**
|
||||
- /device_info/report1
|
||||
- /device_info/report2
|
||||
|
||||
app:
|
||||
default-place:
|
||||
|
|
|
|||
|
|
@ -5,17 +5,15 @@
|
|||
<update id="modify">
|
||||
update biz_audit_config
|
||||
<set>
|
||||
<if test="cityRole != null">city_role = #{cityRole},</if>
|
||||
<if test="areaRole != null">area_role = #{areaRole},</if>
|
||||
<if test="city_role == ''">city_role = null,</if>
|
||||
<if test="areaRole == ''">area_role = null,</if>
|
||||
city_role = #{cityRole},
|
||||
area_role = #{areaRole}
|
||||
</set>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<select id="paging" resultType="com.njzscloud.supervisory.biz.pojo.result.SearchAuditConfigResult">
|
||||
SELECT a.*,
|
||||
b.role_name,
|
||||
c.role_name
|
||||
b.role_name city_role_name,
|
||||
c.role_name area_role_name
|
||||
FROM biz_audit_config a
|
||||
LEFT JOIN sys_role b ON b.role_code = a.city_role
|
||||
LEFT JOIN sys_role c ON c.role_code = a.area_role
|
||||
|
|
@ -23,4 +21,9 @@
|
|||
${ew.customSqlSegment}
|
||||
</if>
|
||||
</select>
|
||||
<select id="getAreaName" resultType="java.lang.String">
|
||||
SELECT district_name
|
||||
FROM sys_district
|
||||
WHERE id = #{area}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,11 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.njzscloud.supervisory.biz.mapper.BizTruckMapper">
|
||||
<select id="paging" resultType="com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult">
|
||||
<resultMap id="SearchTruckResultMap" autoMapping="true" type="com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult">
|
||||
<result property="truckLicenseDate" column="truck_license_date" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
|
||||
<result property="qualificationDate" column="qualification_date" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
|
||||
</resultMap>
|
||||
<select id="paging" resultMap="SearchTruckResultMap">
|
||||
SELECT
|
||||
a.id,
|
||||
a.company_id,
|
||||
|
|
@ -19,6 +23,8 @@
|
|||
a.modifier_id,
|
||||
a.create_time,
|
||||
a.modify_time,
|
||||
a.truck_license_date,
|
||||
a.qualification_date,
|
||||
a.deleted
|
||||
FROM biz_truck a
|
||||
INNER JOIN biz_company b ON b.id = a.company_id AND b.deleted = 0
|
||||
|
|
|
|||
|
|
@ -105,7 +105,8 @@
|
|||
h.phone,
|
||||
j.company_name,
|
||||
k.nickname checker_name,
|
||||
l.project_name
|
||||
l.project_name,
|
||||
m.company_name station_name
|
||||
FROM order_info a
|
||||
LEFT JOIN order_cargo_place b ON b.id = a.cargo_place_id
|
||||
LEFT JOIN order_goods c ON c.id = a.goods_id
|
||||
|
|
@ -118,6 +119,7 @@
|
|||
LEFT JOIN biz_company j ON j.user_id = a.user_id
|
||||
LEFT JOIN sys_user k ON k.id = a.checker_id
|
||||
LEFT JOIN biz_project l ON l.id = a.project_id
|
||||
LEFT JOIN biz_company m ON m.id = a.station_id AND m.station = 1
|
||||
</sql>
|
||||
|
||||
<resultMap id="OrderPagingResultMap" autoMapping="true" type="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"avatar": "data:image/png;base64,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",
|
||||
"version": "4.9.4",
|
||||
"createdTime": "2023-4-13 11:53:52",
|
||||
"updatedTime": "2025-9-16 15:32:56",
|
||||
"updatedTime": "2025-9-17 16:43:42",
|
||||
"dbConns": [],
|
||||
"profile": {
|
||||
"default": {
|
||||
|
|
@ -15157,6 +15157,40 @@
|
|||
"extProps": {},
|
||||
"id": "FA9EAD94-049E-4BF0-8C07-C8A648ED5F0A"
|
||||
},
|
||||
{
|
||||
"defKey": "truck_license_date",
|
||||
"defName": "行驶证有效期",
|
||||
"comment": "",
|
||||
"type": "VARCHAR",
|
||||
"len": 512,
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "'[]'",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
|
||||
"extProps": {},
|
||||
"id": "44B62491-42F4-477D-ADF6-604A04A0AC8E"
|
||||
},
|
||||
{
|
||||
"defKey": "qualification_date",
|
||||
"defName": "合格证有效期",
|
||||
"comment": "",
|
||||
"type": "VARCHAR",
|
||||
"len": 512,
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "'[]'",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
|
||||
"extProps": {},
|
||||
"id": "AD7A2BD5-F5DF-4EC9-A167-A1CF67189F02"
|
||||
},
|
||||
{
|
||||
"defKey": "creator_id",
|
||||
"defName": "创建人 Id",
|
||||
|
|
|
|||
Loading…
Reference in New Issue