From f657537e3e86cb7799e53a120fda67b1d8eed326 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Tue, 28 Feb 2023 09:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=9F=BA=E7=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractMobileController.java | 44 +++++ .../entity/ContractMobileEntity.java | 139 +++++++++++++++ .../mapper/ContractMobileMapper.java | 7 + .../contractMobile/ContractMobileListVO.java | 159 ++++++++++++++++++ .../ContractMobilePagination.java | 13 ++ .../service/ContractMobileService.java | 11 ++ .../impl/ContractMobileServiceImpl.java | 65 +++++++ 7 files changed, 438 insertions(+) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java new file mode 100644 index 00000000..db32bc9e --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java @@ -0,0 +1,44 @@ +package jnpf.contractMobile.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import jnpf.base.ActionResult; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.contractMobile.entity.ContractMobileEntity; +import jnpf.contractMobile.model.contractMobile.ContractMobileListVO; +import jnpf.contractMobile.model.contractMobile.ContractMobilePagination; +import jnpf.contractMobile.service.ContractMobileService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; +import java.util.*; + +import jnpf.util.*; + +@Slf4j +@RestController +@Api(tags = "合同档案(移)", value = "contractMobile") +@RequestMapping("/api/contractMobile/ContractMobile") +public class ContractMobileController { + + @Autowired + private ContractMobileService contractMobileService; + + @PostMapping("/getList") + @ApiOperation("合同档案列表") + public ActionResult list(@RequestBody ContractMobilePagination contractMobilePagination) throws IOException { + List list = contractMobileService.getList(contractMobilePagination); + List listVO = JsonUtil.getJsonToList(list, ContractMobileListVO.class); + PageListVO vo = new PageListVO(); + vo.setList(listVO); + PaginationVO page = JsonUtil.getJsonToBean(contractMobilePagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java new file mode 100644 index 00000000..a85822f0 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java @@ -0,0 +1,139 @@ +package jnpf.contractMobile.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; + +/** + * 合同档案(移) + */ +@Data +@TableName("jg_contract") +public class ContractMobileEntity { + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("CONTRACT_CODE") + private String contractCode; + + @TableField("CONTRACT_NAME") + private String contractName; + + @TableField("CONTRACT_NO") + private String contractNo; + + @TableField("CONTRACT_TYPE") + private String contractType; + + @TableField("CLASSIFICATION") + private String classification; + + @TableField("DECLARATION_DATE") + private Date declarationDate; + + @TableField("CODE") + private String code; + + @TableField("NAME") + private String name; + + @TableField("NUM") + private BigDecimal num; + + @TableField("AMOUNT") + private BigDecimal amount; + + @TableField("DEPT_CODE") + private String deptCode; + + @TableField("DEPT_NAME") + private String deptName; + + @TableField("STATUS") + private String status; + + @TableField("BID_OPENING_DATE") + private Date bidOpeningDate; + + @TableField("START_DATE") + private Date startDate; + + @TableField("AUDIT_DATE") + private Date auditDate; + + @TableField("COMPLETION_DATE") + private Date completionDate; + + @TableField("CLOSING_DATE") + private Date closingDate; + + @TableField("COLLECTION_CYCLE") + private Integer collectionCycle; + + @TableField("SIGNING_DATE") + private Date signingDate; + + @TableField("END_DATE") + private Date endDate; + + @TableField("CURRENCY") + private String currency; + + @TableField("ORGANIZATION") + private String organization; + + @TableField("REMARK") + private String remark; + + @TableField("APPROVAL") + private String approval; + + @TableField("EXCHANGE_RATE") + private String exchangeRate; + + @TableField("BANK_NO") + private String bankNo; + + @TableField("TAX_NO") + private String taxNo; +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java new file mode 100644 index 00000000..ef2cbfe8 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java @@ -0,0 +1,7 @@ +package jnpf.contractMobile.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.contractMobile.entity.ContractMobileEntity; + +public interface ContractMobileMapper extends BaseMapper { +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java new file mode 100644 index 00000000..6c6da092 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java @@ -0,0 +1,159 @@ +package jnpf.contractMobile.model.contractMobile; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Data; + +import java.util.Date; + +/** + * + * 合同列表 + * + */ +@Data +public class ContractMobileListVO{ + + /** 主键 */ + private String id; + + + /** 合同类型 **/ + @JsonProperty("contractType") + private String contractType; + + + /** 合同编码 **/ + @JsonProperty("contractCode") + private String contractCode; + + + /** 合同名称 **/ + @JsonProperty("contractName") + private String contractName; + + + /** 合同状态 **/ + @JsonProperty("status") + private String status; + + + /** 开标日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("bidOpeningDate") + private Date bidOpeningDate; + + + /** 开始日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("startDate") + private Date startDate; + + + /** 审核日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("auditDate") + private Date auditDate; + + + /** 供货完成日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("completionDate") + private Date completionDate; + + + /** 关闭日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("closingDate") + private Date closingDate; + + + /** 回款周期(日) **/ + @JsonProperty("collectionCycle") + private String collectionCycle; + + + /** 签订日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("signingDate") + private Date signingDate; + + + /** 截止日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("endDate") + private Date endDate; + + + /** 供应商/客户编 **/ + @JsonProperty("code") + private String code; + + + /** 供应商/客户名 **/ + @JsonProperty("name") + private String name; + + + /** 对方合同号 **/ + @JsonProperty("contractNo") + private String contractNo; + + + /** 币种 **/ + @JsonProperty("currency") + private String currency; + + + /** 数量 **/ + @JsonProperty("num") + private String num; + + + /** 金额 **/ + @JsonProperty("amount") + private String amount; + + + /** 库存组织 **/ + @JsonProperty("organization") + private String organization; + + + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + + /** 合同分类 **/ + @JsonProperty("classification") + private String classification; + + + /** 申报日期 **/ + @JsonProperty("declarationDate") + private String declarationDate; + + + /** 部门编码 **/ + @JsonProperty("deptCode") + private String deptCode; + + + /** 录入人 **/ + @JsonProperty("creatorusername") + private String creatorusername; + + + /** 部门名称 **/ + @JsonProperty("deptName") + private String deptName; + + + /** 集团审批 **/ + @JsonProperty("approval") + private String approval; + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java new file mode 100644 index 00000000..1f9b8885 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java @@ -0,0 +1,13 @@ +package jnpf.contractMobile.model.contractMobile; + +import jnpf.base.Pagination; +import lombok.Data; + +@Data +public class ContractMobilePagination extends Pagination { + + /** + * 菜单id + */ + private String menuId; +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java new file mode 100644 index 00000000..9ddd038f --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java @@ -0,0 +1,11 @@ +package jnpf.contractMobile.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.contractMobile.entity.ContractMobileEntity; +import jnpf.contractMobile.model.contractMobile.ContractMobilePagination; + +import java.util.*; + +public interface ContractMobileService extends IService { + List getList(ContractMobilePagination contractMobilePagination); +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java new file mode 100644 index 00000000..c59ab06a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java @@ -0,0 +1,65 @@ +package jnpf.contractMobile.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.contractMobile.entity.ContractMobileEntity; +import jnpf.contractMobile.mapper.ContractMobileMapper; +import jnpf.contractMobile.model.contractMobile.ContractMobilePagination; +import jnpf.contractMobile.service.ContractMobileService; +import jnpf.supplyProcessAnalysis.entity.ContractMEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import jnpf.util.*; + +import java.util.*; + +@Service +public class ContractMobileServiceImpl extends ServiceImpl implements ContractMobileService { + @Autowired + private UserProvider userProvider; + + @Override + public List getList(ContractMobilePagination contractMobilePagination) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + int total = 0; + int contractMNum = 0; + QueryWrapper contractMobileQueryWrapper = new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + return new ArrayList<>(); + } + } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + return new ArrayList<>(); + } + } +// if (StringUtil.isNotEmpty(contractMPagination.getContractCode())) { +// contractMNum++; +// contractMQueryWrapper.lambda().like(ContractMEntity::getContractCode, contractMPagination.getContractCode()); +// } +// if (StringUtil.isNotEmpty(contractMPagination.getContractName())) { +// contractMNum++; +// contractMQueryWrapper.lambda().like(ContractMEntity::getContractName, contractMPagination.getContractName()); +// } +// if (StringUtil.isNotEmpty(contractMPagination.getName())) { +// contractMNum++; +// contractMQueryWrapper.lambda().like(ContractMEntity::getName, contractMPagination.getName()); +// } + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(contractMobilePagination.getCurrentPage(), contractMobilePagination.getPageSize()); + IPage userIPage = this.page(page, contractMobileQueryWrapper); + return contractMobilePagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { + List list = new ArrayList(); + return contractMobilePagination.setData(list, list.size()); + } + } +}