优化

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/controller/ItdmSampleExpireController.java

@@ -18,6 +18,7 @@ import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
 import org.jeecg.modules.inventory.service.IItdmSampleExpireRealService;
 import org.jeecg.modules.inventory.service.IItdmSampleExpireService;
 import org.jeecg.modules.inventory.service.IItdmSampleInventoryService;
+import org.jeecg.modules.inventory.vo.ItdmSampleExpireListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -27,6 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 样品过期表
@@ -58,18 +61,22 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 	//@AutoLog(value = "样品过期表-分页列表查询")
 	@ApiOperation(value="样品过期表-分页列表查询", notes="样品过期表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<ItdmSampleExpire>> queryPageList(ItdmSampleExpire itdmSampleExpire,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+	public Result<Page<ItdmSampleExpireListVO>> queryPageList(ItdmSampleExpire itdmSampleExpire,
+															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															   HttpServletRequest req) {
 		QueryWrapper<ItdmSampleExpire> queryWrapper = new QueryWrapper<>();
-//		QueryGenerator.initQueryWrapper(itdmSampleExpire, req.getParameterMap());
 		queryWrapper.eq(StringUtils.isNotBlank(itdmSampleExpire.getAuditStatus()),"audit_status",itdmSampleExpire.getAuditStatus());
 		queryWrapper.like(StringUtils.isNotBlank(itdmSampleExpire.getBarCodes()), "bar_codes", itdmSampleExpire.getBarCodes());
 		queryWrapper.orderByDesc("create_time");
 		Page<ItdmSampleExpire> page = new Page<ItdmSampleExpire>(pageNo, pageSize);
-		IPage<ItdmSampleExpire> pageList = itdmSampleExpireService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		Page<ItdmSampleExpire> pageList = itdmSampleExpireService.page(page, queryWrapper);
+		List<ItdmSampleExpireListVO> list = pageList.getRecords().stream().map(i->{
+			List<String> barCodeList = Pattern.compile("\\s*,\\s*").splitAsStream(i.getBarCodes()).collect(Collectors.toList());;
+			return ItdmSampleExpireConvert.INSTANCE.convert1(i,barCodeList);
+		}).collect(Collectors.toList());
+		Page<ItdmSampleExpireListVO> voPageList = ItdmSampleExpireConvert.INSTANCE.convertPage(pageList,list);
+		return Result.OK(voPageList);
 	}
 
 	 @ApiOperation(value="分页列表查询待审核", notes="分页列表查询待审核")
@@ -99,10 +106,8 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ItdmSampleExpireDTO dto) {
 		List<String> barcodeList = dto.getBarCodes();
-		String barcodes = String.join(",",barcodeList);
+		String barcodes = barcodeList.stream().collect(Collectors.joining(","));
 		ItdmSampleExpire itdmSampleExpire = ItdmSampleExpireConvert.INSTANCE.convert(dto,barcodes);
-//		List<String> barcodeList = Arrays.asList(itdmSampleExpire.getBarCodes().split(","));
-
 		String samples = "";
 		for(String barcode:barcodeList){
 			ItdmSampleInventory inventory = inventoryService.getByBarCode(barcode);
@@ -123,7 +128,7 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ItdmSampleExpireDTO dto) {
 		List<String> barcodeList = dto.getBarCodes();
-		String barcodes = String.join(",",barcodeList);
+		String barcodes = barcodeList.stream().collect(Collectors.joining(","));
 		ItdmSampleExpire itdmSampleExpire = ItdmSampleExpireConvert.INSTANCE.convert(dto,barcodes);
 
 		if(itdmSampleExpire.getAuditStatus().equals("0")){ //0未审批1审批通过2审批拒绝
@@ -151,6 +156,7 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 	 @RequestMapping(value = "/shenhe", method = {RequestMethod.PUT,RequestMethod.POST})
 	 public Result<String> shenhe(@RequestBody ItdmSampleExpire itdmSampleExpire) {
 		 if(itdmSampleExpire.getAuditStatus().equals("1")){ //审批通过
+
 			 List<ItdmSampleExpireReal> reals = new ArrayList<>();
 			 List<String> barcodeIdList = Arrays.asList(itdmSampleExpire.getBarCodes().split(","));
 			 for(String barcode:barcodeIdList){

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/convert/ItdmSampleExpireConvert.java

@@ -1,13 +1,16 @@
 package org.jeecg.modules.inventory.convert;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.inventory.dto.ItdmSampleExpireDTO;
 import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
+import org.jeecg.modules.inventory.vo.ItdmSampleExpireListVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
@@ -18,4 +21,11 @@ public interface ItdmSampleExpireConvert {
     @Mapping(target ="barCodes",source ="barCodes")
     ItdmSampleExpire convert(ItdmSampleExpireDTO dto, String barCodes);
 
+    @Mapping(target ="barCodes",source ="barCodeList")
+    ItdmSampleExpireListVO convert1(ItdmSampleExpire sampleExpire, List<String> barCodeList);
+
+
+    @Mapping(target ="records",source ="results" )
+    Page<ItdmSampleExpireListVO> convertPage(Page<ItdmSampleExpire> page, List<ItdmSampleExpireListVO> results);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/vo/ItdmSampleExpireListVO.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.inventory.vo;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class ItdmSampleExpireListVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**过期的条码列表*/
+    @Excel(name = "过期的条码列表", width = 15, dictTable = "itdm_inventory_barcode", dicText = "bar_code", dicCode = "id")
+    @Dict(dictTable = "itdm_inventory_barcode", dicText = "bar_code", dicCode = "bar_code")
+    @ApiModelProperty(value = "过期的条码列表")
+    private List<String> barCodes;
+    /**处理方式*/
+    @Excel(name = "处理方式", width = 15)
+    @ApiModelProperty(value = "处理方式")
+    private java.lang.String handlingMethod;
+    /**审核状态*/
+    @Excel(name = "审核状态", width = 15, dicCode = "audit_status")
+    @Dict(dicCode = "audit_status")
+    @ApiModelProperty(value = "审核状态")
+    private java.lang.String auditStatus;
+    /**拒绝原因*/
+    @Excel(name = "拒绝原因", width = 15)
+    @ApiModelProperty(value = "拒绝原因")
+    private java.lang.String rejectReason;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**样品列表*/
+    @ApiModelProperty(value = "样品列表")
+    private java.lang.String samples;
+}