diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
index 9ebc86a6..1fe4c727 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
@@ -175,7 +175,6 @@ public class RepairServiceImpl implements RepairService {
for (RepairTaskDetails details : detailsList){
details.setCreateBy(loginUser.getUserid());
details.setTaskId(task.getTaskId());
- details.setCompanyId(task.getCompanyId());
mapper.addAuditDetails(details);
}
task.setAgreementId(agreementId);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
index 8d20b447..b4f7bf68 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
@@ -254,7 +254,8 @@
type_id as typeId,
repair_num as repairNum,
repaired_num as repairedNum,
- scrap_num as scrapNum
+ scrap_num as scrapNum,
+ company_id as companyId
from repair_apply_details
where task_id = #{taskId}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java
index 77eb3475..ea7fe481 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java
@@ -25,7 +25,7 @@ public class RepairTaskDetails {
* 机具ID
*/
@ApiModelProperty(value = "机具ID")
- private String maId;
+ private Long maId;
/**
* 类型名称
*/
@@ -77,12 +77,14 @@ public class RepairTaskDetails {
@ApiModelProperty(value = "维修人")
private String repairer;
private String keyword;
- private String typeId;
+ private Long typeId;
private Long companyId;
+ private String remark;
/**
* 任务创建人
*/
@ApiModelProperty(value = "任务创建人")
private Long createBy;
+ private Long backId;
}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
index 001b659a..cdd49f63 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
@@ -80,4 +80,6 @@ public interface RepairAuditDetailsMapper
int updateStatus(RepairAuditDetails bean);
int insertRepairDetails(RepairTaskDetails repairTaskDetails);
+
+ Long getBackId(Long repairId);
}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index 88374300..6ca80ddd 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -197,7 +197,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
}
if(repairInputList != null && repairInputList.size() > 0){
- companyId = repairInputList.get(0).getCompanyId();
+ if(repairInputList.get(0).getCompanyId() != null){
+ companyId = repairInputList.get(0).getCompanyId();
+ }
+
taskCode = purchaseCodeRule("R",50);
taskStatus = 53;
taskType = 50;
@@ -225,7 +228,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
}
}
if(scrapNumList != null && scrapNumList.size() > 0){
- companyId = scrapNumList.get(0).getCompanyId();
+ if(scrapNumList.get(0).getCompanyId() != null){
+ companyId = scrapNumList.get(0).getCompanyId();
+ }
taskCode = purchaseCodeRule("BF",57);
taskStatus = 58;
taskType = 57;
@@ -276,23 +281,27 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
repairDetailList.addAll(auditAllList);
}
if(repairDetailList != null && repairDetailList.size() > 0){
- companyId = repairDetailList.get(0).getCompanyId();
+ if (repairDetailList.get(0).getCompanyId() != null){
+ companyId = repairDetailList.get(0).getCompanyId();
+ }
taskCode = purchaseCodeRule("WX",41);
taskStatus = 42;
taskType = 41;
long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
for (RepairAuditDetails inputDetails : repairDetailList) {
+ Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId());
// 添加驳回后维修详细表数据
RepairTaskDetails repairTaskDetails = new RepairTaskDetails();
repairTaskDetails.setTaskId(String.valueOf(inputTaskId));
- repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId()));
- repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId()));
+ repairTaskDetails.setMaId(inputDetails.getMaId());
+ repairTaskDetails.setTypeId(inputDetails.getTypeId());
BigDecimal repairNum = inputDetails.getRepairNum();
int i = repairNum.intValue(); // 直接转换
repairTaskDetails.setRepairNum(i);
repairTaskDetails.setStatus("0");
repairTaskDetails.setCreateBy(SecurityUtils.getUserId());
repairTaskDetails.setCompanyId((long) companyId);
+ repairTaskDetails.setBackId(backId);
repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails);
}
}
@@ -309,7 +318,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
taskMapper.updateTmTask(tmTask);
}
if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
- for (RepairAuditDetails bean : auditDetailList){
+ if (auditDetailList != null) {
+ for (RepairAuditDetails bean : auditDetailList){
+ bean.setAuditBy(SecurityUtils.getUserId());
+ bean.setStatus(status);
+ repairAuditDetailsMapper.updateStatus(bean);
+ }
+ }
+ }else {
+ for (RepairAuditDetails bean : auditAllList){
bean.setAuditBy(SecurityUtils.getUserId());
bean.setStatus(status);
repairAuditDetailsMapper.updateStatus(bean);
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
index 58e9f2f7..3f94bc10 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
type_id,
-
+
repair_num,
@@ -144,13 +144,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
update_time,
-
- remark,
-
company_id,
-
+
back_id,
create_time
@@ -165,8 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{typeId},
-
- #{backNum},
+
+ #{repairNum},
#{status},
@@ -178,14 +175,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createBy},
NOW(),
-
- #{remark},
-
#{companyId},
-
- #{id},
+
+ #{backId},
NOW()
)
@@ -383,5 +377,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where task_id = #{taskId} and scrap_num > 0
+
\ No newline at end of file