src/main/java/com/ruoyi/CodeGenerator.java
@@ -23,7 +23,7 @@ public static String database_username = "root"; public static String database_password= "123456"; public static String author = "è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸"; public static String model = "collaborativeApproval"; // 模å public static String model = "quality"; // 模å public static String setParent = "com.ruoyi."+ model; // å è·¯å¾ public static String tablePrefix = ""; // è®¾ç½®è¿æ»¤è¡¨åç¼ public static void main(String[] args) { @@ -63,7 +63,7 @@ .packageConfig(builder -> { builder.entity("pojo"); builder.parent(setParent) // 设置ç¶å å .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/"+model+"/mapper")); // 设置mapperXmlçæè·¯å¾ .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/mapper/"+model)); // 设置mapperXmlçæè·¯å¾ }) // çç¥é ç½® .strategyConfig(builder -> { src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -39,6 +39,7 @@ @PostMapping("/add") @ApiOperation("æ°å¢") public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){ sealApplicationManagementService.save(sealApplicationManagement); //æ¶æ¯éç¥ sysNoticeService.simpleNoticeByUser("ç¨å°å®¡æ¹", "ç³è¯·ç¼å·ï¼"+sealApplicationManagement.getApplicationNum()+"\n" @@ -46,7 +47,7 @@ Arrays.asList(sealApplicationManagement.getApproveUserId()), sealApplicationManagement.getTenantId(), "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum()); return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement)); return AjaxResult.success(); } @PostMapping("/update") src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -23,9 +23,11 @@ import com.ruoyi.quality.mapper.QualityInspectMapper; import com.ruoyi.quality.mapper.QualityInspectParamMapper; import com.ruoyi.quality.mapper.QualityTestStandardMapper; import com.ruoyi.quality.mapper.QualityTestStandardParamMapper; import com.ruoyi.quality.pojo.QualityInspect; import com.ruoyi.quality.pojo.QualityInspectParam; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.quality.pojo.QualityTestStandardParam; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -63,6 +65,7 @@ private ProductMapper productMapper; private QualityTestStandardMapper qualityTestStandardMapper; private QualityTestStandardParamMapper qualityTestStandardParamMapper; private QualityInspectParamMapper qualityInspectParamMapper; @@ -168,16 +171,16 @@ qualityInspect.setProductMainId(productionProductMain.getId()); qualityInspectMapper.insert(qualityInspect); qualityTestStandardMapper.selectList( new LambdaQueryWrapper<QualityTestStandard>() .eq(QualityTestStandard::getProductId, product.getId()) ).forEach(standard -> { QualityInspectParam param = new QualityInspectParam(); BeanUtils.copyProperties(standard, param); param.setId(null); param.setInspectId(qualityInspect.getId()); qualityInspectParamMapper.insert(param); }); List<QualityTestStandardParam> qualityTestStandardParams = qualityTestStandardParamMapper.selectListByProductId(product.getId()); if (qualityTestStandardParams.size()>0) { qualityTestStandardParams.forEach(standard -> { QualityInspectParam param = new QualityInspectParam(); BeanUtils.copyProperties(standard, param); param.setId(null); param.setInspectId(qualityInspect.getId()); qualityInspectParamMapper.insert(param); }); } } // æ·»å æå ¥ if (productModel != null) { src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -39,9 +39,11 @@ import com.ruoyi.quality.mapper.QualityInspectMapper; import com.ruoyi.quality.mapper.QualityInspectParamMapper; import com.ruoyi.quality.mapper.QualityTestStandardMapper; import com.ruoyi.quality.mapper.QualityTestStandardParamMapper; import com.ruoyi.quality.pojo.QualityInspect; import com.ruoyi.quality.pojo.QualityInspectParam; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.ruoyi.sales.mapper.*; import com.ruoyi.sales.pojo.CommonFile; import com.ruoyi.sales.pojo.InvoiceRegistrationProduct; @@ -109,6 +111,7 @@ private final StringRedisTemplate redisTemplate; private final QualityInspectMapper qualityInspectMapper; private final QualityTestStandardMapper qualityTestStandardMapper; private final QualityTestStandardParamMapper qualityTestStandardParamMapper; private final QualityInspectParamMapper qualityInspectParamMapper; @Value("${file.upload-dir}") @@ -242,17 +245,16 @@ qualityInspect.setUnit(saleProduct.getUnit()); qualityInspect.setQuantity(saleProduct.getQuantity()); qualityInspectMapper.insert(qualityInspect); QualityTestStandard qualityTestStandard = new QualityTestStandard(); qualityTestStandard.setProductId(saleProduct.getProductId()); List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.qualityTestStandardList(qualityTestStandard); for (QualityTestStandard qualityTestStandardDB : qualityTestStandards) { QualityInspectParam qualityInspectParam = new QualityInspectParam(); qualityInspectParam.setInspectId(qualityInspect.getId()); qualityInspectParam.setParameterItem(qualityTestStandardDB.getParameterItem()); qualityInspectParam.setUnit(qualityTestStandardDB.getUnit()); qualityInspectParam.setStandardValue(qualityTestStandardDB.getStandardValue()); qualityInspectParam.setControlValue(qualityTestStandardDB.getControlValue()); qualityInspectParamMapper.insert(qualityInspectParam); List<QualityTestStandardParam> qualityTestStandardParams = qualityTestStandardParamMapper.selectListByProductId(saleProduct.getProductId()); if (qualityTestStandardParams.size()>0) { qualityTestStandardParams.forEach(standard -> { QualityInspectParam param = new QualityInspectParam(); com.ruoyi.common.utils.bean.BeanUtils.copyProperties(standard, param); param.setId(null); param.setInspectId(qualityInspect.getId()); qualityInspectParamMapper.insert(param); }); } } src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,62 @@ package com.ruoyi.quality.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.quality.pojo.QualityTestStandardBinding; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.ruoyi.quality.service.QualityTestStandardBindingService; import com.ruoyi.quality.service.QualityTestStandardParamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.List; /** * <p> * æ£æµæ å主表ä¸äº§åå ³è表 å端æ§å¶å¨ * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:40 */ @RestController @RequestMapping("/qualityTestStandardBinding") public class QualityTestStandardBindingController { @Autowired private QualityTestStandardBindingService qualityTestStandardBindingService; /** * æ°å¢æ£æµæ å主表ä¸äº§åå ³è表 * @param qualityTestStandardBindings * @return */ @PostMapping("/add") public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) { return AjaxResult.success(qualityTestStandardBindingService.saveBatch(qualityTestStandardBindings)); } /** * å 餿£æµæ å主表ä¸äº§åå ³è表 * @param ids * @return */ @DeleteMapping("/del") public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) { if(CollectionUtils.isEmpty(ids)){ return AjaxResult.error("è¯·éæ©è³å°ä¸æ¡æ°æ®"); } return AjaxResult.success(qualityTestStandardBindingService.removeBatchByIds(ids)); } /** *æ£æµææ ç»´æ¤æ¥è¯¢ * @return */ @GetMapping("/list") public AjaxResult listBinding(Long testStandardId) { return AjaxResult.success(qualityTestStandardBindingService.listBinding(testStandardId)); } } src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -3,11 +3,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.quality.dto.QualityTestStandardDto; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.quality.service.IQualityTestStandardService; import com.ruoyi.staff.pojo.StaffJoinLeaveRecord; import com.ruoyi.staff.pojo.StaffOnJob; import com.ruoyi.staff.service.IStaffOnJobService; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -16,10 +14,15 @@ import java.util.List; /** * æ£æµææ ç»´æ¤ * <p> * æ£æµæ å主表 å端æ§å¶å¨ * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:40:24 */ @RestController @RequestMapping("/quality/qualityTestStandard") @RequestMapping("/qualityTestStandard") public class QualityTestStandardController { @Resource @@ -27,7 +30,7 @@ /** * æ°å¢æ£æµææ ç»´æ¤ * æ°å¢æ£æµæ å主表 * @param qualityTestStandard * @return */ @@ -37,7 +40,7 @@ } /** * å 餿£æµææ ç»´æ¤ * å 餿£æµæ å主表 * @param ids * @return */ @@ -50,7 +53,7 @@ } /** * æ£æµææ ç»´æ¤è¯¦æ * æ£æµæ å主表详æ * @param id * @return */ @@ -60,7 +63,7 @@ } /** * æ£æµææ ç»´æ¤ä¿®æ¹ * æ£æµæ åä¸»è¡¨ä¿®æ¹ * @param qualityTestStandard * @return */ @@ -70,7 +73,7 @@ } /** *æ£æµææ ç»´æ¤å页æ¥è¯¢ *æ£æµæ å主表å页æ¥è¯¢ * @param page * @param qualityTestStandard * @return @@ -81,24 +84,13 @@ } /** * æ£æµææ ç»´æ¤å¯¼åº * @param response * @param qualityTestStandard */ @PostMapping("/export") public void qualityTestStandardListPageExport(HttpServletResponse response,QualityTestStandard qualityTestStandard) { qualityTestStandardService.qualityTestStandardListPageExport(response, qualityTestStandard); } /** * 详æ * @param productId * æ£æµæ åå¤å¶åæ° * @param qualityTestStandardDto * @return */ @GetMapping("/product/{productId}") public AjaxResult QualityInspectDetail(@PathVariable("productId") Long productId) { return AjaxResult.success(qualityTestStandardService.list(Wrappers.<QualityTestStandard>lambdaQuery().eq(QualityTestStandard::getProductId,productId))); @PostMapping("/copyParam") public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) { return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto)); } } src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,72 @@ package com.ruoyi.quality.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.ruoyi.quality.service.QualityTestStandardParamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.List; /** * <p> * æ£æµæ ååæ° å端æ§å¶å¨ * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:49 */ @RestController @RequestMapping("/qualityTestStandardParam") public class QualityTestStandardParamController { @Autowired private QualityTestStandardParamService qualityTestStandardParamService; /** * æ°å¢æ£æµæ ååæ° * @param qualityTestStandardParam * @return */ @PostMapping("/add") public AjaxResult add(@RequestBody QualityTestStandardParam qualityTestStandardParam) { return AjaxResult.success(qualityTestStandardParamService.save(qualityTestStandardParam)); } /** * å 餿£æµææ ç»´æ¤ * @param ids * @return */ @DeleteMapping("/del") public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) { if(CollectionUtils.isEmpty(ids)){ return AjaxResult.error("è¯·éæ©è³å°ä¸æ¡æ°æ®"); } return AjaxResult.success(qualityTestStandardParamService.removeBatchByIds(ids)); } /** * æ£æµææ ç»´æ¤ä¿®æ¹ * @param qualityTestStandardParam * @return */ @PostMapping("/update") public AjaxResult update(@RequestBody QualityTestStandardParam qualityTestStandardParam) { return AjaxResult.success(qualityTestStandardParamService.updateById(qualityTestStandardParam)); } /** *æ£æµææ ç»´æ¤æ¥è¯¢ * @return */ @GetMapping("/list") public AjaxResult list(Long testStandardId) { return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId))); } } src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -2,9 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.quality.pojo.QualityUnqualified; import com.ruoyi.quality.service.IQualityTestStandardService; import com.ruoyi.quality.service.IQualityUnqualifiedService; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; src/main/java/com/ruoyi/quality/dto/QualityTestStandardBindingDto.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,11 @@ package com.ruoyi.quality.dto; import lombok.Data; @Data //å页忾å±ç¤ºå段 public class QualityTestStandardBindingDto { private String productName; } src/main/java/com/ruoyi/quality/dto/QualityTestStandardDto.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,11 @@ package com.ruoyi.quality.dto; import lombok.Data; //å¤å¶æ£æµæ åçä¼ å @Data public class QualityTestStandardDto { private Long oldTestStandardId; private Long newTestStandardId; } src/main/java/com/ruoyi/quality/mapper/QualityTestStandardBindingMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ package com.ruoyi.quality.mapper; import com.ruoyi.quality.dto.QualityTestStandardBindingDto; import com.ruoyi.quality.pojo.QualityTestStandardBinding; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> * æ£æµæ å主表ä¸äº§åå ³è表 Mapper æ¥å£ * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:40 */ @Mapper public interface QualityTestStandardBindingMapper extends BaseMapper<QualityTestStandardBinding> { List<QualityTestStandardBindingDto> listBinding(@Param("testStandardId") Long testStandardId); } src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java
@@ -1,21 +1,22 @@ package com.ruoyi.quality.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.staff.pojo.StaffOnJob; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> * æ£æµæ å主表 Mapper æ¥å£ * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:40:24 */ @Mapper public interface QualityTestStandardMapper extends BaseMapper<QualityTestStandard> { IPage<QualityTestStandard> qualityTestStandardListPage(@Param("page") Page page, @Param("qualityTestStandard") QualityTestStandard qualityTestStandard); List<QualityTestStandard> qualityTestStandardList(@Param("qualityTestStandard") QualityTestStandard qualityTestStandard); IPage<QualityTestStandard> qualityTestStandardListPage(Page page, @Param("c") QualityTestStandard qualityTestStandard); } src/main/java/com/ruoyi/quality/mapper/QualityTestStandardParamMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ package com.ruoyi.quality.mapper; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; /** * <p> * æ£æµæ ååæ° Mapper æ¥å£ * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:49 */ @Mapper public interface QualityTestStandardParamMapper extends BaseMapper<QualityTestStandardParam> { List<QualityTestStandardParam> selectListByProductId(@Param("productId") Long productId); } src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -1,84 +1,73 @@ package com.ruoyi.quality.pojo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; /** * è´¨é管ç--æ£æµææ ç»´æ¤ * quality_test_standard * <p> * æ£æµæ å主表 * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:40:24 */ @TableName(value = "quality_test_standard") @Data @Getter @Setter @TableName("quality_test_standard") @ApiModel(value = "QualityTestStandard对象", description = "æ£æµæ å主表") public class QualityTestStandard implements Serializable { private static final long serialVersionUID = 1L; /** * åºå· */ @TableId(type = IdType.AUTO) private Long id; @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty("æ åç¼å·") private String standardNo; /** * ææ */ @Excel(name = "ææ ") private String parameterItem; @ApiModelProperty("æ ååç§°") private String standardName; /** * åä½ */ @Excel(name = "åä½") private String unit; @ApiModelProperty("夿³¨") private String remark; /** * æ åå¼ */ @Excel(name = "æ åå¼") private String standardValue; /** * å æ§å¼ */ @Excel(name = "å æ§å¼") private String controlValue; /** * å ³è产åid */ @NotBlank(message = "产åidä¸è½ä¸ºç©º!") @Excel(name = "å ³è产åid") private Long productId; @ApiModelProperty(value = "å建æ¶é´") @ApiModelProperty("å建æ¶é´") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; @ApiModelProperty(value = "åå»ºç¨æ·") @ApiModelProperty("åå»ºç¨æ·") @TableField(fill = FieldFill.INSERT) private Integer createUser; private Long createUser; @ApiModelProperty(value = "ä¿®æ¹æ¶é´") @ApiModelProperty("ä¿®æ¹æ¶é´") @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @ApiModelProperty(value = "ä¿®æ¹ç¨æ·") @ApiModelProperty("ä¿®æ¹ç¨æ·") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; private Long updateUser; @ApiModelProperty(value = "ç§æ·ID") @ApiModelProperty("ç§æ·ID") @TableField(fill = FieldFill.INSERT) private Long tenantId; @ApiModelProperty("ç¶æ") @TableLogic private String state; @ApiModelProperty("ç±»å«(0:åæææ£éª;1:è¿ç¨æ£éª;2:åºåæ£éª)") private Integer inspectType; @ApiModelProperty("å·¥åºid") private Integer processId; } src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,59 @@ package com.ruoyi.quality.pojo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; /** * <p> * æ£æµæ å主表ä¸äº§åå ³è表 * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:40 */ @Getter @Setter @TableName("quality_test_standard_binding") @ApiModel(value = "QualityTestStandardBinding对象", description = "æ£æµæ å主表ä¸äº§åå ³è表") public class QualityTestStandardBinding implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty("产åID") private Long productId; @ApiModelProperty("å ³èæ£æµæ å主表id") private Integer testStandardId; @ApiModelProperty("å建æ¶é´") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; @ApiModelProperty("åå»ºç¨æ·") @TableField(fill = FieldFill.INSERT) private Long createUser; @ApiModelProperty("ä¿®æ¹æ¶é´") @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @ApiModelProperty("ä¿®æ¹ç¨æ·") @TableField(fill = FieldFill.INSERT_UPDATE) private Long updateUser; @ApiModelProperty("ç§æ·ID") @TableField(fill = FieldFill.INSERT) private Long tenantId; } src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,71 @@ package com.ruoyi.quality.pojo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; /** * <p> * æ£æµæ ååæ° * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:49 */ @Getter @Setter @TableName("quality_test_standard_param") @ApiModel(value = "QualityTestStandardParam对象", description = "æ£æµæ ååæ°") public class QualityTestStandardParam implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty("忰项") private String parameterItem; @ApiModelProperty("åä½") private String unit; @ApiModelProperty("æ åå¼") private String standardValue; @ApiModelProperty("å æ§å¼") private String controlValue; @ApiModelProperty("å建æ¶é´") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; @ApiModelProperty("åå»ºç¨æ·") @TableField(fill = FieldFill.INSERT) private Long createUser; @ApiModelProperty("ä¿®æ¹æ¶é´") @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @ApiModelProperty("ä¿®æ¹ç¨æ·") @TableField(fill = FieldFill.INSERT_UPDATE) private Long updateUser; @ApiModelProperty("ç§æ·ID") @TableField(fill = FieldFill.INSERT) private Long tenantId; @ApiModelProperty("å ³èæ£æµæ å主表id") private Long testStandardId; @ApiModelProperty("é»è®¤å¼") private String defaultValue; } src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
@@ -3,15 +3,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.quality.pojo.QualityInspect; import com.ruoyi.quality.dto.QualityTestStandardDto; import com.ruoyi.quality.pojo.QualityTestStandard; import javax.servlet.http.HttpServletResponse; /** * <p> * æ£æµæ å主表 æå¡ç±» * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:40:24 */ public interface IQualityTestStandardService extends IService<QualityTestStandard> { IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard); void qualityTestStandardListPageExport(HttpServletResponse response, QualityTestStandard qualityTestStandard); int copyParam(QualityTestStandardDto qualityTestStandardDto); } src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ package com.ruoyi.quality.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.quality.dto.QualityTestStandardBindingDto; import com.ruoyi.quality.pojo.QualityTestStandardBinding; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** * <p> * æ£æµæ å主表ä¸äº§åå ³è表 æå¡ç±» * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:40 */ public interface QualityTestStandardBindingService extends IService<QualityTestStandardBinding> { List<QualityTestStandardBindingDto> listBinding(Long testStandardId); } src/main/java/com/ruoyi/quality/service/QualityTestStandardParamService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.ruoyi.quality.service; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * æ£æµæ ååæ° æå¡ç±» * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:49 */ public interface QualityTestStandardParamService extends IService<QualityTestStandardParam> { } src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,31 @@ package com.ruoyi.quality.service.impl; import com.ruoyi.quality.dto.QualityTestStandardBindingDto; import com.ruoyi.quality.pojo.QualityTestStandardBinding; import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper; import com.ruoyi.quality.service.QualityTestStandardBindingService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * <p> * æ£æµæ å主表ä¸äº§åå ³è表 æå¡å®ç°ç±» * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:40 */ @Service public class QualityTestStandardBindingServiceImpl extends ServiceImpl<QualityTestStandardBindingMapper, QualityTestStandardBinding> implements QualityTestStandardBindingService { @Autowired private QualityTestStandardBindingMapper qualityTestStandardBindingMapper; @Override public List<QualityTestStandardBindingDto> listBinding(Long testStandardId) { return qualityTestStandardBindingMapper.listBinding(testStandardId); } } src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardParamServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.ruoyi.quality.service.impl; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.ruoyi.quality.mapper.QualityTestStandardParamMapper; import com.ruoyi.quality.service.QualityTestStandardParamService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * æ£æµæ ååæ° æå¡å®ç°ç±» * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:39:49 */ @Service public class QualityTestStandardParamServiceImpl extends ServiceImpl<QualityTestStandardParamMapper, QualityTestStandardParam> implements QualityTestStandardParamService { } src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -1,30 +1,42 @@ package com.ruoyi.quality.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.quality.mapper.QualityInspectMapper; import com.ruoyi.quality.mapper.QualityTestStandardMapper; import com.ruoyi.quality.pojo.QualityInspect; import com.ruoyi.quality.dto.QualityTestStandardDto; import com.ruoyi.quality.mapper.QualityTestStandardParamMapper; import com.ruoyi.quality.pojo.QualityTestStandard; import com.ruoyi.quality.service.IQualityInspectService; import com.ruoyi.quality.mapper.QualityTestStandardMapper; import com.ruoyi.quality.pojo.QualityTestStandardParam; import com.ruoyi.quality.service.IQualityTestStandardService; import com.ruoyi.staff.pojo.StaffJoinLeaveRecord; import lombok.AllArgsConstructor; import org.springframework.security.core.parameters.P; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.quality.service.QualityTestStandardParamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.stream.Collectors; @AllArgsConstructor /** * <p> * æ£æµæ å主表 æå¡å®ç°ç±» * </p> * * @author è¯å¯¼è½¯ä»¶ï¼æ±èï¼æéå ¬å¸ * @since 2026-01-13 03:40:24 */ @Service public class QualityTestStandardServiceImpl extends ServiceImpl<QualityTestStandardMapper, QualityTestStandard> implements IQualityTestStandardService { public class QualityTestStandardServiceImpl extends ServiceImpl<QualityTestStandardMapper, QualityTestStandard> implements IQualityTestStandardService { @Autowired private QualityTestStandardMapper qualityTestStandardMapper; @Autowired private QualityTestStandardParamMapper qualityTestStandardParamMapper; @Autowired private QualityTestStandardParamService qualityTestStandardParamService; @Override public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) { @@ -32,9 +44,16 @@ } @Override public void qualityTestStandardListPageExport(HttpServletResponse response, QualityTestStandard qualityTestStandard) { List<QualityTestStandard> qualityTestStandards =qualityTestStandardMapper.qualityTestStandardList(qualityTestStandard); ExcelUtil<QualityTestStandard> util = new ExcelUtil<QualityTestStandard>(QualityTestStandard.class); util.exportExcel(response, qualityTestStandards, "æ£æµææ 导åº"); public int copyParam(QualityTestStandardDto qualityTestStandardDto) { //å æ¥è¯¢è¢«å¤å¶çæ£æµæ åç详æ åæ° List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandardDto.getOldTestStandardId())); List<QualityTestStandardParam> newQualityTestStandardParams = oldQualityTestStandardParams.stream().map(oldQualityTestStandardParam -> { oldQualityTestStandardParam.setTestStandardId(qualityTestStandardDto.getNewTestStandardId()); return oldQualityTestStandardParam; }).collect(Collectors.toList()); qualityTestStandardParamService.saveBatch(newQualityTestStandardParams); return 0; } } src/main/resources/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.xml
ÎļþÒÑɾ³ý src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementFileMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementFileMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile"> <id column="id" property="id"/> <result column="name" property="name"/> <result column="url" property="url"/> <result column="file_size" property="fileSize"/> <result column="rules_regulations_management_id" property="rulesRegulationsManagementId"/> <result column="create_time" property="createTime"/> <result column="create_user" property="createUser"/> <result column="update_time" property="updateTime"/> <result column="update_user" property="updateUser"/> <result column="tenant_id" property="tenantId"/> </resultMap> <select id="listPage" resultType="com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile"> select * from rules_regulations_management_file where 1=1 <if test="c.rulesRegulationsManagementId !=null"> and rules_regulations_management_id = #{c.rulesRegulationsManagementId} </if> </select> </mapper> src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.quality.mapper.QualityTestStandardBindingMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="BaseResultMap" type="com.ruoyi.quality.pojo.QualityTestStandardBinding"> <id column="id" property="id"/> <result column="product_id" property="productId"/> <result column="test_standard_id" property="testStandardId"/> <result column="create_time" property="createTime"/> <result column="create_user" property="createUser"/> <result column="update_time" property="updateTime"/> <result column="update_user" property="updateUser"/> <result column="tenant_id" property="tenantId"/> </resultMap> <select id="listBinding" resultType="com.ruoyi.quality.dto.QualityTestStandardBindingDto"> select * from quality_test_standard_binding t1 left join product t2 on t1.product_id = t2.id where t1.test_standard_id = #{testStandardId} </select> </mapper> src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -7,18 +7,17 @@ FROM quality_test_standard where 1=1 <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' "> AND product_id = #{qualityTestStandard.productId} <if test="qualityTestStandard.standardNo != null and qualityTestStandard.standardNo != '' "> AND standard_no like concat('%',#{qualityTestStandard.standardNo},'%') </if> </select> <select id="qualityTestStandardList" resultType="com.ruoyi.quality.pojo.QualityTestStandard"> SELECT * FROM quality_test_standard where 1=1 <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' "> AND product_id = #{qualityTestStandard.productId} <if test="qualityTestStandard.standardName != null and qualityTestStandard.standardName != '' "> AND standard_name like concat('%',#{qualityTestStandard.standardName},'%') </if> <if test="qualityTestStandard.state != null and qualityTestStandard.state != '' "> AND state = #{qualityTestStandard.state} </if> <if test="qualityTestStandard.inspectType != null and qualityTestStandard.inspectType != '' "> AND inspect_type = #{qualityTestStandard.inspectType} </if> </select> </mapper> src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.quality.mapper.QualityTestStandardParamMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="BaseResultMap" type="com.ruoyi.quality.pojo.QualityTestStandardParam"> <id column="id" property="id" /> <result column="parameter_item" property="parameterItem" /> <result column="unit" property="unit" /> <result column="standard_value" property="standardValue" /> <result column="control_value" property="controlValue" /> <result column="create_time" property="createTime" /> <result column="create_user" property="createUser" /> <result column="update_time" property="updateTime" /> <result column="update_user" property="updateUser" /> <result column="tenant_id" property="tenantId" /> <result column="test_standard_id" property="testStandardId" /> <result column="default_value" property="defaultValue" /> </resultMap> <select id="selectListByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandardParam"> select t1.* from quality_test_standard_param t1 left join quality_test_standard t2 on t1.test_standard_id = t2.id left join quality_test_standard_binding t3 on t2.id = t3.test_standard_id where product_id = #{productId} </select> </mapper>