product
杨世强 2 years ago
parent 21e5c8dd37
commit eb9d8fadff

@ -90,26 +90,26 @@ public class PurchasebackController {
* @return
*/
@PostMapping("/getList")
public ActionResult list(@RequestBody PurchasebackPagination purchasebackPagination)throws IOException{
List<PurchasebackEntity> list= purchasebackService.getList(purchasebackPagination);
public ActionResult list(@RequestBody PurchasebackPagination purchasebackPagination) throws IOException {
List<PurchasebackEntity> list = purchasebackService.getList(purchasebackPagination);
//处理id字段转名称若无需转或者为空可删除
for(PurchasebackEntity entity:list){
Map<String,Object> purchaseOrderIdMap = new HashMap<>();
entity.setPurchaseOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157","id","document_no",entity.getPurchaseOrderId(),purchaseOrderIdMap));
for (PurchasebackEntity entity : list) {
Map<String, Object> purchaseOrderIdMap = new HashMap<>();
entity.setPurchaseOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157", "id", "document_no", entity.getPurchaseOrderId(), purchaseOrderIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<PurchasebackListVO> listVO=JsonUtil.getJsonToList(list,PurchasebackListVO.class);
for(PurchasebackListVO purchasebackVO:listVO){
PurchaseorderEntity purchaseorderEntity = purchasebackService.getPurchaseorder(purchasebackVO.getPurchaseOrderId());
if(ObjectUtil.isNotEmpty(purchaseorderEntity)){
purchasebackVO.setJg_purchaseorder(JsonUtil.getJsonToBean(purchaseorderEntity,PurchaseorderListVO.class));
}
}
List<PurchasebackListVO> listVO = JsonUtil.getJsonToList(list, PurchasebackListVO.class);
for (PurchasebackListVO purchasebackVO : listVO) {
PurchaseorderEntity purchaseorderEntity = purchasebackService.getPurchaseorder(purchasebackVO.getPurchaseOrderId());
if (ObjectUtil.isNotEmpty(purchaseorderEntity)) {
purchasebackVO.setJg_purchaseorder(JsonUtil.getJsonToBean(purchaseorderEntity, PurchaseorderListVO.class));
}
}
PageListVO vo=new PageListVO();
PageListVO vo = new PageListVO();
vo.setList(listVO);
PaginationVO page=JsonUtil.getJsonToBean(purchasebackPagination,PaginationVO.class);
PaginationVO page = JsonUtil.getJsonToBean(purchasebackPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}

@ -53,7 +53,7 @@ import jnpf.util.enums.FileTypeEnum;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Slf4j
@RestController
@ -386,6 +386,8 @@ public class PurchaseorderController {
List<Purchaseorder_item0Entity> jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
List<Purchaseorder_item0Model> jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class);
for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){
Map<String,Object> licenseNumMap = new HashMap<>();
jg_purchaseorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383214061812227333","license_num","license_num",jg_purchaseorder_item0Model.getLicenseNum(),licenseNumMap));
}
vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList);
List<InvoicesitemEntity> jg_invoicesList = purchaseorderitemService.GetInvoicesitemList(id);

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_invoices")

@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_paymentdoc")

@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_purchaseback")

@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_purchaseorder_item0")

@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_purchaseorder")

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface InvoicesitemMapper extends BaseMapper<InvoicesitemEntity> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface PaymentdocitemMapper extends BaseMapper<PaymentdocitemEntity> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface PurchasebackitemMapper extends BaseMapper<PurchasebackitemEntity> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface Purchaseorder_item0Mapper extends BaseMapper<Purchaseorder_item0Entity> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface PurchaseorderitemMapper extends BaseMapper<PurchaseorderitemEntity> {

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* V3.2.0
* : LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Data
public class InvoicesitemModel {

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* V3.2.0
* : LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Data
public class PaymentdocitemModel {

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* V3.2.0
* : LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Data
public class PurchasebackitemModel {

@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderCrForm {

@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderInfoVO{

@ -10,7 +10,7 @@ import java.util.List;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderListQuery extends Pagination {

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderListVO{

@ -11,7 +11,7 @@ import java.util.List;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderPagination extends Pagination {

@ -9,7 +9,7 @@ import java.util.*;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderPaginationExportModel extends Pagination {

@ -19,7 +19,7 @@ import lombok.Data;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class PurchaseorderUpForm{

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* V3.2.0
* : LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Data
public class Purchaseorder_item0Model {

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface InvoicesitemService extends IService<InvoicesitemEntity> {

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface PaymentdocitemService extends IService<PaymentdocitemEntity> {

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface PurchasebackitemService extends IService<PurchasebackitemEntity> {

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface Purchaseorder_item0Service extends IService<Purchaseorder_item0Entity> {

@ -3,7 +3,6 @@ import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
import jnpf.purchaseorder.entity.PaymentdocitemEntity;
import jnpf.purchaseorder.entity.PurchasebackitemEntity;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination;
@ -14,7 +13,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface PurchaseorderitemService extends IService<PurchaseorderitemEntity> {

@ -32,7 +32,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class InvoicesitemServiceImpl extends ServiceImpl<InvoicesitemMapper, InvoicesitemEntity> implements InvoicesitemService{

@ -32,7 +32,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class PaymentdocitemServiceImpl extends ServiceImpl<PaymentdocitemMapper, PaymentdocitemEntity> implements PaymentdocitemService{

@ -32,7 +32,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class PurchasebackitemServiceImpl extends ServiceImpl<PurchasebackitemMapper, PurchasebackitemEntity> implements PurchasebackitemService{

@ -32,7 +32,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class Purchaseorder_item0ServiceImpl extends ServiceImpl<Purchaseorder_item0Mapper, Purchaseorder_item0Entity> implements Purchaseorder_item0Service{

@ -29,7 +29,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemMapper, PurchaseorderitemEntity> implements PurchaseorderitemService {

Loading…
Cancel
Save