第三方服务bug修改！功能大改造取得阶段性胜利
parent
59a55e2415
commit
374cfda8aa
@ -0,0 +1,43 @@
|
||||
package com.glxp.api.admin.controller.inventory;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.admin.entity.inout.OrderEntity;
|
||||
import com.glxp.api.admin.req.inout.OrderFilterRequest;
|
||||
import com.glxp.api.admin.req.inventory.FilterSickTraceRequest;
|
||||
import com.glxp.api.admin.res.PageSimpleResponse;
|
||||
import com.glxp.api.admin.service.inout.OrderService;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class InvSickTraceController {
|
||||
|
||||
@Resource
|
||||
OrderService orderService;
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("spms/inv/sick/order/trace")
|
||||
public BaseResponse filterSickTrace(FilterSickTraceRequest filterSickTraceRequest) {
|
||||
|
||||
if (StrUtil.isEmpty(filterSickTraceRequest.getSickAd())) {
|
||||
return ResultVOUtils.error(500, "病人住院号不能为空！");
|
||||
}
|
||||
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
|
||||
orderFilterRequest.setFromCorp(filterSickTraceRequest.getSickAd());
|
||||
List<OrderEntity> orderEntityList = orderService.filterListOr(orderFilterRequest);
|
||||
PageInfo<OrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(orderEntityList);
|
||||
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(orderEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.admin.req.inventory;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterSickTraceRequest {
|
||||
|
||||
private String sickAd; //病人住院号
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.admin.res.inventory;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class InvBusUserResponse {
|
||||
private Integer id;
|
||||
private String userId;
|
||||
private String subInvCode;
|
||||
private String scAction;
|
||||
private String billTypeName;
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package com.glxp.api.admin.res.inventory;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class InvProductThirdResponse {
|
||||
|
||||
|
||||
@JsonProperty("id")
|
||||
private Integer id;
|
||||
@JsonProperty("productName")
|
||||
private String productName;
|
||||
@JsonProperty("diCode")
|
||||
private String diCode;
|
||||
@JsonProperty("spec")
|
||||
private String spec;
|
||||
@JsonProperty("batchNo")
|
||||
private String batchNo;
|
||||
@JsonProperty("productionDate")
|
||||
private String productionDate;
|
||||
@JsonProperty("expireDate")
|
||||
private String expireDate;
|
||||
@JsonProperty("registerCompany ")
|
||||
private String registerCompany;
|
||||
@JsonProperty("registerCert")
|
||||
private String registerCert;
|
||||
@JsonProperty("inCount")
|
||||
private Integer inCount;
|
||||
@JsonProperty("outCount")
|
||||
private Integer outCount;
|
||||
@JsonProperty("supName")
|
||||
private String supName;
|
||||
@JsonProperty("invStorageCode")
|
||||
private String invStorageCode;
|
||||
@JsonProperty("invStorageName")
|
||||
private String invStorageName;
|
||||
@JsonProperty("invSubStorageName")
|
||||
private String invSubStorageName;
|
||||
@JsonProperty("invWarehouseCode")
|
||||
private String invWarehouseCode;
|
||||
}
|
||||
Loading…
Reference in New Issue