lzq
/
njzscloud-dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

master
ljw 2025-12-12 16:38:26 +08:00
parent b4b2cefe75
commit 18ee460bc4
15 changed files with 95 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java
View File

@ -1,15 +1,22 @@
package com.njzscloud.dispose.cst.driver.mapper; package com.njzscloud.dispose.cst.driver.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/** /**
* 司机 * 司机
*
* @author ljw * @author ljw
*/ */
@Mapper @Mapper
public interface DriverMapper extends BaseMapper<DriverEntity> { public interface DriverMapper extends BaseMapper<DriverEntity> {
Page<DriverEntity> paging(Page<DriverEntity> page, @Param("ew") QueryWrapper<DriverEntity> ew);
DriverEntity getById(Long id);
} }

4
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java
View File

@ -1,5 +1,6 @@
package com.njzscloud.dispose.cst.driver.pojo.entity; package com.njzscloud.dispose.cst.driver.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -35,6 +36,9 @@ public class DriverEntity extends BaseEntity {
*/ */
private Long orgId; private Long orgId;
@TableField(exist = false)
private String orgName;
/** /**
* 驾驶证编号 * 驾驶证编号
*/ */

11
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.njzscloud.dispose.cst.driver.service.impl; package com.njzscloud.dispose.cst.driver.service.impl;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.mp.support.PageResult;
@ -16,6 +18,7 @@ import java.util.List;
/** /**
* 司机 * 司机
*
* @author ljw * @author ljw
*/ */
@Slf4j @Slf4j
@ -41,13 +44,13 @@ public class DriverServiceImpl extends ServiceImpl<DriverMapper, DriverEntity> i
@Override @Override
public DriverEntity detail(Long id) { public DriverEntity detail(Long id) {
return this.getById(id); return baseMapper.getById(id);
} }
@Override @Override
public PageResult<DriverEntity> paging(PageParam pageParam, DriverEntity driverEntity) { public PageResult<DriverEntity> paging(PageParam pageParam, DriverEntity driverEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<DriverEntity>query(driverEntity))); Page<DriverEntity> page = pageParam.toPage();
page.addOrder(OrderItem.desc("cd.create_time"));
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<DriverEntity>query(driverEntity)));
} }
} }

28
njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/contant/BizType.java 100644
View File

@ -0,0 +1,28 @@
package com.njzscloud.dispose.goods.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：biz_type
* 字典名称：业务类型
*
* @author ljw
*/
@Getter
@RequiredArgsConstructor
public enum BizType implements DictStr {
ZaiShengPin("ZaiShengPin", "再生品"),
HuiShouPin("HuiShouPin", "回收品"),
QiTa("QiTa", "其他"),
;
private final String val;
private final String txt;
}

19
njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java
View File

@ -1,7 +1,9 @@
package com.njzscloud.dispose.goods.goodscategory.pojo.entity; package com.njzscloud.dispose.goods.goodscategory.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njzscloud.dispose.common.pojo.entity.BaseEntity; import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
import com.njzscloud.dispose.goods.contant.BizType;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
@ -23,6 +25,9 @@ public class GoodsCategoryEntity extends BaseEntity {
*/ */
private String bizType; private String bizType;
@TableField(exist = false)
private String bizTypeName;
/** /**
* 分类名称 * 分类名称
*/ */
@ -37,6 +42,20 @@ public class GoodsCategoryEntity extends BaseEntity {
* 排序 * 排序
*/ */
private Integer sort; private Integer sort;
public String getBizTypeName() {
if (bizType == null) {
return null;
}
for (BizType type : BizType.values()) {
if (type.getVal().equals(bizType)) {
bizTypeName = type.getTxt();
break;
}
}
return bizTypeName;
}
} }

33
njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml
View File

