项目列表所有接口

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ControlContractInfo.java

@@ -0,0 +1,98 @@
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/6/6 9:21
+ **/
+@Data
+@TableName("c_control_contract_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "项目合同表", description = "项目合同表")
+public class ControlContractInfo extends BaseEntity {
+    @ApiModelProperty(value = "合同编号")
+    private String number;
+
+    @ApiModelProperty(value = "合同名称")
+    private String name;
+
+    @ApiModelProperty(value = "合同类型")
+    private Integer contractType;
+
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "合同签订时间")
+    private LocalDate contractSignTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "合同开始日期")
+    private LocalDate startTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "合同结束日期")
+    private LocalDate endTime;
+
+    @ApiModelProperty(value = "对方单位回款联系人名称")
+    private String returnedUserName;
+
+    @ApiModelProperty(value = "对方单位回款联系人电话")
+    private String returnedUserPhone;
+
+    @ApiModelProperty(value = "合同金额")
+    private BigDecimal contractMoney;
+
+    @ApiModelProperty(value = "发票抬头")
+    private String invoiceHead;
+
+    @ApiModelProperty(value = "纳税人识别号")
+    private String taxpayerNumber;
+
+    @ApiModelProperty(value = "开户银行")
+    private String openAccountBank;
+
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+
+    @ApiModelProperty(value = "收件人姓名")
+    private String addresseeUserName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String addresseePhone;
+
+    @ApiModelProperty(value = "邮寄地址")
+    private String mailingAddress;
+
+    @ApiModelProperty(value = "合同附件")
+    private String contractAccessory;
+
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ControlProjectInfoVO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.control.entity.ControlProjectInfo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -18,6 +19,8 @@ public class ControlProjectInfoVO extends ControlProjectInfo {
     private String projectTypeValue;
     //项目服务类型值
     private String projectServerTypeValue;
+    //合同金额
+    private BigDecimal contractMoney;
     //项目负责人名称
     private String projectPrincipalName;
     //实施负责人名称

blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractInfoController.java

@@ -0,0 +1,38 @@
+package org.springblade.control.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlContractInfo;
+import org.springblade.control.service.IContractInfoService;
+import org.springblade.control.service.IProjectInfoService;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/6/6 9:46
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/contractInfo")
+@Api(value = "合同信息接口", tags = "合同信息接口")
+public class ContractInfoController {
+    private final IContractInfoService contractInfoService;
+
+    /**
+     * 新增项目
+     */
+    @PostMapping("/addContractInfo")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "新增项目")
+    public R addContractInfo(@RequestBody ControlContractInfo contractInfo) {
+        contractInfoService.addContractInfo(contractInfo);
+        return R.success("新增成功");
+    }
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ContractInfoMapper.java

@@ -0,0 +1,21 @@
+package org.springblade.control.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlContractInfo;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.system.entity.DictBiz;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:38
+ **/
+public interface ContractInfoMapper extends BaseMapper<ControlContractInfo> {
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ContractInfoMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.control.mapper.ContractInfoMapper">
+
+
+
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectInfoMapper.xml

@@ -7,7 +7,10 @@
         select
         pi.*,
         (select dict_name  from c_dict_info WHERE code = 'project_type' AND dict_value = pi.project_type) as projectTypeValue,
-        (select dict_name  from c_dict_info WHERE code = 'project_server_type' AND dict_value = pi.project_server_type) as projectServerTypeValue
+        (select dict_name  from c_dict_info WHERE code = 'project_server_type' AND dict_value = pi.project_server_type) as projectServerTypeValue,
+        (select contract_money from c_control_contract_info WHERE project_id = pi.id)as contractMoney,
+        (select name from blade_user WHERE id = pi.project_principal) as projectPrincipalName,
+        (select name from blade_user WHERE id = pi.implement_principal) as implementPrincipalName
         from c_control_project_info pi
         where pi.is_deleted = 0
         <if test="dto.projectType != null and dto.projectType != ''">
@@ -31,7 +34,11 @@
         select
             pi.*,
             (select dict_name  from c_dict_info WHERE code = 'project_type' AND dict_value = pi.project_type) as projectTypeValue,
-            (select dict_name  from c_dict_info WHERE code = 'project_server_type' AND dict_value = pi.project_server_type) as projectServerTypeValue
+            (select dict_name  from c_dict_info WHERE code = 'project_server_type' AND dict_value = pi.project_server_type) as projectServerTypeValue,
+            (select contract_money from c_control_contract_info WHERE project_id = pi.id)as contractMoney,
+            (select name from blade_user WHERE id = pi.project_principal) as projectPrincipalName,
+            (select name from blade_user WHERE id = pi.implement_principal) as implementPrincipalName,
+            (select name from blade_user WHERE id = pi.maintain_principal) as maintainPrincipalName
         from c_control_project_info pi
         where pi.is_deleted = 0 and pi.id = #{id}
     </select>

blade-service/blade-control/src/main/java/org/springblade/control/service/IContractInfoService.java

@@ -0,0 +1,23 @@
+package org.springblade.control.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlContractInfo;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.mp.support.Query;
+import org.springblade.system.entity.DictBiz;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:41
+ **/
+public interface IContractInfoService extends BaseService<ControlContractInfo> {
+
+
+    void addContractInfo(ControlContractInfo contractInfo);
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ContractInfoServiceImpl.java

@@ -0,0 +1,39 @@
+package org.springblade.control.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlContractInfo;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.mapper.ContractInfoMapper;
+import org.springblade.control.mapper.ProjectInfoMapper;
+import org.springblade.control.service.IContractInfoService;
+import org.springblade.control.service.IProjectInfoService;
+import org.springblade.control.service.IProjectProcessService;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Query;
+import org.springblade.system.entity.DictBiz;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:43
+ **/
+@Service
+@AllArgsConstructor
+public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper, ControlContractInfo> implements IContractInfoService {
+
+    @Override
+    public void addContractInfo(ControlContractInfo contractInfo) {
+        baseMapper.insert(contractInfo);
+    }
+}