bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

后台修试管理代码提交

This commit is contained in:
1539530615@qq.com 2024-01-10 14:40:18 +08:00
parent d7b78162ec
commit 11bdd0a771
7 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
View File

@ -47,7 +47,7 @@ public class RepairController extends BaseController {
* 导出维修任务列表 * 导出维修任务列表
*/ */
@RequiresPermissions("domain:details:export") @RequiresPermissions("domain:details:export")
@Log(title = "维修任务列表", businessType = BusinessType.EXPORT) @Log(title = "导出维修任务列表", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, RepairTask bean) public void export(HttpServletResponse response, RepairTask bean)
{ {

29
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -94,20 +94,19 @@ public class RepairServiceImpl implements RepairService {
} }
} }
if (partList != null && partList.size()>0){ if (partList != null && partList.size()>0){
for (RepairPartDetails partDetails : partList){ if (bean.getRepairType().equals("1")){
if (partDetails.getPartId() == null && bean.getRepairType().equals("1")){ for (RepairPartDetails partDetails : partList){
throw new ServiceException("请选择配件"); if(partDetails.getPartId() != null){
} if (partDetails.getPartCost() == null || partDetails.getPartCost().isEmpty()){
if (bean.getRepairType().equals("1")){ partDetails.setPartCost("0");
if (partDetails.getPartCost() == null || partDetails.getPartCost().isEmpty()){ }
partDetails.setPartCost("0"); partDetails.setTaskId(bean.getTaskId());
partDetails.setMaId(bean.getMaId());
partDetails.setTypeId(bean.getTypeId());
partDetails.setCreateBy(loginUser.getUserid());
partDetails.setCompanyId(bean.getCompanyId());
mapper.addPart(partDetails);
} }
partDetails.setTaskId(bean.getTaskId());
partDetails.setMaId(bean.getMaId());
partDetails.setTypeId(bean.getTypeId());
partDetails.setCreateBy(loginUser.getUserid());
partDetails.setCompanyId(bean.getCompanyId());
mapper.addPart(partDetails);
} }
} }
if (bean.getRepairType().equals("2")){ if (bean.getRepairType().equals("2")){
@ -189,7 +188,6 @@ public class RepairServiceImpl implements RepairService {
} }
@Override @Override
public int completeRepair(ArrayList<Long> ids) { public int completeRepair(ArrayList<Long> ids) {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
@ -201,7 +199,4 @@ public class RepairServiceImpl implements RepairService {
return mapper.selectUserList(); return mapper.selectUserList();
} }
} }

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java
View File

@ -56,7 +56,7 @@ public class RepairAuditDetailsController extends BaseController
* 导出修试审核任务列表 * 导出修试审核任务列表
*/ */
@RequiresPermissions("domain:details:export") @RequiresPermissions("domain:details:export")
@Log(title = "修试审核任务列表", businessType = BusinessType.EXPORT) @Log(title = "导出修试审核任务列表", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, RepairAuditDetails bean) public void export(HttpServletResponse response, RepairAuditDetails bean)
{ {

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
View File

@ -57,7 +57,7 @@ public class ScrapApplyDetailsController extends BaseController
* 导出报废任务列表 * 导出报废任务列表
*/ */
@RequiresPermissions("domain:details:export") @RequiresPermissions("domain:details:export")
@Log(title = "报废任务列表", businessType = BusinessType.EXPORT) @Log(title = "导出报废任务列表", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ScrapApplyDetails bean) public void export(HttpServletResponse response, ScrapApplyDetails bean)
{ {

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -238,7 +238,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
} }
} }
// 修饰审核通过时改修任务为已通过审核 // 修饰审核通过时改修任务为已通过审核
task1.setTaskStatus(47); task1.setTaskStatus(47);
@ -256,7 +255,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
taskMapper.updateTmTask(tmTask); taskMapper.updateTmTask(tmTask);
} }
} }
return 1; return 1;
} }

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java
View File

@ -34,9 +34,8 @@ public class RepairAuditDetailsVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务创建时间",sort = 5) @Excel(name = "任务创建时间",sort = 5)
private Date createTime; private String createTime;
// 维修单号 // 维修单号
@Excel(name = "维修单号",sort = 6) @Excel(name = "维修单号",sort = 6)

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java
View File

@ -1,12 +1,10 @@
package com.bonus.sgzb.material.vo; package com.bonus.sgzb.material.vo;
import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
@Data @Data
public class ScrapApplyDetailsVO { public class ScrapApplyDetailsVO {
@ -34,9 +32,8 @@ public class ScrapApplyDetailsVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任务创建时间",sort = 5) @Excel(name = "任务创建时间",sort = 5)
private Date createTime; private String createTime;
// 维修单号 // 维修单号
@Excel(name = "维修单号",sort = 6) @Excel(name = "维修单号",sort = 6)