ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
@@ -1,9 +1,31 @@ package com.ruoyi.web.controller.api; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.TTestMethodConfirmSheetOriginalDTO; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService; import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService; import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; /** * <p> @@ -15,10 +37,69 @@ */ @Api(tags = "原始检测项管理") @RestController @RequestMapping("/t-test-method-confirm-sheet-term") @RequestMapping("/t-test-method-confirm-sheet-original") public class TTestMethodConfirmSheetOriginalController { private final TokenService tokenService; private final ISysUserService sysUserService; private final SysUserMapper sysUserMapper; private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService; private final TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService; @Autowired public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService) { this.tokenService = tokenService; this.sysUserService = sysUserService; this.sysUserMapper = sysUserMapper; this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService; this.testMethodConfirmSheetOriginalDataService = testMethodConfirmSheetOriginalDataService; } /** * 获取检验方法确认单管理列表 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')") @ApiOperation(value = "获取检验方法确认单分页列表") @PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList") public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) { TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class); return R.ok(testMethodConfirmSheetOriginalService.pageList(query)); } /** * 修改检验方法确认单 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')") @Log(title = "检验方法确认单信息-修改检验方法确认单", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改检验方法确认单") @PostMapping(value = "/api/t-test-method-confirm-sheet-original/update") public R<Boolean> update(@RequestBody String param) { TTestMethodConfirmSheetOriginalDTO dto = JSON.parseObject(param, TTestMethodConfirmSheetOriginalDTO.class); testMethodConfirmSheetOriginalService.updateById(dto); testMethodConfirmSheetOriginalDataService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, dto.getId())); List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = dto.getTestMethodConfirmSheetOriginalDataList(); testMethodConfirmSheetOriginalDataList.forEach(testMethodConfirmSheetOriginalData -> { testMethodConfirmSheetOriginalData.setOriginalId(dto.getId()); }); testMethodConfirmSheetOriginalDataService.saveBatch(testMethodConfirmSheetOriginalDataList); return R.ok(); } /** * 查看检验方法确认单详情 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:detail')") @ApiOperation(value = "查看检验方法确认单详情") @GetMapping(value = "/open/t-test-method-confirm-sheet-original/getDetailById") public R<TTestMethodConfirmSheetOriginalVO> getDetailById(@RequestParam String id) { TTestMethodConfirmSheetOriginal testMethodConfirmSheet = testMethodConfirmSheetOriginalService.getById(id); TTestMethodConfirmSheetOriginalVO testMethodConfirmSheetVO = new TTestMethodConfirmSheetOriginalVO(); BeanUtils.copyProperties(testMethodConfirmSheet, testMethodConfirmSheetVO); // 查询检测数据 List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = testMethodConfirmSheetOriginalDataService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, id)); testMethodConfirmSheetVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList); return R.ok(testMethodConfirmSheetVO); } }
File was renamed from ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetTermDataController.java @@ -15,8 +15,8 @@ */ @Api(tags = "检验记录检测数据管理") @RestController @RequestMapping("/t-test-method-confirm-sheet-term-data") public class TTestMethodConfirmSheetTermDataController { @RequestMapping("/t-test-method-confirm-sheet-original-data") public class TTestMethodConfirmSheetOriginalDataController { }
New file @@ -0,0 +1,18 @@ package com.ruoyi.system.dto; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "原始检验记录编辑DTO") public class TTestMethodConfirmSheetOriginalDTO extends TTestMethodConfirmSheetOriginal { @ApiModelProperty(value = "检测数据及图照集合") private List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList; } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalDataMapper.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData; /** * <p> * 检验记录检测数据 Mapper 接口 * </p> * * @author xiaochen * @since 2025-04-08 */ public interface TTestMethodConfirmSheetOriginalDataMapper extends BaseMapper<TTestMethodConfirmSheetOriginalData> { } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java
@@ -1,8 +1,14 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery; import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -14,4 +20,12 @@ */ public interface TTestMethodConfirmSheetOriginalMapper extends BaseMapper<TTestMethodConfirmSheetOriginal> { /** * 分页查询原始检测项 * @param query * @param pageInfo * @return */ List<TTestMethodConfirmSheetOriginalVO> pageList(@Param("query") TTestMethodConfirmSheetOriginalQuery query, @Param("pageInfo")PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetTermDataMapper.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
@@ -13,7 +13,7 @@ /** * <p> * 实验员工作评定 * 实验结果评定 * </p> * * @author xiaochen @@ -22,7 +22,7 @@ @Data @EqualsAndHashCode(callSuper = false) @TableName("t_result_work_evaluate") @ApiModel(value="TResultWorkEvaluate对象", description="实验员工作评定") @ApiModel(value="TResultWorkEvaluate对象", description="实验结果评定") public class TResultWorkEvaluate extends BaseModel { private static final long serialVersionUID = 1L; @@ -34,13 +34,17 @@ @TableField("dispatch_id") private String dispatchId; @ApiModelProperty(value = "实验员id") @ApiModelProperty(value = "用户id") @TableField("user_id") private Integer userId; @ApiModelProperty(value = "实验结果id") @TableField("result_report_id") private String resultReportId; @ApiModelProperty(value = "评定类型 1=工艺工程师 2=化验师 3=实验员") @TableField("evaluate_type") private Integer evaluateType; @ApiModelProperty(value = "1=良好 2=正确 3=失误") @TableField("evaluate_one") @@ -79,6 +83,9 @@ @TableField("evaluate_time") private LocalDateTime evaluateTime; @ApiModelProperty(value = "评定分数 json") @TableField("result_evaluate_json") private String resultEvaluateJson; } ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginalData.java
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTermData.java @@ -12,7 +12,7 @@ /** * <p> * 检验记录检测数据 * 原始检验记录检测数据 * </p> * * @author xiaochen @@ -20,9 +20,9 @@ */ @Data @EqualsAndHashCode(callSuper = false) @TableName("t_test_method_confirm_sheet_term_data") @ApiModel(value="TTestMethodConfirmSheetTermData对象", description="检验记录检测数据") public class TTestMethodConfirmSheetTermData extends BaseModel { @TableName("t_test_method_confirm_sheet_original_data") @ApiModel(value="TTestMethodConfirmSheetOriginalData对象", description="原始检验记录检测数据") public class TTestMethodConfirmSheetOriginalData extends BaseModel { private static final long serialVersionUID = 1L; @@ -46,8 +46,8 @@ private String dataType; @ApiModelProperty(value = "图片") @TableField("data_pritures") private String dataPritures; @TableField("data_pictures") private String dataPictures; @ApiModelProperty(value = "文件json") @TableField("data_files") ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetOriginalQuery.java
New file @@ -0,0 +1,26 @@ package com.ruoyi.system.query; import com.baomidou.mybatisplus.annotation.TableField; import com.ruoyi.common.core.domain.model.TimeRangeQueryBody; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "原始检测项查询对象query") public class TTestMethodConfirmSheetOriginalQuery extends TimeRangeQueryBody { @ApiModelProperty(value = "项目课题方案") private String projectName; @ApiModelProperty(value = "实验编号") private String experimentCode; @ApiModelProperty(value = "创建人") private String createBy; @ApiModelProperty(value = "状态 -1=草稿箱 1=未填写 2=已填写") @TableField("status") private Integer status; } ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalDataService.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData; /** * <p> * 检验记录检测数据 服务类 * </p> * * @author xiaochen * @since 2025-04-08 */ public interface TTestMethodConfirmSheetOriginalDataService extends IService<TTestMethodConfirmSheetOriginalData> { } ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java
@@ -1,8 +1,11 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery; import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO; /** * <p> @@ -14,4 +17,10 @@ */ public interface TTestMethodConfirmSheetOriginalService extends IService<TTestMethodConfirmSheetOriginal> { /** * 获取检验方法确认单分页列表 * @param query * @return */ PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetTermDataService.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalDataServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.mapper.TTestMethodConfirmSheetOriginalDataMapper; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData; import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService; import org.springframework.stereotype.Service; /** * <p> * 检验记录检测数据 服务实现类 * </p> * * @author xiaochen * @since 2025-04-08 */ @Service public class TTestMethodConfirmSheetOriginalDataServiceImpl extends ServiceImpl<TTestMethodConfirmSheetOriginalDataMapper, TTestMethodConfirmSheetOriginalData> implements TTestMethodConfirmSheetOriginalDataService { } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java
@@ -1,13 +1,19 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.mapper.TTestMethodConfirmSheetOriginalMapper; import com.ruoyi.system.mapper.TTestMethodConfirmSheetTermMapper; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery; import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService; import com.ruoyi.system.service.TTestMethodConfirmSheetTermService; import com.ruoyi.system.vo.TExperimentResultReportVO; import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -20,4 +26,11 @@ @Service public class TTestMethodConfirmSheetOriginalServiceImpl extends ServiceImpl<TTestMethodConfirmSheetOriginalMapper, TTestMethodConfirmSheetOriginal> implements TTestMethodConfirmSheetOriginalService { @Override public PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query) { PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TTestMethodConfirmSheetOriginalVO> list = this.baseMapper.pageList(query,pageInfo); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetTermDataServiceImpl.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetOriginalVO.java
New file @@ -0,0 +1,35 @@ package com.ruoyi.system.vo; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal; import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "原始检验记录返回VO", description = "原始检验记录") public class TTestMethodConfirmSheetOriginalVO extends TTestMethodConfirmSheetOriginal { @ApiModelProperty(value = "项目课题方案") private String projectName; @ApiModelProperty(value = "实验编号") private String experimentCode; @ApiModelProperty(value = "实验名称") private String experimentName; @ApiModelProperty(value = "检测项编号") private String termCode; @ApiModelProperty(value = "检测项名称") private String termName; @ApiModelProperty(value = "检测数据") private List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList; } ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -3,11 +3,12 @@ <mapper namespace="com.ruoyi.system.mapper.TResultWorkEvaluateMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTesterWorkEvaluate"> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TResultWorkEvaluate"> <id column="id" property="id" /> <result column="dispatch_id" property="dispatchId" /> <result column="user_id" property="userId" /> <result column="result_report_id" property="resultReportId" /> <result column="evaluate_type" property="evaluateType" /> <result column="evaluate_one" property="evaluateOne" /> <result column="evaluate_two" property="evaluateTwo" /> <result column="evaluate_three" property="evaluateThree" /> @@ -17,6 +18,7 @@ <result column="status" property="status" /> <result column="evaluate_person_id" property="evaluatePersonId" /> <result column="evaluate_time" property="evaluateTime" /> <result column="result_evaluate_json" property="resultEvaluateJson" /> <result column="create_time" property="createTime" /> <result column="update_time" property="updateTime" /> <result column="create_by" property="createBy" /> @@ -26,7 +28,7 @@ <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, dispatch_id, user_id, result_report_id, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time, create_time, update_time, create_by, update_by, disabled id, dispatch_id, user_id, result_report_id,evaluate_type, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time,result_evaluate_json, create_time, update_time, create_by, update_by, disabled </sql> </mapper> ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
@@ -24,5 +24,35 @@ <sql id="Base_Column_List"> id, term_id, original_code, term_standard, term_instrument, term_reagent, term_step, term_result, status, create_time, update_time, create_by, update_by, disabled </sql> <select id="pageList" resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO"> select ttmcso.id, ttmcso.term_id, ttmcso.original_code, ttmcso.term_standard, ttmcso.term_instrument, ttmcso.term_reagent, ttmcso.term_step, ttmcso.term_result, ttmcso.status, ttmcso.create_time, ttmcso.update_time, ttmcso.create_by, ttmcso.update_by, ttmcso.disabled,tpp.project_name AS projectName,ted.experiment_code AS experimentCode, ted.experiment_name AS experimentName,ttmcst.term_name AS termName,ttmcst.term_code AS termCode from t_test_method_confirm_sheet_original ttmcso left join t_test_method_confirm_sheet_term ttmcst on ttmcso.term_id = ttmcst.id left join t_test_method_confirm_sheet ttmcs on ttmcst.test_id = ttmcs.id left join t_experiment_dispatch ted on ttmcs.dispatch_id = ted.id left join t_project_proposal tpp on ted.project_id = tpp.id <where> <if test="query.projectName != null and query.projectName != ''"> and tpp.project_name like concat('%', #{query.projectName}, '%') </if> <if test="query.experimentCode != null and query.experimentCode != ''"> and ted.experiment_code like concat('%', #{query.experimentCode}, '%') </if> <if test="query.createBy != null and query.createBy != ''"> and ttmcso.create_by like concat('%', #{query.createBy}, '%') </if> <if test="query.status != null"> and ttmcso.status = #{query.status} </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND ttmcso.create_time BETWEEN #{query.startTime} AND #{query.endTime} </if> AND ttmcso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY ttmcso.create_time DESC </select> </mapper>
