bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修单分拆

This commit is contained in:
sxu 2024-11-28 18:27:33 +08:00
parent ee9155b386
commit 29ce4f6aeb
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyDetails.java
View File

@ -72,5 +72,7 @@ public class RepairApplyDetails extends BaseEntity {
@ApiModelProperty(value = "维修人") @ApiModelProperty(value = "维修人")
private String repairer; private String repairer;
@ApiModelProperty(value = "发送到下一个阶段")
private String sentToNextPhase;
} }

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java
View File

@ -48,7 +48,7 @@ public interface RepairApplyDetailsMapper {
* 根据任务Id获取维修详细 * 根据任务Id获取维修详细
* @param taskId 任务信息ID * @param taskId 任务信息ID
*/ */
List<RepairTaskDetails> getDetailsListByTaskIdAndStatus(@Param("taskId") Long taskId, @Param("status") String status); List<RepairTaskDetails> getRepairDetailsWhichNotSent(@Param("taskId") Long taskId);
/** /**
* 删除维修详细 * 删除维修详细

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.bonus.material.repair.service.impl; package com.bonus.material.repair.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.bonus.common.biz.domain.R;
import com.bonus.common.biz.enums.MaTypeManageTypeEnum; import com.bonus.common.biz.enums.MaTypeManageTypeEnum;
import com.bonus.common.biz.enums.RepairTaskStatusEnum; import com.bonus.common.biz.enums.RepairTaskStatusEnum;
import com.bonus.common.biz.enums.RepairTypeEnum; import com.bonus.common.biz.enums.RepairTypeEnum;
@ -852,7 +853,7 @@ public class RepairServiceImpl implements RepairService {
for (RepairTask task : taskList) { for (RepairTask task : taskList) {
// 查询维修任务的详情表 // 查询维修任务的详情表
Long wxTaskId = task.getTaskId(); Long wxTaskId = task.getTaskId();
List<RepairTaskDetails> detailsList = repairApplyDetailsMapper.getDetailsListByTaskIdAndStatus(wxTaskId, "1"); List<RepairTaskDetails> detailsList = repairApplyDetailsMapper.getRepairDetailsWhichNotSent(wxTaskId);
if (!CollectionUtils.isEmpty(detailsList)) { if (!CollectionUtils.isEmpty(detailsList)) {
task.setCreateBy(loginUser.getUserid()); task.setCreateBy(loginUser.getUserid());
Long agreementId = repairMapper.getAgreementId(task); Long agreementId = repairMapper.getAgreementId(task);
@ -865,6 +866,10 @@ public class RepairServiceImpl implements RepairService {
repairMapper.createAgreementTask(task); repairMapper.createAgreementTask(task);
// 新增审计记录 // 新增审计记录
for (RepairTaskDetails details : detailsList) { for (RepairTaskDetails details : detailsList) {
RepairApplyDetails repairApplyDetails = new RepairApplyDetails();
repairApplyDetails.setId(details.getId());
repairApplyDetails.setSentToNextPhase("1");
repairApplyDetailsMapper.updateRepairApplyDetails(repairApplyDetails);
details.setCreateBy(String.valueOf(loginUser.getUserid())); details.setCreateBy(String.valueOf(loginUser.getUserid()));
details.setTaskId(task.getTaskId()); details.setTaskId(task.getTaskId());
repairMapper.addAuditDetails(details); repairMapper.addAuditDetails(details);

5
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml
View File

@ -103,11 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null">company_id = #{companyId},</if> <if test="companyId != null">company_id = #{companyId},</if>
<if test="backId != null">back_id = #{backId},</if> <if test="backId != null">back_id = #{backId},</if>
<if test="repairer != null">repairer = #{repairer},</if> <if test="repairer != null">repairer = #{repairer},</if>
<if test="sentToNextPhase != null">sent_to_next_phase = #{sentToNextPhase},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<select id="getDetailsListByTaskIdAndStatus" resultType="com.bonus.material.repair.domain.RepairTaskDetails"> <select id="getRepairDetailsWhichNotSent" resultType="com.bonus.material.repair.domain.RepairTaskDetails">
select id, select id,
ma_id as maId, ma_id as maId,
type_id as typeId, type_id as typeId,
@ -116,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
scrap_num as scrapNum, scrap_num as scrapNum,
company_id as companyId company_id as companyId
from repair_apply_details from repair_apply_details
where task_id = #{taskId} and status = #{status} and sent_to_next_phase = '0' where task_id = #{taskId} and status = '1' and sent_to_next_phase = '0'
</select> </select>
<delete id="deleteRepairApplyDetailsById" parameterType="Long"> <delete id="deleteRepairApplyDetailsById" parameterType="Long">