dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

Browse Source
This commit is contained in:
xiaofajia 2024-10-28 23:09:12 +08:00
commit b458fc1b7b
9 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
View File

@ -13,5 +13,7 @@ import lombok.ToString;
public class CustomerMainPageReqVO extends CustomerMain {
/**系统标识*/
private String systemCode;
/** 工单查询时条件*/
private String phoneOrCar;
}

6
dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
View File

@ -43,6 +43,7 @@
base_customer_main main
LEFT JOIN base_customer_item item ON main.id = item.cus_id AND item.deleted = 0
LEFT JOIN dl_member_level memberLevel ON main.member_level_id = memberLevel.id
LEFT JOIN base_car_main car ON main.user_id = car.user_id
<where>
main.deleted = 0
<if test="entity.cusName != null and entity.cusName != ''">
@ -57,6 +58,11 @@
<if test="entity.phoneNumber != null and entity.phoneNumber != ''">
AND main.phone_number LIKE concat('%',#{entity.phoneNumber},'%')
</if>
<if test="entity.phoneOrCar != null and entity.phoneOrCar != ''">
AND main.phone_number = #{entity.phoneOrCar}
OR car.license_number = #{entity.phoneOrCar}
OR car.vin = #{entity.phoneOrCar}
</if>
</where>
GROUP BY main.id
ORDER BY main.create_time DESC

7
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -200,13 +200,16 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
customerInfo.setCustomerName(user.getNickname());
customerInfo.setSex("0");
customerInfo.setUserAge(user.getUserAge());
// 设置客户来源
CustomerMain customerMain = new CustomerMain();
customerMain.setDataFrom("01");
customerMainService.saveOrUpdate(customerMain);
try {
customerInfoService.insertPartnerCustomerInfo(customerInfo);
}catch (Exception ignored){
}
}
//追加订单明细记录
orderInfoDetailService.save(new OrderInfoDetail(orderInfo.getId(),"线下订单创建",new Date(),0L,"1"));

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
View File

@ -126,7 +126,7 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int insertPartnerCustomerInfo(PartnerCustomerInfo partnerCustomerInfo) throws Exception {
// 获取当前商户信息
ShopMallPartners partners = partnerService.shopInfo();

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -286,7 +286,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
}
repairOrderInfoService.saveOrderInfo(repairOrderInfo);
//最后记录操作日志--创建工单
repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", null);
repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", ticketsRespVO.getImage());
return ticketsRespVO;
}

3
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresReqVO.java
View File

@ -25,4 +25,7 @@ public class DlTicketWaresReqVO extends DlTicketWares {
/** 查看可以退料的数据时为tru */
private Boolean isBack;
/** 查看待审核的数据时为true */
private Boolean isToBeReviewed;
}

6
dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
View File

@ -43,6 +43,7 @@
so.so_status,
so.remark,
so.corp_id,
so.main_id,
so.corp_name,
so.dept_id,
so.create_time,
@ -67,7 +68,7 @@
and so.so_status = #{map.soStatus}
</if>
<if test="map.soStatus == null">
and so.so_status != '06'
and (so.so_status != '06' or so.so_status is null)
</if>
<if test="map.searchTimeArray != null and map.searchTimeArray.length > 0">
and (so.create_time between #{map.searchTimeArray[0]} and #{map.searchTimeArray[1]})
@ -84,6 +85,9 @@
<if test="map.userId != null and map.userId != ''">
and (so.user_id = #{map.userId})
</if>
<if test="map.mainId != null and map.mainId != ''">
and so.main_id = #{map.mainId}
</if>
order by so.create_time desc
</select>
<select id="selectCountNum" resultType="java.lang.Integer">

3
dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml
View File

@ -63,6 +63,9 @@
<if test="map.userRole != null">
and (
<choose>
<when test="map.userRole == 5 and map.isToBeReviewed">
dtw.status = '01'
</when>
<when test="map.userRole == 5 and map.isBack == null">
dtw.status not in ('01', '05', '03')
</when>

6
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
View File

@ -590,7 +590,7 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
//处理redis
DriverInfo driverInfo = driverInfoService.getById(rescueInfo.getDriverId());
AdminUserRespDTO user = userService.getUser(driverInfo.getUserId());
try{
// 收集客户信息
PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
customerInfo.setCustomerName(rescueInfo.getConnectionName());
@ -615,6 +615,10 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
// 调用插入客户信息的方法
customerInfoService.insertPartnerCustomerInfo(customerInfo);
}catch (Exception ignored){
}
//所在顶级机构