diff --git a/common/common-association/src/main/java/apelet/association/controller/ContractController.java b/common/common-association/src/main/java/apelet/association/controller/ContractController.java new file mode 100644 index 0000000..cdb8cce --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/controller/ContractController.java @@ -0,0 +1,33 @@ +package apelet.association.controller; + +import apelet.association.service.ContractService; +import apelet.association.vo.ContractListVo; +import apelet.common.core.object.ResponseResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 合同管理 + */ +@RestController +@RequestMapping("/tenantadmin/contract") +public class ContractController { + + @Autowired + private ContractService contractService; + + /** + * 查询所有合同(合同签订日期、报价负责人、名称、总报价、产品服务交付日期) + * + * @return 合同列表 + */ + @GetMapping("/contractList") + public ResponseResult> contractList() { + List result = contractService.contractList(); + return ResponseResult.success(result); + } +} diff --git a/common/common-association/src/main/java/apelet/association/dao/ContractMapper.java b/common/common-association/src/main/java/apelet/association/dao/ContractMapper.java new file mode 100644 index 0000000..fb97ea0 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/dao/ContractMapper.java @@ -0,0 +1,18 @@ +package apelet.association.dao; + +import apelet.association.model.Contract; +import apelet.association.vo.ContractListVo; +import apelet.common.core.base.dao.BaseDaoMapper; + +import java.util.List; + +public interface ContractMapper extends BaseDaoMapper { + + /** + * 查询所有合同,关联 sys_user_info 解析报价负责人姓名。 + * 仅返回:合同签订日期、报价负责人(ID+姓名)、名称、总报价、产品服务交付日期。 + * + * @return 合同列表 + */ + List contractList(); +} diff --git a/common/common-association/src/main/java/apelet/association/model/Contract.java b/common/common-association/src/main/java/apelet/association/model/Contract.java new file mode 100644 index 0000000..461802a --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/model/Contract.java @@ -0,0 +1,183 @@ +package apelet.association.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 合同 + */ +@Data +@TableName("contract") +public class Contract implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 创建人登录名称 + */ + @TableField("create_user_id") + private String createUserId; + + /** + * 创建日期 + */ + @TableField("create_time") + private Date createTime; + + /** + * 更新人登录名称 + */ + @TableField("update_user_id") + private String updateUserId; + + /** + * 更新日期 + */ + @TableField("update_time") + private Date updateTime; + + /** + * 逻辑删除标记(1: 正常 -1: 已删除) + */ + @TableField("deleted_flag") + private Integer deletedFlag; + + /** + * 编码 + */ + @TableField("number") + private String number; + + /** + * 名称 + */ + @TableField("name") + private String name; + + /** + * 流程状态 + */ + @TableField("flow_status") + private Integer flowStatus; + + /** + * 流程最新状态 + */ + @TableField("flow_approval_status") + private Integer flowApprovalStatus; + + /** + * 流程实例id + */ + @TableField("pro_ins_id") + private String proInsId; + + /** + * 状态 + */ + @TableField("billstatus") + private String billstatus; + + /** + * 公司 + */ + @TableField("org") + private Integer org; + + /** + * 来源单据ID + */ + @TableField("srcbillid") + private Integer srcbillid; + + /** + * 来源单据编码 + */ + @TableField("srcbillnumber") + private Integer srcbillnumber; + + /** + * 来源分录Id + */ + @TableField("srcentryid") + private Integer srcentryid; + + /** + * 总报价 + */ + @TableField("qty") + private BigDecimal qty; + + /** + * 报价负责人ID + */ + @TableField("managerperson") + private Long managerperson; + + /** + * 项目类型 + */ + @TableField("type") + private String type; + + /** + * 合同签订日期 + */ + @TableField("signing_date") + private Date signingDate; + + /** + * 产品服务交付日期 + */ + @TableField("delivery_date") + private Date deliveryDate; + + /** + * 分包价格 + */ + @TableField("price") + private BigDecimal price; + + /** + * 收款计划 + */ + @TableField("get_date") + private Date getDate; + + /** + * 产品服务交付负责人 + */ + @TableField("delivery_person") + private Long deliveryPerson; + + /** + * 附件 + */ + @TableField("file_text") + private String fileText; + + /** + * 分包商 + */ + @TableField("subcontractor") + private String subcontractor; + + /** + * 客户 + */ + @TableField("bd_customer") + private Long bdCustomer; +} diff --git a/common/common-association/src/main/java/apelet/association/service/ContractService.java b/common/common-association/src/main/java/apelet/association/service/ContractService.java new file mode 100644 index 0000000..7c7eb68 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/service/ContractService.java @@ -0,0 +1,17 @@ +package apelet.association.service; + +import apelet.association.model.Contract; +import apelet.association.vo.ContractListVo; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface ContractService extends IService { + + /** + * 查询所有合同(合同签订日期、报价负责人、名称、总报价、产品服务交付日期) + * + * @return 合同列表 + */ + List contractList(); +} diff --git a/common/common-association/src/main/java/apelet/association/service/impl/ContractServiceImpl.java b/common/common-association/src/main/java/apelet/association/service/impl/ContractServiceImpl.java new file mode 100644 index 0000000..7868604 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/service/impl/ContractServiceImpl.java @@ -0,0 +1,19 @@ +package apelet.association.service.impl; + +import apelet.association.dao.ContractMapper; +import apelet.association.model.Contract; +import apelet.association.service.ContractService; +import apelet.association.vo.ContractListVo; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ContractServiceImpl extends ServiceImpl implements ContractService { + + @Override + public List contractList() { + return baseMapper.contractList(); + } +} diff --git a/common/common-association/src/main/java/apelet/association/vo/ContractListVo.java b/common/common-association/src/main/java/apelet/association/vo/ContractListVo.java new file mode 100644 index 0000000..f497521 --- /dev/null +++ b/common/common-association/src/main/java/apelet/association/vo/ContractListVo.java @@ -0,0 +1,48 @@ +package apelet.association.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 合同列表展示对象 + */ +@Data +public class ContractListVo { + + /** + * 主键ID + */ + private Long id; + + /** + * 合同签订日期 + */ + private Date signingDate; + + /** + * 报价负责人ID + */ + private Long managerperson; + + /** + * 报价负责人姓名(关联 sys_user_info.USER_NAME) + */ + private String managerName; + + /** + * 名称 + */ + private String name; + + /** + * 总报价 + */ + private BigDecimal qty; + + /** + * 产品服务交付日期 + */ + private Date deliveryDate; +} diff --git a/common/common-association/src/main/resources/mapper/ContractMapper.xml b/common/common-association/src/main/resources/mapper/ContractMapper.xml new file mode 100644 index 0000000..e60a1e0 --- /dev/null +++ b/common/common-association/src/main/resources/mapper/ContractMapper.xml @@ -0,0 +1,23 @@ + + + + + + + +