diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java new file mode 100644 index 00000000..19dcb150 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java @@ -0,0 +1,30 @@ +package com.bonus.common.biz.enums; + +import lombok.Getter; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @time : 2024-11-14 10:17 + * @Description: 维修任务整体状态枚举 + */ +@Getter +public enum RepairTaskStatusEnum { + + TASK_STATUS_PROCESSING(0, "维修管理--进行中"), + TASK_STATUS_COMPLETE(1, "维修管理--已完成"), + TASK_STATUS_REJECT(2, "维修管理--被驳回"), + TASK_STATUS_TO_EXAM(3, "修饰审核--待审核"), + TASK_STATUS_REVIEW(4, "修饰审核--审核通过"), + TASK_STATUS_NO_REVIEW(5, "修饰审核--审核不通过"), + SCRAP_UNDER_REVIEW(6, "报废审核--待审核"); + + private final Integer status; + private final String statusName; + + RepairTaskStatusEnum(Integer status, String statusName) { + this.status = status; + this.statusName = statusName; + } + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index a2575280..dd8d914a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -1,9 +1,16 @@ package com.bonus.material.repair.controller; import java.util.List; +import java.util.Map; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.repair.domain.RepairPart; +import com.bonus.material.repair.domain.RepairRecord; +import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapAudit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -34,9 +41,108 @@ import com.bonus.common.core.web.page.TableDataInfo; @RestController @RequestMapping("/repair_audit_details") public class RepairAuditDetailsController extends BaseController { - @Autowired + + @Resource private IRepairAuditDetailsService repairAuditDetailsService; + + /** + * 查询修试审核任务列表 + */ + @ApiOperation("查询修试审核任务列表") + @GetMapping("/questList") + @RequiresPermissions("service:auditing:list") + public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { + startPage(); + Map params = repairAuditDetails.getParams(); + if (params != null && !params.isEmpty()) { + String beginTime = (String) params.get("beginTime"); + String endTime = (String) params.get("endTime"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); + repairAuditDetails.setParams(params); + } + List list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); + return getDataTable(list); + } + + /** + * 导出修试审核任务列表 + */ + @PostMapping("/export") + public void exportAudit(HttpServletResponse response, RepairAuditDetails bean) { + Map params = bean.getParams(); + if (!params.isEmpty()) { + String beginTime = (String) params.get("beginTime"); + String endTime = (String) params.get("endTime"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); + bean.setParams(params); + } + List list = repairAuditDetailsService.exportRepairQuestList(bean); + ExcelUtil util = new ExcelUtil(RepairAuditDetailsVO.class); + util.exportExcel(response, list, "修试审核任务列表"); + } + + /** + * 查看修饰审核任务详细列表 + */ + @ApiOperation("查看修饰审核任务详细列表") + @GetMapping("/getRepairAuditList") + @RequiresPermissions("service:auditing") + public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) { + startPage(); + List list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); + return getDataTable(list); + } + + /** + * 查看维修记录 + */ + @ApiOperation("查看维修记录") + @GetMapping("/getRepairRecord") + public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) { + startPage(); + List list = repairAuditDetailsService.getRepairRecord(repairAuditDetails); + return getDataTable(list); + } + + /** + * 查看配件记录 + */ + @ApiOperation("查看配件记录") + @GetMapping("/getPartRecord") + public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) { + startPage(); + List list = repairAuditDetailsService.getPartRecord(repairAuditDetails); + return getDataTable(list); + } + + + /** + * 修饰任务审核 + */ + @ApiOperation("修饰任务审核") + @PostMapping("/audit") + public AjaxResult audit(@RequestBody ScrapAudit scrapAudit) throws Exception { + return toAjax(repairAuditDetailsService.auditRepair(scrapAudit)); + } + + + + + + + + + + + + + + //--------------------------------------------------------------------------------- + + /** * 查询修试审核详细列表 */ @@ -56,7 +162,7 @@ public class RepairAuditDetailsController extends BaseController { @PreventRepeatSubmit @RequiresPermissions("repair:details:export") @SysLog(title = "修试审核详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出修试审核详细") - @PostMapping("/export") + @PostMapping("/exportEasyExcel") public void export(HttpServletResponse response, RepairAuditDetails repairAuditDetails) { List list = repairAuditDetailsService.selectRepairAuditDetailsList(repairAuditDetails); ExcelUtil util = new ExcelUtil(RepairAuditDetails.class); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index 80d6c657..e46bcfd1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -47,17 +47,17 @@ public class RepairAuditDetails extends BaseEntity { /** 维修总量 */ @Excel(name = "维修总量") @ApiModelProperty(value = "维修总量") - private Long repairNum; + private Integer repairNum; /** 维修合格数量 */ @Excel(name = "维修合格数量") @ApiModelProperty(value = "维修合格数量") - private Long repairedNum; + private Integer repairedNum; /** 维修报废数量 */ @Excel(name = "维修报废数量") @ApiModelProperty(value = "维修报废数量") - private Long scrapNum; + private Integer scrapNum; /** 审核人 */ @Excel(name = "审核人") @@ -83,7 +83,7 @@ public class RepairAuditDetails extends BaseEntity { /** 数据所属组织 */ @Excel(name = "数据所属组织") @ApiModelProperty(value = "数据所属组织") - private Long companyId; + private Integer companyId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java index 73f56a02..cc426d7c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java @@ -50,12 +50,12 @@ public class RepairInputDetails extends BaseEntity { /** 维修合格数量 */ @Excel(name = "维修合格数量") @ApiModelProperty(value = "维修合格数量") - private Long repairNum; + private Integer repairNum; /** 入库数量 */ @Excel(name = "入库数量") @ApiModelProperty(value = "入库数量") - private Long inputNum; + private Integer inputNum; /** 0未审核，1已入库，2驳回 */ @Excel(name = "0未审核，1已入库，2驳回") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java new file mode 100644 index 00000000..3a298b98 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java @@ -0,0 +1,102 @@ +package com.bonus.material.repair.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author syruan + */ +@Data +@ApiModel(value="维修配件") +public class RepairPart { + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private String taskId; + /** + * 机具ID + */ + @ApiModelProperty(value = "机具ID") + private String maId; + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private String typeId; + /** + * 配件ID + */ + @ApiModelProperty(value = "配件ID") + private Long partId; + /** + * 配件名称 + */ + @ApiModelProperty(value = "配件名称") + private String partName; + /** + * 返厂id + */ + @ApiModelProperty(value = "返厂id") + private String supplierId; + /** + * 配件数量 + */ + @ApiModelProperty(value = "配件数量") + private int partNum; + /** + * 配件费用 + */ + @ApiModelProperty(value = "配件费用") + private BigDecimal partCost; + /** + * 配件单价 + */ + @ApiModelProperty(value = "配件单价") + private BigDecimal partPrice; + /** + * 类型（0不收费，1收费） + */ + @ApiModelProperty(value = "类型（0不收费，1收费）") + private String partType; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private Long createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + /** + * 维修内容 + */ + @ApiModelProperty(value = "维修内容") + private String repairContent; + + private Long companyId; + + private Long repairer; + + @ApiModelProperty(value = "维修数量") + private int repairNum; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairRecord.java new file mode 100644 index 00000000..8ef1ae1e --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairRecord.java @@ -0,0 +1,191 @@ +package com.bonus.material.repair.domain; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author syruan + */ +@Data +@ApiModel(value="维修任务详细") +public class RepairRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private String taskId; + /** + * 机具ID + */ + @ApiModelProperty(value = "机具ID") + private String maId; + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private String typeId; + /** + * 维修数量 + */ + @ApiModelProperty(value = "维修数量") + private int repairNum; + /** + * 报废数量 + */ + @ApiModelProperty(value = "报废数量") + private int scrapNum; + /** + * 维修方式（1内部2返厂3报废） + */ + @ApiModelProperty(value = "维修方式（1内部2返厂3报废）") + private String repairType; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private Long createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + /** + * 报废原因 + */ + @ApiModelProperty(value = "报废原因") + private String scrapReason; + /** + * 报废类型（0：自然报废，1任务报废） + */ + @ApiModelProperty(value = "报废类型（0：自然报废，1任务报废）") + private String scrapType; + /** + * 返厂id + */ + @ApiModelProperty(value = "返厂id") + private String supplierId; + /** + * 返厂名称 + */ + @ApiModelProperty(value = "返厂名称") + private String supplier; + + /** + * 维修内容 + */ + @ApiModelProperty(value = "维修内容") + private String repairContent; + /** + * 类型（0不收费，1收费） + */ + @ApiModelProperty(value = "类型（0不收费，1收费）") + private String partType; + + /** + * 维修人 + */ + @ApiModelProperty(value = "维修人") + private String repairer; + private String partStrList; + private Long companyId; + /** + * 损坏照片id + */ + @ApiModelProperty(value = "损坏照片id") + private String fileIds; + + /** + * 维修单号 + */ + @Excel(name = "维修单号") + private String code; + + /** + * 机具类型 + */ + @Excel(name = "机具类型") + private String typeName; + + /** + * 规格型号 + */ + @Excel(name = "规格型号") + private String typeModelName; + + /** + * 配件名称 + */ + @ApiModelProperty(value = "配件名称") + @Excel(name = "配件名称") + private String partName; + + /** + * 配件数量 + */ + @ApiModelProperty(value = "配件数量") + @Excel(name = "配件数量",cellType = Excel.ColumnType.NUMERIC) + private int partNum; + + /** + * 配件单价 + */ + @ApiModelProperty(value = "配件单价") + @Excel(name = "配件单价") + private String partPrice; + + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + @Excel(name = "退料工程") + private String proName; + + /** + * 单位名称 + */ + @ApiModelProperty(value = "单位名称") + @Excel(name = "退料单位") + private String unitName; + + /** + * 关键字 + */ + @ApiModelProperty(value = "关键字") + private String keyWord; + + /** + * unitId + */ + @ApiModelProperty(value = "unitId") + private Integer unitId; + + /** + * proId + */ + @ApiModelProperty(value = "proId") + private Integer proId; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairAuditDetailsVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairAuditDetailsVO.java new file mode 100644 index 00000000..829a7d67 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairAuditDetailsVO.java @@ -0,0 +1,103 @@ +package com.bonus.material.repair.domain.vo; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author 阮世耀 + * @Create 2023/12/13 15:45 + * @Version 1.0 + */ +@Data +public class RepairAuditDetailsVO { + /** + * 任务id + */ + private Long taskId; + + /** + * 报废单号 + */ + @Excel(name = "修饰审核单号",sort = 1) + private String scrapNum; + + /** + * 单位名称 + */ + @Excel(name = "单位名称",sort = 2) + private String unitName; + + /** + * 工程名称 + */ + @Excel(name = "工程名称",sort = 3) + private String projectName; + + /** + * 任务创建人 + */ + @Excel(name = "任务创建人",sort = 4) + private String createBy; + + /** + * 机具类型 + */ + private String itemType; + /** + * 创建时间 + */ + @Excel(name = "任务创建时间",sort = 5) + private String createTime; + + /** + * 维修单号 + */ + @Excel(name = "维修单号",sort = 6) + private String repairNum; + + /** + * 审核状态 + */ + private Integer taskStatus; + + /** + * 审核状态 + */ + @Excel(name = "审核状态",sort = 7) + private String taskStatusName; + + /** + * 不通过原因 + */ + @Excel(name = "不通过原因",sort = 8) + private String remark; + + /** + * 机具类型 + */ + @Excel(name = "机具类型",sort = 9) + private String type; + + /** + * 规格型号 + */ + @Excel(name = "规格型号",sort = 10) + private String typeName; + + @ApiModelProperty(value = "机具编号") + @Excel(name = "机具编号",sort = 11) + private String maCode; + + /** 维修总量 */ + @Excel(name = "维修总量") + private Integer repairNum2; + + /** 维修数量 */ + @Excel(name = "维修数量") + private Integer repairedNum2; + + /** 报废数量 */ + @Excel(name = "报废数量") + private Integer scrapNum2; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java new file mode 100644 index 00000000..8d39a2b7 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java @@ -0,0 +1,130 @@ +package com.bonus.material.repair.domain.vo; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.material.scrap.domain.ScrapAuditorSet; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author 阮世耀 + * @Create 2023/12/13 15:45 + * @Version 1.0 + */ +@Data +public class ScrapApplyDetailsVO { + /** + * 任务id + */ + private Long taskId; + + /** + * 报废审核单号 + */ + @Excel(name = "报废审核单号",sort = 1) + private String scrapNum; + + /** + * 单位名称 + */ + @Excel(name = "单位名称",sort = 2) + private String unitName; + + /** + * 工程名称 + */ + @Excel(name = "工程名称",sort = 3) + private String projectName; + + /** + * 任务创建人 + */ + @Excel(name = "任务创建人",sort = 4) + private String createBy; + + /** + * 机具类型 + */ + private String itemType; + /** + * 创建时间 + */ + @Excel(name = "任务创建时间",sort = 5) + private String createTime; + + /** + * 维修单号 + */ + @Excel(name = "维修单号",sort = 6) + private String repairNum; + + /** + * 审核状态 + */ + private Integer taskStatus; + + /** + * 审核状态 + */ + @Excel(name = "审核状态",sort = 7) + private String taskStatusName; + + /** + * 不通过原因 + */ + @Excel(name = "不通过原因",sort = 8) + private String remark; + + /** + * 机具类型 + */ + @Excel(name = "机具类型",sort = 9) + private String type; + + /** + * 规格型号 + */ + @Excel(name = "规格型号",sort = 10) + private String typeName; + + @ApiModelProperty(value = "机具编号") + @Excel(name = "机具编号",sort = 11) + private String maCode; + + + /** 报废数量 */ + @Excel(name = "报废数量") + private Integer scrapNum2; + + + /** + * 报废来源 + */ + private Integer scrapSource; + + /** + *退料单号 + */ + private String repairCode; + + /** + * 审核部门列表 + */ + private List scrapAuditorSetList; + + /** + * 处置 + */ + private Integer disposition; + + /** + * 文件地址 + */ + private String dispositionFileUrl; + + /** + * 文件名称 + */ + private String dispositionFileName; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapAudit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapAudit.java new file mode 100644 index 00000000..c21c5b21 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapAudit.java @@ -0,0 +1,44 @@ +package com.bonus.material.repair.domain.vo; + +import com.bonus.material.repair.domain.RepairAuditDetails; +import com.bonus.material.scrap.domain.ScrapApplyDetails; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author : 阮世耀 + * @version : 1.0 + */ +@Data +public class ScrapAudit { + + @ApiModelProperty(value = "通过,不通过") + private String checkResult; + + @ApiModelProperty(value = "审核任务id") + private List taskIdList; + + @ApiModelProperty(value = "不通过原因") + private String remark; + + @ApiModelProperty(value = "审核任务明细") + private List auditDetailList; + + @ApiModelProperty(value = "报废任务明细") + private List scrapDetailList; + + @ApiModelProperty(value = "任务id") + private Long taskId; + + @ApiModelProperty(value = "审核部门列表id") + private List deptIds; + + @ApiModelProperty(value = "组织id") + private Integer companyId; + + @ApiModelProperty(value = "处置情况") + private Integer disposition; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index d489eb3a..19176faa 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -2,6 +2,11 @@ package com.bonus.material.repair.mapper; import java.util.List; import com.bonus.material.repair.domain.RepairAuditDetails; +import com.bonus.material.repair.domain.RepairPart; +import com.bonus.material.repair.domain.RepairRecord; +import com.bonus.material.repair.domain.RepairTaskDetails; +import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; /** * 修试审核详细Mapper接口 @@ -10,6 +15,18 @@ import com.bonus.material.repair.domain.RepairAuditDetails; * @date 2024-10-16 */ public interface RepairAuditDetailsMapper { + + RepairAuditDetails getRepairId(RepairAuditDetails repairAuditDetails); + + List getPartRecord(RepairAuditDetails bean); + + List getRepairRecord(RepairAuditDetails repairAuditDetails); + + /** + * 导出 + */ + List exportRepairQuestList(RepairAuditDetails bean); + /** * 查询修试审核详细 * @@ -57,4 +74,28 @@ public interface RepairAuditDetailsMapper { * @return 结果 */ public int deleteRepairAuditDetailsByIds(Long[] ids); + + List selectRepairQuestList(RepairAuditDetails repairAuditDetails); + + String selectTypeNameByTaskId(Long taskId); + + List selectRepairAuditDetailsByTaskId(Long taskId); + + List selectnotAuditByTaskId(Long taskId); + + List selectRepairInputByTaskId(Long taskId); + + List selectScrapNumByTaskId(Long taskId); + + void updateStatus(RepairAuditDetails bean); + + void updateRepairCost(RepairAuditDetails inputDetails, String status); + + void insertRepairDetails(RepairTaskDetails repairTaskDetails); + + Long getBackId(Long repairId); + + List getRepairApplyRecordId(Long repairId); + + void updateRecodeStatus(String id); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java index 152e5569..daf282d7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java @@ -2,6 +2,11 @@ package com.bonus.material.repair.service; import java.util.List; import com.bonus.material.repair.domain.RepairAuditDetails; +import com.bonus.material.repair.domain.RepairPart; +import com.bonus.material.repair.domain.RepairRecord; +import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapAudit; /** * 修试审核详细Service接口 @@ -18,6 +23,32 @@ public interface IRepairAuditDetailsService { */ public RepairAuditDetails selectRepairAuditDetailsById(Long id); + + /** + * 查询修试审核任务列表 + */ + List selectRepairQuestList(RepairAuditDetails repairAuditDetails); + + /** + * 导出修试审核任务列表 + */ + List exportRepairQuestList(RepairAuditDetails bean); + + /** + * 查看修饰审核任务详细列表 + */ + List getRepairAuditList(RepairAuditDetails repairAuditDetails); + + List getRepairRecord(RepairAuditDetails repairAuditDetails); + + List getPartRecord(RepairAuditDetails repairAuditDetails); + + /** + * 修饰任务审核 + */ + int auditRepair(ScrapAudit scrapAudit) throws Exception; + + /** * 查询修试审核详细列表 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 7b97a115..4492919a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -1,13 +1,34 @@ package com.bonus.material.repair.service.impl; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; + +import com.bonus.common.biz.enums.RepairTaskStatusEnum; +import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.repair.domain.*; +import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; +import com.bonus.material.repair.domain.vo.ScrapAudit; +import com.bonus.material.repair.mapper.RepairInputDetailsMapper; +import com.bonus.material.scrap.domain.ScrapApplyDetails; +import com.bonus.material.scrap.mapper.ScrapApplyDetailsMapper; +import com.bonus.material.task.domain.TmTaskAgreement; +import com.bonus.material.task.mapper.TmTaskAgreementMapper; +import com.bonus.material.task.mapper.TmTaskMapper; +import com.bonus.material.task.domain.TmTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; -import com.bonus.material.repair.domain.RepairAuditDetails; import com.bonus.material.repair.service.IRepairAuditDetailsService; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; /** * 修试审核详细Service业务层处理 @@ -17,9 +38,318 @@ import com.bonus.material.repair.service.IRepairAuditDetailsService; */ @Service public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService { - @Autowired + + @Resource private RepairAuditDetailsMapper repairAuditDetailsMapper; + @Resource + private TmTaskMapper taskMapper; + + @Resource + private TmTaskAgreementMapper agreementMapper; + + @Resource + private ScrapApplyDetailsMapper scrapApplyDetailsMapper; + +// @Resource +// private RepairTestInputMapper repairTestInputMapper; + + @Resource + private RepairInputDetailsMapper repairInputDetailsMapper; + + @Override + public List getPartRecord(RepairAuditDetails repairAuditDetails) { + RepairAuditDetails bean = repairAuditDetailsMapper.getRepairId(repairAuditDetails); + return repairAuditDetailsMapper.getPartRecord(bean); + } + + @Override + public List getRepairRecord(RepairAuditDetails repairAuditDetails) { + RepairAuditDetails bean = repairAuditDetailsMapper.getRepairId(repairAuditDetails); + List list = repairAuditDetailsMapper.getRepairRecord(bean); + return list; + } + + /** + * @param repairAuditDetails + * @return + */ + @Override + public List getRepairAuditList(RepairAuditDetails repairAuditDetails) { + List repairAuditDetailsList = repairAuditDetailsMapper.selectRepairAuditDetailsList(repairAuditDetails); + return repairAuditDetailsList; + } + + @Override + public List exportRepairQuestList(RepairAuditDetails bean) { + return repairAuditDetailsMapper.exportRepairQuestList(bean); + } + + /** + * 查询试验审核列表 + * + * @param repairAuditDetails + * @return + */ + @Override + public List selectRepairQuestList(RepairAuditDetails repairAuditDetails) { + List repairQuestList = repairAuditDetailsMapper.selectRepairQuestList(repairAuditDetails); + for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { + Long taskId = scrapApplyDetailsVO.getTaskId(); + String typeName = repairAuditDetailsMapper.selectTypeNameByTaskId(taskId); + scrapApplyDetailsVO.setItemType(typeName); + } + return repairQuestList; + } + + /** + * 修饰审核任务审核 + * + * @param scrapAudit 审核信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int auditRepair(ScrapAudit scrapAudit) throws Exception { + String checkResult = scrapAudit.getCheckResult(); + List auditDetailList = scrapAudit.getAuditDetailList(); + List taskIdList = scrapAudit.getTaskIdList(); + Integer b = 0; + for (Long taskId : taskIdList) { + String status = "0"; + TmTask task1 = taskMapper.selectTmTaskByTaskId(taskId); + if (task1.getTaskStatus() == 47) { + throw new Exception("任务已审核已通过"); + } + + List auditAllList = repairAuditDetailsMapper.selectRepairAuditDetailsByTaskId(taskId); + List notAuditList = repairAuditDetailsMapper.selectnotAuditByTaskId(taskId); + // 查询协议表 + TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId); + String taskCode = ""; + int taskStatus = 0; + int taskType = 0; + int companyId = 0; + if ("通过".equals(checkResult)) { + status = "1"; + List repairInputList = new ArrayList<>(); + List scrapNumList = new ArrayList<>(); + if (auditDetailList != null && auditDetailList.size() > 0) { + for (RepairAuditDetails bean : auditDetailList) { + if (bean.getRepairedNum().compareTo(b) > 0) { + repairInputList.add(bean); + } + if (bean.getScrapNum().compareTo(b) > 0) { + scrapNumList.add(bean); + } + } + } else { + repairInputList = repairAuditDetailsMapper.selectRepairInputByTaskId(taskId); + //获取维修报废列表 + scrapNumList = repairAuditDetailsMapper.selectScrapNumByTaskId(taskId); + } + + if (repairInputList != null && repairInputList.size() > 0) { + if (repairInputList.get(0).getCompanyId() != null) { + companyId = repairInputList.get(0).getCompanyId(); + } + + taskCode = purchaseCodeRule("R", 50); + taskStatus = 53; + taskType = 50; + long inputTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId); + for (RepairAuditDetails inputDetails : repairInputList) { + Long typeId = inputDetails.getTypeId(); + Long maId = inputDetails.getMaId(); + Integer repairNum = inputDetails.getRepairedNum(); + // 创建修饰后入库任务 + if (repairNum.compareTo(b) > 0) { + // 添加修试后入库任务 + RepairInputDetails repairInputDetails = new RepairInputDetails(); + repairInputDetails.setTaskId(inputTaskId); + repairInputDetails.setAuditId(inputDetails.getId()); + repairInputDetails.setRepairId(inputDetails.getRepairId()); + repairInputDetails.setRepairNum(inputDetails.getRepairedNum()); + repairInputDetails.setTypeId(inputDetails.getTypeId()); + repairInputDetails.setMaId(inputDetails.getMaId()); + repairInputDetails.setStatus("0"); + repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + repairInputDetails.setCreateTime(new Date()); + repairInputDetails.setCompanyId((long) companyId); + repairInputDetailsMapper.insertRepairInputDetails(repairInputDetails); + } + repairAuditDetailsMapper.updateRepairCost(inputDetails,status); + // 根据repairId找到taskId和 typeId 、maid + List repairApplyRecordId = repairAuditDetailsMapper.getRepairApplyRecordId(inputDetails.getRepairId()); + // 再去repair_apply_record 中查，并给一个标识表示审核完成 + for (String id : repairApplyRecordId) { + repairAuditDetailsMapper.updateRecodeStatus(id); + } + } + } + if (scrapNumList != null && scrapNumList.size() > 0) { + if (scrapNumList.get(0).getCompanyId() != null) { + companyId = scrapNumList.get(0).getCompanyId(); + } + taskCode = purchaseCodeRule("BF", TmTaskTypeEnum.TM_TASK_SCRAP.getTaskTypeId()); + /*taskStatus = 58; + taskType = 57;*/ + //创建报废任务 + long scrapTaskId = genTask(taskCode, TmTaskTypeEnum.TM_TASK_SCRAP.getTaskTypeId(), RepairTaskStatusEnum.SCRAP_UNDER_REVIEW.getStatus(), tmTaskAgreement, companyId); + for (RepairAuditDetails scrapDetails : scrapNumList) { + RepairAuditDetails byRepairId = scrapApplyDetailsMapper.getByRepairId(String.valueOf(scrapDetails.getRepairId())); + List repairRecord = scrapApplyDetailsMapper.getGyoupRepairRecord(byRepairId); + Long typeId = scrapDetails.getTypeId(); + Long maId = scrapDetails.getMaId(); + // 创建报废任务 + Integer scrapNum = scrapDetails.getScrapNum(); + if (scrapNum.compareTo(b) > 0) { + for (RepairRecord bean : repairRecord){ + ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); + scrapApplyDetails.setTaskId(scrapTaskId); + scrapApplyDetails.setTypeId(typeId); + scrapApplyDetails.setMaId(maId); + scrapApplyDetails.setScrapNum(bean.getScrapNum()); + scrapApplyDetails.setScrapType(bean.getScrapType()); + scrapApplyDetails.setScrapSource("2"); + scrapApplyDetails.setStatus("0"); + scrapApplyDetails.setParentId(scrapDetails.getId()); + scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + scrapApplyDetails.setCreateTime(new Date()); + scrapApplyDetails.setCompanyId((long) companyId); + scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); + } + } + } + + } + // 修饰审核通过时改修任务为已通过审核 + if (auditDetailList != null) { + if (auditDetailList.size() == notAuditList.size()) { + task1.setTaskStatus(47); + } + } else if (auditAllList != null) { + if (auditAllList.size() == notAuditList.size()) { + task1.setTaskStatus(47); + } + } + task1.setUpdateTime(new Date()); + task1.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + taskMapper.updateTmTask(task1); + } else { + status = "2"; + List repairDetailList = new ArrayList<>(); + if (auditDetailList != null && auditDetailList.size() > 0) { + repairDetailList.addAll(auditDetailList); + } else { + repairDetailList.addAll(auditAllList); + } + if (repairDetailList.size() > 0) { + if (repairDetailList.get(0).getCompanyId() != null) { + companyId = repairDetailList.get(0).getCompanyId(); + } + taskCode = purchaseCodeRule("WX", 41); + taskStatus = 43; + 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())); + Integer repairNum = inputDetails.getRepairNum(); + repairTaskDetails.setRepairNum(repairNum); + repairTaskDetails.setStatus("0"); + repairTaskDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + repairTaskDetails.setCompanyId((long) companyId); +// repairTaskDetails.setBackId(backId); + repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails); + + repairAuditDetailsMapper.updateRepairCost(inputDetails,status); + } + } + // 修饰审核任务不通过时 + TmTask tmTask = new TmTask(); + tmTask.setTaskId(taskId); + tmTask.setRemark(scrapAudit.getRemark()); + if (repairDetailList.size() == notAuditList.size()) { + tmTask.setTaskStatus(48); + } + tmTask.setUpdateTime(new Date()); + tmTask.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + taskMapper.updateTmTask(tmTask); + } + if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0) { + if (auditDetailList != null) { + for (RepairAuditDetails bean : auditDetailList) { + bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); + bean.setStatus(status); + bean.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + bean.setAuditRemark(scrapAudit.getRemark()); + repairAuditDetailsMapper.updateStatus(bean); + } + } + } else { + if (auditAllList != null) { + for (RepairAuditDetails bean : auditAllList) { + bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); + bean.setStatus(status); + bean.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + bean.setAuditRemark(scrapAudit.getRemark()); + repairAuditDetailsMapper.updateStatus(bean); + } + } + } + } + return 1; + } + + /**采购单号编码生成规则*/ + private String purchaseCodeRule(String code, Integer taskType) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + Date nowDate = DateUtils.getNowDate(); + String format = dateFormat.format(nowDate); + String taskNum = taskMapper.selectTaskNumByMonths(nowDate, taskType); + if (StringUtils.isNotEmpty(taskNum)){ + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); + }else { + taskNum = "0001"; + } + String codeNum = code + format + "-" + taskNum; + return codeNum; + } + + private long genTask(String taskCode, int taskType, int taskStatus, TmTaskAgreement tmTaskAgreement, int companyId) { + TmTask task = new TmTask(); + task.setCode(taskCode); + task.setTaskStatus(taskStatus); + task.setTaskType(taskType); + task.setCompanyId((long) companyId); + task.setCreateTime(new Date()); + task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + taskMapper.insertTmTask(task); + // 添加协议信息表 + TmTaskAgreement taskAgreement = new TmTaskAgreement(); + long taskId = task.getTaskId(); + taskAgreement.setTaskId(taskId); + if (tmTaskAgreement.getAgreementId() == null) { + throw new ServiceException("缺少协议数据"); + } else { + taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); + } + taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + agreementMapper.insertTmTaskAgreement(taskAgreement); + return taskId; + } + + /** * 查询修试审核详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java index f671d94b..d82a4afe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java @@ -47,7 +47,7 @@ public class ScrapApplyDetails extends BaseEntity { /** 报废数量 */ @Excel(name = "报废数量") @ApiModelProperty(value = "报废数量") - private Long scrapNum; + private Integer scrapNum; /** (1退料2,维修审核，3盘点) */ @Excel(name = "(1退料2,维修审核，3盘点)") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java index f49621dd..5eafe575 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/mapper/ScrapApplyDetailsMapper.java @@ -1,6 +1,9 @@ package com.bonus.material.scrap.mapper; import java.util.List; + +import com.bonus.material.repair.domain.RepairAuditDetails; +import com.bonus.material.repair.domain.RepairRecord; import com.bonus.material.scrap.domain.ScrapApplyDetails; /** @@ -57,4 +60,8 @@ public interface ScrapApplyDetailsMapper { * @return 结果 */ public int deleteScrapApplyDetailsByIds(Long[] ids); + + RepairAuditDetails getByRepairId(String s); + + List getGyoupRepairRecord(RepairAuditDetails byRepairId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAgreement.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAgreement.java index 2ea7a475..0217de72 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAgreement.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAgreement.java @@ -3,6 +3,7 @@ package com.bonus.material.task.domain; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; @@ -16,9 +17,11 @@ import java.util.Date; */ +@EqualsAndHashCode(callSuper = false) @Data @ToString public class TmTaskAgreement extends BaseEntity { + private static final long serialVersionUID = 1L; /** 任务ID */ @@ -38,4 +41,8 @@ public class TmTaskAgreement extends BaseEntity { this.taskId = taskId; this.agreementId = agreementId; } + + public TmTaskAgreement() { + + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index 3c8793ab..2eed8695 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.task.mapper; +import java.util.Date; import java.util.List; import com.bonus.material.task.domain.TmTask; import org.apache.ibatis.annotations.Param; @@ -85,6 +86,15 @@ public interface TmTaskMapper { int deleteTmTaskByPurchaseIds(Long[] ids); + /** + * 获取任务编号 + * + * @param nowDate + * @param taskType + * @return + */ + String selectTaskNumByMonths(Date nowDate, Integer taskType); + // List getAuditListByLeaseTmTask(@Param("record") TmTaskRequestVo tmTaskRequestVo); // // List getAuditListByLeaseTmTaskByPeople(@Param("record") TmTaskRequestVo tmTaskRequestVo); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 8e2794a4..56455b0d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -50,6 +50,135 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + + + + + + insert into repair_audit_details @@ -127,4 +256,200 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + + + + + + + + + + + + + update repair_audit_details + set audit_by = #{auditBy}, + audit_time = now(), + status = #{status}, + update_by = #{updateBy}, + update_time = now(), + audit_remark = #{auditRemark} + where id = #{id} + + + + update repair_cost + set part_type = #{status} + where repair_id = #{inputDetails.repairId} + + + + insert into repair_apply_details + ( + + task_id, + + + ma_id, + + + type_id, + + + repair_num, + + + status, + + + create_by, + + + update_by, + + update_time, + + company_id, + + + back_id, + + create_time + ) + values ( + + #{taskId}, + + + #{maId}, + + + #{typeId}, + + + #{repairNum}, + + + #{status}, + + + #{createBy}, + + + #{createBy}, + + NOW(), + + #{companyId}, + + + #{backId}, + + NOW() + ) + + + + + + + + update repair_apply_record set status = 1,update_time = now() where id = #{id} + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml index 0c3d5adf..46d4a94f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml @@ -27,7 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, task_id, parent_id, ma_id, type_id, scrap_num, scrap_source, scrap_type, status, audit_by, audit_time, audit_remark, create_by, create_time, update_by, update_time, remark, company_id, file_name, file_url from scrap_apply_details + select id, task_id, parent_id, ma_id, type_id, scrap_num, scrap_source, scrap_type, status, audit_by, audit_time, + audit_remark, create_by, create_time, update_by, update_time, remark, company_id, file_name, file_url + from scrap_apply_details + select task_id as taskId, + ma_id as maId, + type_id as typeId + from repair_apply_details + where id = #{repairId} + + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 95dcab9e..bea4a162 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -129,7 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + + +