销售合同模板

hx-admin/src/main/resources/application-dev.yml

@@ -58,6 +58,10 @@ spring:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                kd100:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

hx-admin/src/main/resources/application-prod.yml

@@ -58,6 +58,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:28643/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: IzJshF_dk9NNFpNm_IK
+                kd100:
+                    url: jdbc:mysql://127.0.0.1:28643/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: IzJshF_dk9NNFpNm_IK
 
     # redis 配置
     redis:

hx-admin/src/main/resources/application-test.yml

@@ -58,6 +58,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                kd100:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -2,6 +2,7 @@ package com.fjhx.common.constant;
 
 
 public interface SourceConstant {
+    
     String ITEM = "item";
 
     String SUPPLY = "supply";

hx-common/src/main/java/com/fjhx/common/controller/contract/ContractTemplateController.java

@@ -0,0 +1,72 @@
+package com.fjhx.common.controller.contract;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+import com.fjhx.common.service.contract.ContractTemplateService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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;
+
+
+/**
+ * <p>
+ * 合同模板 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@RestController
+@RequestMapping("/contractTemplate")
+public class ContractTemplateController {
+
+    @Autowired
+    private ContractTemplateService contractTemplateService;
+
+    /**
+     * 合同模板分页
+     */
+    @PostMapping("/page")
+    public Page<ContractTemplateVo> page(@Validated @RequestBody ContractTemplateSelectDto dto) {
+        return contractTemplateService.getPage(dto);
+    }
+
+    /**
+     * 合同模板明细
+     */
+    @PostMapping("/detail")
+    public ContractTemplateVo detail(@RequestBody BaseSelectDto dto) {
+        return contractTemplateService.detail(dto.getId());
+    }
+
+    /**
+     * 合同模板新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ContractTemplateDto contractTemplateDto) {
+        contractTemplateService.add(contractTemplateDto);
+    }
+
+    /**
+     * 合同模板编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ContractTemplateDto contractTemplateDto) {
+        contractTemplateService.edit(contractTemplateDto);
+    }
+
+    /**
+     * 合同模板删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        contractTemplateService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.contract.dto;
+
+import com.fjhx.common.entity.contract.po.ContractTemplate;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 合同模板新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class ContractTemplateDto extends ContractTemplate {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.contract.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 合同模板列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class ContractTemplateSelectDto extends BaseSelectDto {
+
+    /**
+     * 公司id
+     */
+    private Long corporationId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contract/po/ContractTemplate.java

@@ -0,0 +1,105 @@
+package com.fjhx.common.entity.contract.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 合同模板
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+@TableName("contract_template")
+public class ContractTemplate extends BasePo {
+
+    /**
+     * 模板名称
+     */
+    @NotBlank(message = "模板名称不能为空")
+    private String templateName;
+
+    /**
+     * 公司id
+     */
+    @NotNull(message = "公司id不能为空")
+    private Long corporationId;
+
+    /**
+     * 联系人名称
+     */
+    @NotBlank(message = "联系人名称不能为空")
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    @NotBlank(message = "联系人电话不能为空")
+    private String contactNumber;
+
+    /**
+     * 公司电话
+     */
+    @NotBlank(message = "公司电话不能为空")
+    private String corporationNumber;
+
+    /**
+     * 国家表id
+     */
+    @NotBlank(message = "国家id不能为空")
+    private String countryId;
+
+    /**
+     * 省份id
+     */
+    @NotBlank(message = "省份id不能为空")
+    private String provinceId;
+
+    /**
+     * 城市id
+     */
+    @NotBlank(message = "城市id不能为空")
+    private String cityId;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 国家表英文字符串
+     */
+    @NotBlank(message = "国家英文名称不能为空")
+    private String countryEnStr;
+
+    /**
+     * 省份英文字符串
+     */
+    @NotBlank(message = "省份英文名称不能为空")
+    private String provinceEnStr;
+
+    /**
+     * 城市英文字符串
+     */
+    @NotBlank(message = "城市英文名称不能为空")
+    private String cityEnStr;
+
+    /**
+     * 详细地址英文
+     */
+    private String addressEn;
+
+    /**
+     * 模板内容
+     */
+    private String templateContent;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contract/vo/ContractTemplateVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.contract.vo;
+
+import com.fjhx.common.entity.contract.po.ContractTemplate;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 合同模板列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class ContractTemplateVo extends ContractTemplate {
+
+    /**
+     * 公司名称
+     */
+    private String corporationName;
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/contract/ContractTemplateMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.contract;
+
+import com.fjhx.common.entity.contract.po.ContractTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 合同模板 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-14
+ */
+public interface ContractTemplateMapper extends BaseMapper<ContractTemplate> {
+
+    /**
+     * 合同模板分页
+     */
+    Page<ContractTemplateVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ContractTemplate> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/service/contract/ContractTemplateService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.contract;
+
+import com.fjhx.common.entity.contract.po.ContractTemplate;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+
+
+/**
+ * <p>
+ * 合同模板 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-14
+ */
+public interface ContractTemplateService extends BaseService<ContractTemplate> {
+
+    /**
+     * 合同模板分页
+     */
+    Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto);
+
+    /**
+     * 合同模板明细
+     */
+    ContractTemplateVo detail(Long id);
+
+    /**
+     * 合同模板新增
+     */
+    void add(ContractTemplateDto contractTemplateDto);
+
+    /**
+     * 合同模板编辑
+     */
+    void edit(ContractTemplateDto contractTemplateDto);
+
+    /**
+     * 合同模板删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/contract/impl/ContractTemplateServiceImpl.java

@@ -0,0 +1,60 @@
+package com.fjhx.common.service.contract.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+import com.fjhx.common.entity.contract.po.ContractTemplate;
+import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+import com.fjhx.common.mapper.contract.ContractTemplateMapper;
+import com.fjhx.common.service.contract.ContractTemplateService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 合同模板 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Service
+public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMapper, ContractTemplate> implements ContractTemplateService {
+
+    @Override
+    public Page<ContractTemplateVo> getPage(ContractTemplateSelectDto dto) {
+        IWrapper<ContractTemplate> wrapper = getWrapper();
+        wrapper.eq("ct", ContractTemplate::getCorporationId, dto.getCorporationId());
+        wrapper.keyword(dto, new SqlField("ct", ContractTemplate::getTemplateName));
+        wrapper.orderByDesc("ct", ContractTemplate::getId);
+
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
+    }
+
+    @Override
+    public ContractTemplateVo detail(Long id) {
+        ContractTemplate ContractTemplate = this.getById(id);
+        ContractTemplateVo result = BeanUtil.toBean(ContractTemplate, ContractTemplateVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ContractTemplateDto contractTemplateDto) {
+        this.save(contractTemplateDto);
+    }
+
+    @Override
+    public void edit(ContractTemplateDto contractTemplateDto) {
+        this.updateById(contractTemplateDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-common/src/main/resources/mapper/contract/ContractTemplateMapper.xml

@@ -0,0 +1,17 @@
+<?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="com.fjhx.common.mapper.contract.ContractTemplateMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.contract.vo.ContractTemplateVo">
+        select ct.id,
+               ct.template_name,
+               ct.corporation_id,
+               ct.contact_name,
+               ct.contact_number,
+               ct.corporation_number,
+               c.name corporation_name
+        from contract_template ct
+                 left join corporation c on c.id = ct.corporation_id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>