jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lis8.0/master'

Browse Source
This commit is contained in:
jiangs 2026-01-30 12:06:52 +08:00
commit d816e44243
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
View File

@ -9,8 +9,8 @@ import com.czlis.common.core.domain.entity.lis.LabReqmain;
import com.czlis.common.core.domain.entity.lis.LabResult;
import com.czlis.common.core.page.TableDataInfo;
import com.czlis.common.enums.BusinessType;
import com.czlis.common.utils.SecurityUtils;
import com.czlis.interfaceCommon.constants.SysLogConstants;
import com.czlis.liswork.pojo.DTO.ReqlistDTO;
import com.czlis.liswork.service.LabResultService;
import com.czlis.liswork.service.LisWorkService;
import io.swagger.annotations.Api;
@ -217,9 +217,27 @@ public class LisWorkController extends BaseController {
return ResultT.fromResult(lisWorkService.autosavebarcode(sqh),LabReqmain.class);
}
@ApiOperation("手动保存签收条码")
@GetMapping("/savebarcode")
public Result savebarcode(String[] sqh,String yhdh) {
return lisWorkService.savebarcode(sqh,yhdh);
@PostMapping("/savebarcode")
public Result savebarcode(@RequestBody ReqlistDTO reqlistDTO) {
if(reqlistDTO==null)return new Result("-1","工号yhdh不能为空");
// 1. 安全获取参数（Hutool MapUtil，指定默认值避免null）
String yhdh =reqlistDTO.getYhdh();
// 初始化空List，避免后续判空麻烦
List<String> sqhList = reqlistDTO.getSqhlist();
// 2. 非空校验（核心：避免空参数传入服务层）
if (yhdh==null|| yhdh.isEmpty()) {
return new Result("-1","工号yhdh不能为空");
}
if (sqhList == null || sqhList.isEmpty()) {
return new Result("-1","条码数组sqhlist不能为空，且至少包含一个条码");
}
// 3. List转String[]（解决原代码直接取数组返回null的问题）
String[] sqhArray = sqhList.toArray(new String[0]);
// 4. 调用服务层方法
return lisWorkService.savebarcode(sqhArray, yhdh);
}
@ApiOperation("查询条码")
@GetMapping("/querybarcode")

22
liswork/src/main/java/com/czlis/liswork/pojo/DTO/ReqlistDTO.java Normal file
View File

@ -0,0 +1,22 @@
package com.czlis.liswork.pojo.DTO;
import com.czlis.common.core.domain.entity.lis.LabInputmdl;
import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ReqlistDTO {
@NotBlank(message = "工号不能为空！")
@ApiModelProperty("工号")
private String yhdh;
@NotBlank(message = "条码号不能为空！")
@ApiModelProperty("条码号列表[1,2,3]")
private List<String> sqhlist;
}