src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
@@ -10,6 +10,8 @@ import com.ruoyi.production.dto.ProductInspectionRecordDto; import com.ruoyi.production.pojo.ProductInspectionRecord; import com.ruoyi.production.service.ProductInspectionRecordService; import com.ruoyi.project.system.domain.SysUser; import com.ruoyi.project.system.service.ISysUserService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +32,8 @@ public class ProductInspectionRecordController { @Autowired private ProductInspectionRecordService productInspectionRecordService; @Autowired private ISysUserService sysUserService; @ApiOperation("巡检记录 分页查询") @GetMapping("listPage") @@ -41,7 +45,21 @@ .between(Objects.nonNull(productInspectionRecord.getStartTime()) && Objects.nonNull(productInspectionRecord.getEndTime()), ProductInspectionRecord::getInspectionTime, productInspectionRecord.getStartTime(), productInspectionRecord.getEndTime()); return AjaxResult.success(productInspectionRecordService.page(page, ew)); // 查询分页数据 Page<ProductInspectionRecord> resultPage = productInspectionRecordService.page(page, ew); List<ProductInspectionRecord> records = resultPage.getRecords(); for (ProductInspectionRecord record : records) { if (record.getCreateUser() != null) { Long userId = record.getCreateUser().longValue(); SysUser user = sysUserService.selectUserById(userId); if (user != null) { record.setCreateUserName(user.getNickName()); } } } return AjaxResult.success(resultPage); } @ApiOperation("巡检记录 新增") src/main/java/com/ruoyi/production/pojo/ProductInspectionRecord.java
@@ -65,7 +65,8 @@ private String inspector; @ApiModelProperty("创建人") private String createUser; @TableField(fill = FieldFill.INSERT) private Integer createUser; @ApiModelProperty("创建时间") @TableField(fill = FieldFill.INSERT) @@ -74,11 +75,19 @@ private LocalDateTime createTime; @ApiModelProperty("修改人") private String updateUser; @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; @ApiModelProperty("修改时间") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @ApiModelProperty("备注") private String remark; @ApiModelProperty("创建人名称") @TableField(exist = false) private String createUserName; } src/main/java/com/ruoyi/production/service/impl/ProductInspectionRecordServiceImpl.java
@@ -91,6 +91,8 @@ String title = "巡检不合格通知"; String message = messageBuilder.toString(); SysUser admin = userMapper.selectUserById(1L); opUsers.add(admin); // 为每个op岗位用户创建通知 for (SysUser opUser : opUsers) { SysNotice notice = new SysNotice(); src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -109,4 +109,9 @@ public AjaxResult liftTheQuarantine(@RequestBody QualityUnqualified qualityUnqualified) { return AjaxResult.success(qualityUnqualifiedService.liftTheQuarantine(qualityUnqualified)); } @GetMapping("/withProductionOrder") public AjaxResult findUnqualifiedWithProductionOrder() { return AjaxResult.success(qualityUnqualifiedService.findUnqualifiedWithProductionOrder()); } } src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
@@ -25,4 +25,10 @@ //根据工序名称列表查询被隔离的不合格记录 List<QualityUnqualified> selectUnqualifiedByProcessNames(@Param("processNames") List<String> processNames); /** * 查询不合格记录的生产订单信息 * @return */ List<QualityUnqualified> selectUnqualifiedWithProductionOrder(); } src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -143,7 +143,6 @@ @ApiModelProperty("关联检测id") private Long inspectId; @ApiModelProperty("是否不合格处理自己新增") @TableField(exist = false) private Boolean method; @@ -151,4 +150,10 @@ @ApiModelProperty("工序") @TableField(exist = false) private String process; @TableField(exist = false) private Long productOrderId; @TableField(exist = false) private String productOrderNpsNo; } src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
@@ -7,6 +7,7 @@ import com.ruoyi.quality.pojo.QualityUnqualified; import javax.servlet.http.HttpServletResponse; import java.util.List; public interface IQualityUnqualifiedService extends IService<QualityUnqualified> { @@ -20,4 +21,6 @@ boolean liftTheQuarantine(QualityUnqualified qualityUnqualified); QualityUnqualified getUnqualified(Integer id); List<QualityUnqualified> findUnqualifiedWithProductionOrder(); } src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -35,6 +35,7 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Collections; import java.util.List; @AllArgsConstructor @@ -208,4 +209,9 @@ public QualityUnqualified getUnqualified(Integer id) { return qualityUnqualifiedMapper.getUnqualified(id); } @Override public List<QualityUnqualified> findUnqualifiedWithProductionOrder() { return qualityUnqualifiedMapper.selectUnqualifiedWithProductionOrder(); } } src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -110,4 +110,17 @@ AND qu.deal_result = '隔离' AND qu.quarantine_lifted = false </select> </mapper> <select id="selectUnqualifiedWithProductionOrder" resultType="com.ruoyi.quality.pojo.QualityUnqualified"> SELECT po.id as productOrderId, po.nps_no as productOrderNpsNo FROM quality_unqualified qu LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id LEFT JOIN product_order po ON pwo.product_order_id = po.id WHERE po.id IS NOT NULL GROUP BY po.id </select> </mapper>