@ -7,6 +7,7 @@
<result column="user_id" property="userId"/> <result column="user_id" property="userId"/>
<result column="customer_id" property="customerId"/> <result column="customer_id" property="customerId"/>
<result column="org_id" property="orgId"/> <result column="org_id" property="orgId"/>
<result column="org_name" property="orgName"/>
<result column="driving_licence_no" property="drivingLicenceNo"/> <result column="driving_licence_no" property="drivingLicenceNo"/>
<result column="driver_name" property="driverName"/> <result column="driver_name" property="driverName"/>
<result column="phone" property="phone"/> <result column="phone" property="phone"/>
@ -22,31 +23,27 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, user_id, customer_id, org_id, driving_licence_no, driver_name, phone, cd.id, cd.user_id, cd.customer_id, cd.org_id, co.org_name, cd.driving_licence_no, cd.driver_name, cd.phone,
driving_licence, licence_start_time, licence_end_time, busy, cd.driving_licence, cd.licence_start_time, cd.licence_end_time, cd.busy,
creator_id, modifier_id, create_time, modify_time, deleted cd.creator_id, cd.modifier_id, cd.create_time, cd.modify_time, cd.deleted
</sql> </sql>
<select id="selectById" resultMap="DriverResultMap"> <select id="getById" resultMap="DriverResultMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM cst_driver FROM cst_driver cd
WHERE id = #{id} left join cst_org co on cd.org_id = co.id
WHERE cd.id = #{id}
</select> </select>
<select id="selectList" resultMap="DriverResultMap"> <select id="paging" resultMap="DriverResultMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM cst_driver FROM cst_driver cd
<where> left join cst_org co on cd.org_id = co.id
<if test="userId != null">AND user_id = #{userId}</if> <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
<if test="customerId != null">AND customer_id = #{customerId}</if> ${ew.customSqlSegment}
<if test="orgId != null">AND org_id = #{orgId}</if> </if>
<if test="driverName != null and driverName != ''">AND driver_name = #{driverName}</if>
<if test="phone != null and phone != ''">AND phone = #{phone}</if>
<if test="busy != null">AND busy = #{busy}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select> </select>
</mapper> </mapper>

16
njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml
View File

@ -37,24 +37,10 @@
contract_start_date, contract_end_date, creator_id, modifier_id, create_time, modify_time, deleted contract_start_date, contract_end_date, creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="ProjectResultMap"> <select id="getById" resultMap="ProjectResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM cst_project FROM cst_project
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="ProjectResultMap">
SELECT <include refid="Base_Column_List"/>
FROM cst_project
<where>
<if test="projectName != null and projectName != ''">AND project_name = #{projectName}</if>
<if test="transCustomerId != null">AND trans_customer_id = #{transCustomerId}</if>
<if test="fringeCustomerId != null">AND fringe_customer_id = #{fringeCustomerId}</if>
<if test="province != null and province != ''">AND province = #{province}</if>
<if test="city != null and city != ''">AND city = #{city}</if>
<if test="area != null and area != ''">AND area = #{area}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

15
njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml
View File

@ -30,23 +30,10 @@
creator_id, modifier_id, create_time, modify_time, deleted creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="StationResultMap"> <select id="getById" resultMap="StationResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM cst_station FROM cst_station
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="StationResultMap">
SELECT <include refid="Base_Column_List"/>
FROM cst_station
<where>
<if test="orgId != null">AND org_id = #{orgId}</if>
<if test="stationName != null and stationName != ''">AND station_name = #{stationName}</if>
<if test="province != null and province != ''">AND province = #{province}</if>
<if test="city != null and city != ''">AND city = #{city}</if>
<if test="area != null and area != ''">AND area = #{area}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

16
njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml
View File

@ -33,25 +33,11 @@
creator_id, modifier_id, create_time, modify_time, deleted creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="TruckResultMap"> <select id="getById" resultMap="TruckResultMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM cst_truck FROM cst_truck
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="TruckResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM cst_truck
<where>
<if test="customerId != null">AND customer_id = #{customerId}</if>
<if test="orgId != null">AND org_id = #{orgId}</if>
<if test="licensePlate != null and licensePlate != ''">AND license_plate = #{licensePlate}</if>
<if test="truckCategory != null and truckCategory != ''">AND truck_category = #{truckCategory}</if>
<if test="busy != null">AND busy = #{busy}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

15
njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml
View File

@ -30,25 +30,12 @@
creator_id, modifier_id, create_time, modify_time, deleted creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="BillResultMap"> <select id="getById" resultMap="BillResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM fin_bill FROM fin_bill
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="BillResultMap">
SELECT <include refid="Base_Column_List"/>
FROM fin_bill
<where>
<if test="userId != null">AND user_id = #{userId}</if>
<if test="customerId != null">AND customer_id = #{customerId}</if>
<if test="orgId != null">AND org_id = #{orgId}</if>
<if test="accountType != null and accountType != ''">AND account_type = #{accountType}</if>
<if test="billPeriod != null">AND bill_period = #{billPeriod}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

15
njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml
View File

@ -32,25 +32,12 @@
goods_scope, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted goods_scope, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="ExpenseItemResultMap"> <select id="getById" resultMap="ExpenseItemResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM fin_expense_item FROM fin_expense_item
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="ExpenseItemResultMap">
SELECT <include refid="Base_Column_List"/>
FROM fin_expense_item
<where>
<if test="expenseItemCategory != null and expenseItemCategory != ''">AND expense_item_category = #{expenseItemCategory}</if>
<if test="expenseItemName != null and expenseItemName != ''">AND expense_item_name = #{expenseItemName}</if>
<if test="expenseStrategy != null and expenseStrategy != ''">AND expense_strategy = #{expenseStrategy}</if>
<if test="payer != null and payer != ''">AND payer = #{payer}</if>
<if test="canuse != null">AND canuse = #{canuse}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

15
njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml
View File

@ -23,25 +23,12 @@
creator_id, modifier_id, create_time, modify_time, deleted creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="MoneyAccountResultMap"> <select id="getById" resultMap="MoneyAccountResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM fin_money_account FROM fin_money_account
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="MoneyAccountResultMap">
SELECT <include refid="Base_Column_List"/>
FROM fin_money_account
<where>
<if test="sn != null and sn != ''">AND sn = #{sn}</if>
<if test="accountType != null and accountType != ''">AND account_type = #{accountType}</if>
<if test="userId != null">AND user_id = #{userId}</if>
<if test="customerId != null">AND customer_id = #{customerId}</if>
<if test="orgId != null">AND org_id = #{orgId}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

14
njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml
View File

@ -25,24 +25,12 @@
money_change_category, memo, creator_id, modifier_id, create_time, modify_time, deleted money_change_category, memo, creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="MoneyFlowResultMap"> <select id="getById" resultMap="MoneyFlowResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM fin_money_flow FROM fin_money_flow
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="MoneyFlowResultMap">
SELECT <include refid="Base_Column_List"/>
FROM fin_money_flow
<where>
<if test="orderId != null">AND order_id = #{orderId}</if>
<if test="orderSn != null and orderSn != ''">AND order_sn = #{orderSn}</if>
<if test="moneyAccountId != null">AND money_account_id = #{moneyAccountId}</if>
<if test="moneyChangeCategory != null and moneyChangeCategory != ''">AND money_change_category = #{moneyChangeCategory}</if>
<if test="deleted != null">AND deleted = #{deleted}</if>
</where>
ORDER BY create_time DESC
</select>
</mapper> </mapper>

6
njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml
View File

@ -28,13 +28,13 @@
fg, sfg, rg, sort, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted fg, sfg, rg, sort, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="GoodsResultMap"> <select id="getById" resultMap="GoodsResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM gds_goods FROM gds_goods
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="GoodsResultMap"> <!--<select id="selectList" resultMap="GoodsResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM gds_goods FROM gds_goods
<where> <where>
@ -49,7 +49,7 @@
<if test="deleted != null">AND deleted = #{deleted}</if> <if test="deleted != null">AND deleted = #{deleted}</if>
</where> </where>
ORDER BY sort ASC, create_time DESC ORDER BY sort ASC, create_time DESC
</select> </select>-->
</mapper> </mapper>

6
njzscloud-svr/src/main/resources/mapper/goods/goodsCategory/GoodsCategoryMapper.xml
View File

@ -19,13 +19,13 @@
id, biz_type, category_name, picture, sort, creator_id, modifier_id, create_time, modify_time, deleted id, biz_type, category_name, picture, sort, creator_id, modifier_id, create_time, modify_time, deleted
</sql> </sql>
<select id="selectById" resultMap="GoodsCategoryResultMap"> <select id="getById" resultMap="GoodsCategoryResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM gds_goods_category FROM gds_goods_category
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectList" resultMap="GoodsCategoryResultMap"> <!--<select id="selectList" resultMap="GoodsCategoryResultMap">
SELECT <include refid="Base_Column_List"/> SELECT <include refid="Base_Column_List"/>
FROM gds_goods_category FROM gds_goods_category
<where> <where>
@ -34,7 +34,7 @@
<if test="deleted != null">AND deleted = #{deleted}</if> <if test="deleted != null">AND deleted = #{deleted}</if>
</where> </where>
ORDER BY sort ASC, create_time DESC ORDER BY sort ASC, create_time DESC
</select> </select>-->
</mapper> </mapper>