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

更新

Browse Source
This commit is contained in:
xuyuncong 2025-12-01 17:16:01 +08:00
parent 741444fb62
commit 3c98fad235
9 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairRecords.java
View File

@ -55,4 +55,7 @@ public class RepairRecords extends TenantBaseDO {
*/ */
private String otherData; private String otherData;
/** 输入备注 */
private String inputRemark;
} }

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java
View File

@ -36,7 +36,7 @@ public interface RepairRecordsService extends IService<RepairRecords> {
* @return void * @return void
**/ **/
void saveRepairRecord(String ticketId, String repairItemId, String type, String remark, String images, String otherData); void saveRepairRecord(String ticketId, String repairItemId, String type, String remark, String inputRemark, String images, String otherData);
/** /**
* 根据条件查询维修记录 * 根据条件查询维修记录

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

@ -85,7 +85,7 @@ public class RepairRecordsServiceImpl extends ServiceImpl<RepairRecordsMapper, R
**/ **/
@Override @Override
public void saveRepairRecord(String ticketId, String repairItemId, String type, String remark, String images, String otherData) { public void saveRepairRecord(String ticketId, String repairItemId, String type, String remark,String inputRemark, String images, String otherData) {
//获取当前登录用户 //获取当前登录用户
Long userId = SecurityFrameworkUtils.getLoginUserId(); Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO loginUser = userApi.getUser(userId); AdminUserRespDTO loginUser = userApi.getUser(userId);

5
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java
View File

@ -796,8 +796,9 @@ public class DlRepairTicketsController {
@GetMapping("/pickCar") @GetMapping("/pickCar")
public CommonResult<?> pickCar(@RequestParam("id") String id, public CommonResult<?> pickCar(@RequestParam("id") String id,
@RequestParam(value = "image", required = false) String image, @RequestParam(value = "image", required = false) String image,
@RequestParam(value = "remark", required = false) String remark) { @RequestParam(value = "remark", required = false) String remark,
dlRepairTicketsService.pickCar(id, image, remark); @RequestParam(value = "inputRemark", required = false) String inputRemark) {
dlRepairTicketsService.pickCar(id, image, remark,inputRemark);
return CommonResult.ok(); return CommonResult.ok();
} }

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

@ -288,7 +288,7 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
* @return void * @return void
**/ **/
void pickCar(String id, String image, String remark); void pickCar(String id, String image, String remark, String inputRemark);
/** /**
* @Author 许 * @Author 许

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

@ -402,7 +402,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
} }
repairOrderInfoService.saveOrderInfo(repairOrderInfo); repairOrderInfoService.saveOrderInfo(repairOrderInfo);
//最后记录操作日志--创建工单 //最后记录操作日志--创建工单
repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", ticketsRespVO.getImage()); repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", ticketsRespVO.getInputRemark(), ticketsRespVO.getImage(), null);
// 通知客户 // 通知客户
// 构建消息 // 构建消息
@ -520,7 +520,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
List<RepairProject> repairProjects = projectService.listByIds(ids); List<RepairProject> repairProjects = projectService.listByIds(ids);
BItems.forEach(item -> repairProjects.stream().filter(i -> i.getId().equals(item.getProjectId())).findFirst().ifPresent(item::setProject)); BItems.forEach(item -> repairProjects.stream().filter(i -> i.getId().equals(item.getProjectId())).findFirst().ifPresent(item::setProject));
} }
result.setBProjects(BProject);} result.setBProjects(BProject);
}
if (ifApp) { if (ifApp) {
//app新增逻辑 //app新增逻辑
if (CollectionUtil.isNotEmpty(projects)) { if (CollectionUtil.isNotEmpty(projects)) {
@ -927,7 +928,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
String json = JSON.toJSONString(vo); String json = JSON.toJSONString(vo);
//添加维修记录 //添加维修记录
repairRecordsService.saveRepairRecord(vo.getTicketId(), null, RecordTypeEnum.JSSQ.getCode(), "结算申请", null, json); repairRecordsService.saveRepairRecord(vo.getTicketId(), null, RecordTypeEnum.JSSQ.getCode(), "结算申请", null, null, json);
/*获取字典 判断是否自动审核通过该结算申请*/ /*获取字典 判断是否自动审核通过该结算申请*/
DictDataRespDTO repairSettlementReview = dictDataApi.getDictData(BASE_BUSINESS_CONFIG, "repair_settlement_review"); DictDataRespDTO repairSettlementReview = dictDataApi.getDictData(BASE_BUSINESS_CONFIG, "repair_settlement_review");
@ -939,7 +940,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
// 如果是自动审核直接修改支付状态 // 如果是自动审核直接修改支付状态
if (ifReview) { if (ifReview) {
//添加维修记录 //添加维修记录
repairRecordsService.saveRepairRecord(vo.getTicketId(), null, RecordTypeEnum.JSSP.getCode(), "自动结算审批", null, json); repairRecordsService.saveRepairRecord(vo.getTicketId(), null, RecordTypeEnum.JSSP.getCode(), "自动结算审批", null, null, json);
// 修改工单支付状态为待收款 // 修改工单支付状态为待收款
update(Wrappers.<DlRepairTickets>lambdaUpdate() update(Wrappers.<DlRepairTickets>lambdaUpdate()
@ -970,7 +971,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
String json = JSON.toJSONString(vo); String json = JSON.toJSONString(vo);
//添加维修记录 //添加维修记录
repairRecordsService.saveRepairRecord(vo.getTicketId(), null, RecordTypeEnum.JSSP.getCode(), "结算审批", null, json); repairRecordsService.saveRepairRecord(vo.getTicketId(), null, RecordTypeEnum.JSSP.getCode(), "结算审批", null, null, json);
// 修改工单支付状态为待收款 // 修改工单支付状态为待收款
update(Wrappers.<DlRepairTickets>lambdaUpdate() update(Wrappers.<DlRepairTickets>lambdaUpdate()
@ -1094,7 +1095,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
.set(StringUtils.isNotEmpty(repairTicketsRespVO.getPayConfirmRemark()), DlRepairTickets::getPayConfirmRemark, repairTicketsRespVO.getPayConfirmRemark())); .set(StringUtils.isNotEmpty(repairTicketsRespVO.getPayConfirmRemark()), DlRepairTickets::getPayConfirmRemark, repairTicketsRespVO.getPayConfirmRemark()));
//添加记录 //添加记录
repairRecordsService.saveRepairRecord(repairTicketsRespVO.getId(), null, RecordTypeEnum.QRSK.getCode(), RecordTypeEnum.QRSK.getName(), null, null); repairRecordsService.saveRepairRecord(repairTicketsRespVO.getId(), null, RecordTypeEnum.QRSK.getCode(), RecordTypeEnum.QRSK.getName(), null, null, null);
} }
/** /**
@ -1110,7 +1111,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
.eq(DlRepairTickets::getId, repairTicketsRespVO.getId()) .eq(DlRepairTickets::getId, repairTicketsRespVO.getId())
.set(DlRepairTickets::getPayStatus, "04")); .set(DlRepairTickets::getPayStatus, "04"));
// 添加工单记录 // 添加工单记录
repairRecordsService.saveRepairRecord(repairTicketsRespVO.getId(), null, RecordTypeEnum.FJS.getCode(), RecordTypeEnum.FJS.getName(), null, null); repairRecordsService.saveRepairRecord(repairTicketsRespVO.getId(), null, RecordTypeEnum.FJS.getCode(), RecordTypeEnum.FJS.getName(), null, null, null);
} }
/** /**
@ -3537,14 +3538,14 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
*/ */
@Override @Override
@DSTransactional @DSTransactional
public void pickCar(String id, String image, String remark) { public void pickCar(String id, String image, String remark, String inputRemark) {
/* 1.修改工单表接车状态为已接车*/ /* 1.修改工单表接车状态为已接车*/
baseMapper.update(Wrappers.<DlRepairTickets>lambdaUpdate() baseMapper.update(Wrappers.<DlRepairTickets>lambdaUpdate()
.eq(DlRepairTickets::getId, id) .eq(DlRepairTickets::getId, id)
.set(DlRepairTickets::getIsPickCar, 1)); .set(DlRepairTickets::getIsPickCar, 1));
/* 2.步骤表里添加接车*/ /* 2.步骤表里添加接车*/
repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.PICKCAR.getCode(), "接车", image); repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.PICKCAR.getCode(), "接车", inputRemark, image, null);
} }
/** /**

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

@ -117,4 +117,6 @@ public class DlRepairTicketsRespVO extends DlRepairTickets {
private String billedRemark; private String billedRemark;
private Integer hasChildTickets; private Integer hasChildTickets;
private List<DlRepairTicketsRespVO> bTickets; private List<DlRepairTicketsRespVO> bTickets;
/** 备注 */
private String inputRemark;
} }

1
dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml
View File

@ -18,6 +18,7 @@
<result column="deal_user_id" property="dealUserId"/> <result column="deal_user_id" property="dealUserId"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="input_remark" property="inputRemark"/>
<collection property="itemList" ofType="cn.iocoder.yudao.module.base.entity.RepairRecordsItem" columnPrefix="item_"> <collection property="itemList" ofType="cn.iocoder.yudao.module.base.entity.RepairRecordsItem" columnPrefix="item_">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="record_id" property="recordId"/> <result column="record_id" property="recordId"/>

2
dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
View File

@ -871,7 +871,7 @@
SELECT ${ew.sqlSelect} SELECT ${ew.sqlSelect}
FROM dl_repair_tickets drt FROM dl_repair_tickets drt
LEFT JOIN dl_repair_records drr ON drt.id = drr.ticket_id LEFT JOIN dl_repair_records drr ON drt.id = drr.ticket_id
where 1=1 where 1=1 and drt.deleted = '0'
<if test="ew != null and ew.customSqlSegment != null and ew.customSqlSegment != ''"> <if test="ew != null and ew.customSqlSegment != null and ew.customSqlSegment != ''">
AND ${ew.sqlSegment} AND ${ew.sqlSegment}
</if> </if>