ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.AuditStatusDTO; import com.ruoyi.system.dto.ExperimentDispatchSign; import com.ruoyi.system.dto.ExperimentDispatchSignDTO; import com.ruoyi.system.dto.TExperimentDispatchDTO; import com.ruoyi.system.dto.UpAndDownDTO; import com.ruoyi.system.mapper.SysUserMapper; @@ -217,7 +217,7 @@ @ApiOperation(value = "实验调度签字") @PostMapping(value = "/api/t-experiment-dispatch/sign") public R<Boolean> sign(@RequestBody String param) { ExperimentDispatchSign experimentDispatchSign = JSON.parseObject(param, ExperimentDispatchSign.class); ExperimentDispatchSignDTO experimentDispatchSign = JSON.parseObject(param, ExperimentDispatchSignDTO.class); Long userId = tokenService.getLoginUser().getUserId(); Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); TExperimentDispatchParticipants experimentDispatchParticipants = experimentDispatchParticipantsService.getOne(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class) ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
@@ -1,9 +1,35 @@ 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.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.TTestMethodConfirmSheetDTO; import com.ruoyi.system.dto.TestMethodConfirmSheetSignDTO; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import com.ruoyi.system.query.TTestMethodConfirmSheetQuery; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TTestMethodConfirmSheetService; import com.ruoyi.system.service.TTestMethodConfirmSheetTermService; import com.ruoyi.system.vo.TTestMethodConfirmSheetVO; 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.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -15,8 +41,134 @@ */ @Api(tags = "检验方法确认单管理") @RestController @RequestMapping("/t-test-method-confirm-sheet") @RequestMapping("") public class TTestMethodConfirmSheetController { private final TTestMethodConfirmSheetService testMethodConfirmSheetService; private final TokenService tokenService; private final ISysUserService sysUserService; private final SysUserMapper sysUserMapper; private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService; @Autowired public TTestMethodConfirmSheetController(TTestMethodConfirmSheetService testMethodConfirmSheetService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService) { this.testMethodConfirmSheetService = testMethodConfirmSheetService; this.tokenService = tokenService; this.sysUserService = sysUserService; this.sysUserMapper = sysUserMapper; this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService; } /** * 获取检验方法确认单管理列表 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:list')") @ApiOperation(value = "获取检验方法确认单分页列表") @PostMapping(value = "/api/t-test-method-confirm-sheet/pageList") public R<PageInfo<TTestMethodConfirmSheetVO>> pageList(@RequestBody String param) { TTestMethodConfirmSheetQuery query = JSON.parseObject(param, TTestMethodConfirmSheetQuery.class); return R.ok(testMethodConfirmSheetService.pageList(query)); } /** * 添加检验方法确认单管理 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:add')") @Log(title = "检验方法确认单信息-新增检验方法确认单", businessType = BusinessType.INSERT) @ApiOperation(value = "添加检验方法确认单",response = TTestMethodConfirmSheetDTO.class) @PostMapping(value = "/api/t-test-method-confirm-sheet/add") public R<Boolean> add(@RequestBody String param) { TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class); testMethodConfirmSheetService.save(dto); List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms(); testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> { testMethodConfirmSheetTerm.setTestId(dto.getId()); testMethodConfirmSheetTerm.setStatus(1); }); testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms); return R.ok(); } /** * 修改检验方法确认单 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:edit')") @Log(title = "检验方法确认单信息-修改检验方法确认单", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改检验方法确认单") @PostMapping(value = "/api/t-test-method-confirm-sheet/update") public R<Boolean> update(@RequestBody String param) { TTestMethodConfirmSheetDTO dto = JSON.parseObject(param,TTestMethodConfirmSheetDTO.class); testMethodConfirmSheetService.updateById(dto); testMethodConfirmSheetTermService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class).eq(TTestMethodConfirmSheetTerm::getTestId,dto.getId())); List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms(); testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> { testMethodConfirmSheetTerm.setTestId(dto.getId()); testMethodConfirmSheetTerm.setStatus(1); }); testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms); return R.ok(); } /** * 查看检验方法确认单详情 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:detail')") @ApiOperation(value = "查看检验方法确认单详情") @GetMapping(value = "/open/t-test-method-confirm-sheet/getDetailById") public R<TTestMethodConfirmSheetVO> getDetailById(@RequestParam String id) { TTestMethodConfirmSheet testMethodConfirmSheet = testMethodConfirmSheetService.getById(id); TTestMethodConfirmSheetVO testMethodConfirmSheetVO = new TTestMethodConfirmSheetVO(); BeanUtils.copyProperties(testMethodConfirmSheet, testMethodConfirmSheetVO); // 获取检测项 List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class) .eq(TTestMethodConfirmSheetTerm::getTestId, id)); testMethodConfirmSheetVO.setTestMethodConfirmSheetTerms(testMethodConfirmSheetTerms); return R.ok(testMethodConfirmSheetVO); } /** * 删除检验方法确认单 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:delete')") @Log(title = "检验方法确认单信息-删除检验方法确认单", businessType = BusinessType.DELETE) @ApiOperation(value = "删除检验方法确认单") @DeleteMapping(value = "/open/t-test-method-confirm-sheet/deleteById") public R<Boolean> deleteById(@RequestParam String id) { // 删除检测项 testMethodConfirmSheetTermService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class).eq(TTestMethodConfirmSheetTerm::getTestId, id)); return R.ok(testMethodConfirmSheetService.removeById(id)); } /** * 批量删除检验方法确认单 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:delete')") @Log(title = "检验方法确认单信息-删除检验方法确认单", businessType = BusinessType.DELETE) @ApiOperation(value = "批量删除检验方法确认单") @DeleteMapping(value = "/open/t-test-method-confirm-sheet/deleteByIds") public R<Boolean> deleteByIds(@RequestBody List<String> ids) { // 删除检测项 testMethodConfirmSheetTermService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class).in(TTestMethodConfirmSheetTerm::getTestId, ids)); return R.ok(testMethodConfirmSheetService.removeByIds(ids)); } /** * 批量删除检验方法确认单 */ @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:sign')") @Log(title = "检验方法确认单信息-检验方法确认单签字", businessType = BusinessType.UPDATE) @ApiOperation(value = "检验方法确认单签字") @PostMapping(value = "/api/t-test-method-confirm-sheet/sign") public R<Boolean> sign(@RequestBody String param) { TestMethodConfirmSheetSignDTO testMethodConfirmSheetSign = JSON.parseObject(param, TestMethodConfirmSheetSignDTO.class); Long userId = tokenService.getLoginUser().getUserId(); testMethodConfirmSheetService.update(Wrappers.lambdaUpdate(TTestMethodConfirmSheet.class) .eq(TTestMethodConfirmSheet::getId, testMethodConfirmSheetSign.getTestMethodConfirmSheetId()) .set(TTestMethodConfirmSheet::getAuditStatus, testMethodConfirmSheetSign.getAuditStatus()) .set(TTestMethodConfirmSheet::getSignTime, LocalDateTime.now()) .set(TTestMethodConfirmSheet::getAuditPersonId, userId) .set(TTestMethodConfirmSheet::getConfirmSign, testMethodConfirmSheetSign.getConfirmSign())); return R.ok(); } }
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/dto/ExperimentDispatchSign.java @@ -7,8 +7,8 @@ import java.io.Serializable; @Data @ApiModel(value = "实验调度签字") public class ExperimentDispatchSign implements Serializable { @ApiModel(value = "实验调度签字DTO") public class ExperimentDispatchSignDTO implements Serializable { @ApiModelProperty(value = "调度id") private String dispatchId; ruoyi-system/src/main/java/com/ruoyi/system/dto/TTestMethodConfirmSheetDTO.java
New file @@ -0,0 +1,18 @@ package com.ruoyi.system.dto; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "检验方法确认单新增编辑DTO", description = "检验方法确认单") public class TTestMethodConfirmSheetDTO extends TTestMethodConfirmSheet { @ApiModelProperty(value = "确认单检测项") private List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms; } ruoyi-system/src/main/java/com/ruoyi/system/dto/TestMethodConfirmSheetSignDTO.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.system.dto; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @Data @ApiModel(value = "检验方法确认单签字DTO") public class TestMethodConfirmSheetSignDTO implements Serializable { @ApiModelProperty(value = "检验方法确认单id") private String testMethodConfirmSheetId; @ApiModelProperty(value = "签字") private String confirmSign; @ApiModelProperty(value = "审核状态 -1=草稿箱 1=待确认 2=通过 3=驳回 4=已撤回 5=已封存") private Integer auditStatus; } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetMapper.java
@@ -1,7 +1,13 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.query.TTestMethodConfirmSheetQuery; import com.ruoyi.system.vo.TTestMethodConfirmSheetVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -13,4 +19,11 @@ */ public interface TTestMethodConfirmSheetMapper extends BaseMapper<TTestMethodConfirmSheet> { /** * 分页查询检验方法确认单 * @param query * @param pageInfo * @return */ List<TTestMethodConfirmSheetVO> pageList(@Param("query") TTestMethodConfirmSheetQuery query, @Param("pageInfo")PageInfo<TTestMethodConfirmSheetVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/query/TTestMethodConfirmSheetQuery.java
New file @@ -0,0 +1,23 @@ package com.ruoyi.system.query; 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 TTestMethodConfirmSheetQuery extends TimeRangeQueryBody { @ApiModelProperty(value = "项目课题方案") private String projectName; @ApiModelProperty(value = "实验名称") private String experimentName; @ApiModelProperty(value = "实验编号") private String experimentCode; @ApiModelProperty(value = "审核状态 -1=草稿箱 1=待确认 2=通过 3=驳回 4=已撤回 5=已封存") private Integer auditStatus; } ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetService.java
@@ -1,7 +1,10 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.query.TTestMethodConfirmSheetQuery; import com.ruoyi.system.vo.TTestMethodConfirmSheetVO; /** * <p> @@ -13,4 +16,10 @@ */ public interface TTestMethodConfirmSheetService extends IService<TTestMethodConfirmSheet> { /** * 分页查询检验方法确认单 * @param query * @return */ PageInfo<TTestMethodConfirmSheetVO> pageList(TTestMethodConfirmSheetQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java
@@ -1,10 +1,16 @@ 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.TTestMethodConfirmSheetMapper; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.query.TTestMethodConfirmSheetQuery; import com.ruoyi.system.service.TTestMethodConfirmSheetService; import com.ruoyi.system.vo.SysOperLogVO; import com.ruoyi.system.vo.TTestMethodConfirmSheetVO; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -17,4 +23,11 @@ @Service public class TTestMethodConfirmSheetServiceImpl extends ServiceImpl<TTestMethodConfirmSheetMapper, TTestMethodConfirmSheet> implements TTestMethodConfirmSheetService { @Override public PageInfo<TTestMethodConfirmSheetVO> pageList(TTestMethodConfirmSheetQuery query) { PageInfo<TTestMethodConfirmSheetVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TTestMethodConfirmSheetVO> list = this.baseMapper.pageList(query,pageInfo); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetVO.java
New file @@ -0,0 +1,28 @@ package com.ruoyi.system.vo; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "检验方法确认单VO") public class TTestMethodConfirmSheetVO extends TTestMethodConfirmSheet { @ApiModelProperty(value = "检验方法检测项") private List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms; @ApiModelProperty(value = "项目课题方案") private String projectName; @ApiModelProperty(value = "实验名称") private String experimentName; @ApiModelProperty(value = "实验编号") private String experimentCode; } ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
@@ -23,5 +23,32 @@ <sql id="Base_Column_List"> id, dispatch_id, confirm_sign, sign_time, audit_status, audit_person_id, audit_sign, audit_time, create_time, update_time, create_by, update_by, disabled </sql> <select id="pageList" resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetVO"> select tmcs.id, tmcs.dispatch_id, tmcs.confirm_sign, tmcs.sign_time, tmcs.audit_status, tmcs.audit_person_id, tmcs.audit_sign, tmcs.audit_time, tmcs.create_time, tmcs.update_time, tmcs.create_by, tmcs.update_by, tmcs.disabled, tpp.project_name AS projectName, ted.experiment_name AS experimentName, ted.experiment_code AS experimentCode from t_test_method_confirm_sheet tmcs left join t_experiment_dispatch ted on tmcs.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.experimentName != null and query.experimentName != ''"> and ted.experiment_name like concat('%', #{query.experimentName}, '%') </if> <if test="query.experimentCode != null and query.experimentCode !=''"> and ted.experiment_code like concat('%', #{query.experimentCode}, '%') </if> <if test="query.auditStatus != null and query.auditStatus != ''"> and tmcs.audit_status = #{query.auditStatus} </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND tmcs.create_time BETWEEN #{query.startTime} AND #{query.endTime} </if> AND tmcs.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY tmcs.create_time DESC </select> </mapper>
