DESKTOP-GC8JR4P\Administrator 4 years ago
parent
commit
53ed7e4685

+ 29 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ContractManagementInfoController.java

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.web.bind.annotation.RestController;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +20,29 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/contractManagementInfo")
 public class ContractManagementInfoController {
 
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    /**
+     * 新增合同信息
+     *
+     */
+    @PostMapping("/addInfo")
+    public String addInfo(@RequestBody ContractManagementInfo contractManagementInfo){
+        return contractManagementInfoService.addInfo(contractManagementInfo);
+    }
+    /**
+     * 编辑合同信息
+     */
+    @PostMapping("/editInfo")
+    public String editInfo(@RequestBody ContractManagementInfo contractManagementInfo){
+        return contractManagementInfoService.editInfo(contractManagementInfo);
+    }
+    /**
+     * 查看合同信息
+     */
+    @GetMapping("/getInfo")
+    public ContractManagementInfo getInfo(String id){
+        return contractManagementInfoService.getInfo(id);
+    }
 }
 

+ 2 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractGoodsInfo.java

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
@@ -84,6 +85,7 @@ public class ContractGoodsInfo extends BaseModel<ContractGoodsInfo> {
     private String grade;
 
 
+
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 8 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
+
 import com.baomidou.mybatisplus.activerecord.Model;
+
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
@@ -156,6 +159,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     private String remarks;
 
+    @TableField(exist = false)
+    private ContractGoodsInfo contractGoodsInfo;
+
+    @TableField(exist = false)
+    private ContractProcessInfo contractProcessInfo;
 
     @Override
     protected Serializable pkVal() {

+ 2 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractProcessInfo.java

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
@@ -76,6 +77,7 @@ public class ContractProcessInfo extends BaseModel<ContractProcessInfo> {
     private String grade;
 
 
+
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 15 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IContractManagementInfoService.java

@@ -12,5 +12,19 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2021-05-17
  */
 public interface IContractManagementInfoService extends IService<ContractManagementInfo> {
-
+/**
+ * 添加
+ * @param contractManagementInfo
+ */
+public String addInfo(ContractManagementInfo contractManagementInfo);
+/**
+ * 编辑
+ *@param contractManagementInfo
+ */
+public String editInfo(ContractManagementInfo contractManagementInfo);
+/**
+ *查看
+ *@param
+ */
+public ContractManagementInfo getInfo(String id);
 }

+ 81 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -1,11 +1,21 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractManagementInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractProcessInfoService;
+import constant.StatusEnum;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Wrapper;
+
 /**
  * <p>
  * 合同管理 服务实现类
@@ -16,5 +26,76 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManagementInfoMapper, ContractManagementInfo> implements IContractManagementInfoService {
+    @Autowired
+    private IContractGoodsInfoService contractGoodsInfoService;
+
+    @Autowired
+    private IContractProcessInfoService contractProcessInfoService;
 
+    /**
+     * 新增合同信息
+     *
+     * @param contractManagementInfo
+     * @return
+     */
+    @Override
+    public String addInfo(ContractManagementInfo contractManagementInfo) {
+        // 主表信息新增
+        // 新增主键id
+        contractManagementInfo.setId(IdGenerator.generateUUID());
+        contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_DO.getFlag());
+        contractManagementInfo.setStatus(StatusEnum.CONTRACT_DO.getName());
+        // 货物信息新增
+        ContractGoodsInfo contractGoodsInfo = contractManagementInfo.getContractGoodsInfo();
+        contractGoodsInfo.setId(IdGenerator.generateUUID());
+        //流程新增
+        ContractProcessInfo contractProcessInfo = contractManagementInfo.getContractProcessInfo();
+        contractProcessInfo.setId(IdGenerator.generateUUID());
+        boolean one = this.insert(contractManagementInfo);
+        boolean two = contractGoodsInfoService.insert(contractGoodsInfo);
+        boolean three = contractProcessInfoService.insert(contractProcessInfo);
+        // 假如 都成功返回ok
+        if (one && two && three) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+    /**
+     * 编辑合同信息
+     * @param contractManagementInfo
+     * @return
+     */
+    public String editInfo(ContractManagementInfo contractManagementInfo){
+        // 主表信息编辑
+        contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_DO.getFlag());
+        contractManagementInfo.setStatus(StatusEnum.CONTRACT_DO.getName());
+        boolean one = this.updateById(contractManagementInfo);
+        // 货物信息编辑
+        boolean two =contractGoodsInfoService.updateById(contractManagementInfo.getContractGoodsInfo());
+        //流程编辑
+        boolean three =contractProcessInfoService.updateById(contractManagementInfo.getContractProcessInfo());
+        // 假如 都成功返回ok
+        if (one && two && three) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+    /**
+     * 查看合同信息
+     * @param id
+     * @return
+     */
+    public ContractManagementInfo getInfo(String id){
+        // 主表信息
+        ContractManagementInfo contractManagementInfo = this.selectById(id);
+        //货物信息
+        ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>().eq("contract_id",id));
+        //流程信息
+        ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq("contract_id",id));
+        contractManagementInfo.setContractGoodsInfo(contractGoodsInfo);
+        contractManagementInfo.setContractProcessInfo(contractProcessInfo);
+        return contractManagementInfo;
+    }
 }