专利、美术版权、商标、承包商

hx-common/src/main/java/com/fjhx/common/controller/art/ArtCopyrightController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.art;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.art.dto.ArtCopyrightDto;
+import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.fjhx.common.service.art.ArtCopyrightService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+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;
+
+
+/**
+ * <p>
+ * 美术版权 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/artCopyright")
+public class ArtCopyrightController {
+
+    @Autowired
+    private ArtCopyrightService artCopyrightService;
+
+    /**
+     * 美术版权分页
+     */
+    @PostMapping("/page")
+    public Page<ArtCopyrightVo> page(@RequestBody ArtCopyrightSelectDto dto) {
+        return artCopyrightService.getPage(dto);
+    }
+
+    /**
+     * 美术版权明细
+     */
+    @PostMapping("/detail")
+    public ArtCopyrightVo detail(@RequestBody BaseSelectDto dto) {
+        return artCopyrightService.detail(dto.getId());
+    }
+
+    /**
+     * 美术版权新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ArtCopyrightDto artCopyrightDto) {
+        artCopyrightService.add(artCopyrightDto);
+    }
+
+    /**
+     * 美术版权编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ArtCopyrightDto artCopyrightDto) {
+        artCopyrightService.edit(artCopyrightDto);
+    }
+
+    /**
+     * 美术版权删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        artCopyrightService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/contractor/ContractorController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.contractor;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contractor.dto.ContractorDto;
+import com.fjhx.common.entity.contractor.dto.ContractorSelectDto;
+import com.fjhx.common.entity.contractor.vo.ContractorVo;
+import com.fjhx.common.service.contractor.ContractorService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+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;
+
+
+/**
+ * <p>
+ * 承包商 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/contractor")
+public class ContractorController {
+
+    @Autowired
+    private ContractorService contractorService;
+
+    /**
+     * 承包商分页
+     */
+    @PostMapping("/page")
+    public Page<ContractorVo> page(@RequestBody ContractorSelectDto dto) {
+        return contractorService.getPage(dto);
+    }
+
+    /**
+     * 承包商明细
+     */
+    @PostMapping("/detail")
+    public ContractorVo detail(@RequestBody BaseSelectDto dto) {
+        return contractorService.detail(dto.getId());
+    }
+
+    /**
+     * 承包商新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ContractorDto contractorDto) {
+        contractorService.add(contractorDto);
+    }
+
+    /**
+     * 承包商编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ContractorDto contractorDto) {
+        contractorService.edit(contractorDto);
+    }
+
+    /**
+     * 承包商删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        contractorService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/patent/PatentController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.patent;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.patent.dto.PatentDto;
+import com.fjhx.common.entity.patent.dto.PatentSelectDto;
+import com.fjhx.common.entity.patent.vo.PatentVo;
+import com.fjhx.common.service.patent.PatentService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+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;
+
+
+/**
+ * <p>
+ * 专利 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/patent")
+public class PatentController {
+
+    @Autowired
+    private PatentService patentService;
+
+    /**
+     * 专利分页
+     */
+    @PostMapping("/page")
+    public Page<PatentVo> page(@RequestBody PatentSelectDto dto) {
+        return patentService.getPage(dto);
+    }
+
+    /**
+     * 专利明细
+     */
+    @PostMapping("/detail")
+    public PatentVo detail(@RequestBody BaseSelectDto dto) {
+        return patentService.detail(dto.getId());
+    }
+
+    /**
+     * 专利新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PatentDto patentDto) {
+        patentService.add(patentDto);
+    }
+
+    /**
+     * 专利编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PatentDto patentDto) {
+        patentService.edit(patentDto);
+    }
+
+    /**
+     * 专利删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        patentService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/trademark/TrademarkController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.trademark;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.trademark.dto.TrademarkDto;
+import com.fjhx.common.entity.trademark.dto.TrademarkSelectDto;
+import com.fjhx.common.entity.trademark.vo.TrademarkVo;
+import com.fjhx.common.service.trademark.TrademarkService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+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;
+
+
+/**
+ * <p>
+ * 商标 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/trademark")
+public class TrademarkController {
+
+    @Autowired
+    private TrademarkService trademarkService;
+
+    /**
+     * 商标分页
+     */
+    @PostMapping("/page")
+    public Page<TrademarkVo> page(@RequestBody TrademarkSelectDto dto) {
+        return trademarkService.getPage(dto);
+    }
+
+    /**
+     * 商标明细
+     */
+    @PostMapping("/detail")
+    public TrademarkVo detail(@RequestBody BaseSelectDto dto) {
+        return trademarkService.detail(dto.getId());
+    }
+
+    /**
+     * 商标新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody TrademarkDto trademarkDto) {
+        trademarkService.add(trademarkDto);
+    }
+
+    /**
+     * 商标编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody TrademarkDto trademarkDto) {
+        trademarkService.edit(trademarkDto);
+    }
+
+    /**
+     * 商标删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        trademarkService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/dto/ArtCopyrightDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.art.dto;
+
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 美术版权新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ArtCopyrightDto extends ArtCopyright {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/dto/ArtCopyrightSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.art.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 美术版权列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ArtCopyrightSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/po/ArtCopyright.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.art.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 美术版权
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("art_copyright")
+public class ArtCopyright extends BasePo {
+
+    private String code;
+
+    private String name;
+
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/vo/ArtCopyrightVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.art.vo;
+
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 美术版权列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ArtCopyrightVo extends ArtCopyright {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/dto/ContractorDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.contractor.dto;
+
+import com.fjhx.common.entity.contractor.po.Contractor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 承包商新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ContractorDto extends Contractor {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/dto/ContractorSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.contractor.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 承包商列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ContractorSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/po/Contractor.java

@@ -0,0 +1,56 @@
+package com.fjhx.common.entity.contractor.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 承包商
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("contractor")
+public class Contractor extends BasePo {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 账户名称
+     */
+    private String accountName;
+
+    /**
+     * 账户开户行
+     */
+    private String accountBank;
+
+    /**
+     * 账户账号
+     */
+    private String accountNumber;
+
+    /**
+     * 税点
+     */
+    private String taxPoints;
+
+    /**
+     * 归属公司
+     */
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/vo/ContractorVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.contractor.vo;
+
+import com.fjhx.common.entity.contractor.po.Contractor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 承包商列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ContractorVo extends Contractor {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/dto/PatentDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.patent.dto;
+
+import com.fjhx.common.entity.patent.po.Patent;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 专利新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class PatentDto extends Patent {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/dto/PatentSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.patent.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 专利列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class PatentSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/po/Patent.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.patent.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 专利
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("patent")
+public class Patent extends BasePo {
+
+    private String code;
+
+    private String name;
+
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/vo/PatentVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.patent.vo;
+
+import com.fjhx.common.entity.patent.po.Patent;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 专利列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class PatentVo extends Patent {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/dto/TrademarkDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.trademark.dto;
+
+import com.fjhx.common.entity.trademark.po.Trademark;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商标新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class TrademarkDto extends Trademark {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/dto/TrademarkSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.trademark.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商标列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class TrademarkSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/po/Trademark.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.trademark.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 商标
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("trademark")
+public class Trademark extends BasePo {
+
+    private String code;
+
+    private String name;
+
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/vo/TrademarkVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.trademark.vo;
+
+import com.fjhx.common.entity.trademark.po.Trademark;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商标列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class TrademarkVo extends Trademark {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/art/ArtCopyrightMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.art;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 美术版权 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ArtCopyrightMapper extends BaseMapper<ArtCopyright> {
+
+    /**
+     * 美术版权分页
+     */
+    Page<ArtCopyrightVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ArtCopyright> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/contractor/ContractorMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.contractor;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contractor.po.Contractor;
+import com.fjhx.common.entity.contractor.vo.ContractorVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 承包商 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ContractorMapper extends BaseMapper<Contractor> {
+
+    /**
+     * 承包商分页
+     */
+    Page<ContractorVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Contractor> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/patent/PatentMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.patent;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.patent.po.Patent;
+import com.fjhx.common.entity.patent.vo.PatentVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 专利 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface PatentMapper extends BaseMapper<Patent> {
+
+    /**
+     * 专利分页
+     */
+    Page<PatentVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Patent> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/trademark/TrademarkMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.trademark;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.trademark.po.Trademark;
+import com.fjhx.common.entity.trademark.vo.TrademarkVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 商标 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface TrademarkMapper extends BaseMapper<Trademark> {
+
+    /**
+     * 商标分页
+     */
+    Page<TrademarkVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Trademark> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/service/art/ArtCopyrightService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.art;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.art.dto.ArtCopyrightDto;
+import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 美术版权 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ArtCopyrightService extends BaseService<ArtCopyright> {
+
+    /**
+     * 美术版权分页
+     */
+    Page<ArtCopyrightVo> getPage(ArtCopyrightSelectDto dto);
+
+    /**
+     * 美术版权明细
+     */
+    ArtCopyrightVo detail(Long id);
+
+    /**
+     * 美术版权新增
+     */
+    void add(ArtCopyrightDto artCopyrightDto);
+
+    /**
+     * 美术版权编辑
+     */
+    void edit(ArtCopyrightDto artCopyrightDto);
+
+    /**
+     * 美术版权删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/art/impl/ArtCopyrightServiceImpl.java

@@ -0,0 +1,88 @@
+package com.fjhx.common.service.art.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.art.dto.ArtCopyrightDto;
+import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.fjhx.common.mapper.art.ArtCopyrightMapper;
+import com.fjhx.common.service.art.ArtCopyrightService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 美术版权 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Service
+public class ArtCopyrightServiceImpl extends ServiceImpl<ArtCopyrightMapper, ArtCopyright> implements ArtCopyrightService {
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Override
+    public Page<ArtCopyrightVo> getPage(ArtCopyrightSelectDto dto) {
+        IWrapper<ArtCopyright> wrapper = getWrapper();
+
+        //关键字检索
+        wrapper.keyword(dto.getKeyword(), new SqlField("ac", ArtCopyright::getName), new SqlField("ac", ArtCopyright::getCode));
+        wrapper.orderByDesc("ac", ArtCopyright::getCreateTime);
+
+        wrapper.orderByDesc("ac", ArtCopyright::getId);
+        Page<ArtCopyrightVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ArtCopyrightVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+
+        //获取归属公司信息
+        Map<Long, String> deptMap = deptService.list().stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        //赋值数据
+        for (ArtCopyrightVo record : records) {
+            //赋值归属公司信息
+            record.setCompanyName(deptMap.get(record.getCompanyId()));
+        }
+
+        return page;
+    }
+
+    @Override
+    public ArtCopyrightVo detail(Long id) {
+        ArtCopyright ArtCopyright = this.getById(id);
+        ArtCopyrightVo result = BeanUtil.toBean(ArtCopyright, ArtCopyrightVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ArtCopyrightDto artCopyrightDto) {
+        this.save(artCopyrightDto);
+    }
+
+    @Override
+    public void edit(ArtCopyrightDto artCopyrightDto) {
+        this.updateById(artCopyrightDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/service/contractor/ContractorService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.contractor;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contractor.dto.ContractorDto;
+import com.fjhx.common.entity.contractor.dto.ContractorSelectDto;
+import com.fjhx.common.entity.contractor.po.Contractor;
+import com.fjhx.common.entity.contractor.vo.ContractorVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 承包商 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ContractorService extends BaseService<Contractor> {
+
+    /**
+     * 承包商分页
+     */
+    Page<ContractorVo> getPage(ContractorSelectDto dto);
+
+    /**
+     * 承包商明细
+     */
+    ContractorVo detail(Long id);
+
+    /**
+     * 承包商新增
+     */
+    void add(ContractorDto contractorDto);
+
+    /**
+     * 承包商编辑
+     */
+    void edit(ContractorDto contractorDto);
+
+    /**
+     * 承包商删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/contractor/impl/ContractorServiceImpl.java

@@ -0,0 +1,95 @@
+package com.fjhx.common.service.contractor.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.contractor.dto.ContractorDto;
+import com.fjhx.common.entity.contractor.dto.ContractorSelectDto;
+import com.fjhx.common.entity.contractor.po.Contractor;
+import com.fjhx.common.entity.contractor.vo.ContractorVo;
+import com.fjhx.common.mapper.contractor.ContractorMapper;
+import com.fjhx.common.service.contractor.ContractorService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 承包商 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Service
+public class ContractorServiceImpl extends ServiceImpl<ContractorMapper, Contractor> implements ContractorService {
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Override
+    public Page<ContractorVo> getPage(ContractorSelectDto dto) {
+        IWrapper<Contractor> wrapper = getWrapper();
+
+        //关键字检索
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("c", Contractor::getName),
+                new SqlField("c", Contractor::getCode),
+                new SqlField("c", Contractor::getAccountName),
+                new SqlField("c", Contractor::getAccountBank),
+                new SqlField("c", Contractor::getAccountNumber)
+        );
+        wrapper.orderByDesc("c", Contractor::getCreateTime);
+
+        wrapper.orderByDesc("c", Contractor::getId);
+        Page<ContractorVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        List<ContractorVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+
+        //获取归属公司信息
+        Map<Long, String> deptMap = deptService.list().stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        //赋值数据
+        for (ContractorVo record : records) {
+            //赋值归属公司信息
+            record.setCompanyName(deptMap.get(record.getCompanyId()));
+        }
+
+        return page;
+    }
+
+    @Override
+    public ContractorVo detail(Long id) {
+        Contractor Contractor = this.getById(id);
+        ContractorVo result = BeanUtil.toBean(Contractor, ContractorVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ContractorDto contractorDto) {
+        this.save(contractorDto);
+    }
+
+    @Override
+    public void edit(ContractorDto contractorDto) {
+        this.updateById(contractorDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/service/patent/PatentService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.patent;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.patent.dto.PatentDto;
+import com.fjhx.common.entity.patent.dto.PatentSelectDto;
+import com.fjhx.common.entity.patent.po.Patent;
+import com.fjhx.common.entity.patent.vo.PatentVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 专利 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface PatentService extends BaseService<Patent> {
+
+    /**
+     * 专利分页
+     */
+    Page<PatentVo> getPage(PatentSelectDto dto);
+
+    /**
+     * 专利明细
+     */
+    PatentVo detail(Long id);
+
+    /**
+     * 专利新增
+     */
+    void add(PatentDto patentDto);
+
+    /**
+     * 专利编辑
+     */
+    void edit(PatentDto patentDto);
+
+    /**
+     * 专利删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/patent/impl/PatentServiceImpl.java

@@ -0,0 +1,89 @@
+package com.fjhx.common.service.patent.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.patent.dto.PatentDto;
+import com.fjhx.common.entity.patent.dto.PatentSelectDto;
+import com.fjhx.common.entity.patent.po.Patent;
+import com.fjhx.common.entity.patent.vo.PatentVo;
+import com.fjhx.common.mapper.patent.PatentMapper;
+import com.fjhx.common.service.patent.PatentService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 专利 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Service
+public class PatentServiceImpl extends ServiceImpl<PatentMapper, Patent> implements PatentService {
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Override
+    public Page<PatentVo> getPage(PatentSelectDto dto) {
+        IWrapper<Patent> wrapper = getWrapper();
+
+        //关键字检索
+        wrapper.keyword(dto.getKeyword(), new SqlField("p", Patent::getName), new SqlField("p", Patent::getCode));
+        wrapper.orderByDesc("p", Patent::getCreateTime);
+
+        wrapper.orderByDesc("p", Patent::getId);
+        Page<PatentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        List<PatentVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+
+        //获取归属公司信息
+        Map<Long, String> deptMap = deptService.list().stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        //赋值数据
+        for (PatentVo record : records) {
+            //赋值归属公司信息
+            record.setCompanyName(deptMap.get(record.getCompanyId()));
+        }
+
+        return page;
+    }
+
+    @Override
+    public PatentVo detail(Long id) {
+        Patent Patent = this.getById(id);
+        PatentVo result = BeanUtil.toBean(Patent, PatentVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PatentDto patentDto) {
+        this.save(patentDto);
+    }
+
+    @Override
+    public void edit(PatentDto patentDto) {
+        this.updateById(patentDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/service/trademark/TrademarkService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.trademark;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.trademark.dto.TrademarkDto;
+import com.fjhx.common.entity.trademark.dto.TrademarkSelectDto;
+import com.fjhx.common.entity.trademark.po.Trademark;
+import com.fjhx.common.entity.trademark.vo.TrademarkVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 商标 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface TrademarkService extends BaseService<Trademark> {
+
+    /**
+     * 商标分页
+     */
+    Page<TrademarkVo> getPage(TrademarkSelectDto dto);
+
+    /**
+     * 商标明细
+     */
+    TrademarkVo detail(Long id);
+
+    /**
+     * 商标新增
+     */
+    void add(TrademarkDto trademarkDto);
+
+    /**
+     * 商标编辑
+     */
+    void edit(TrademarkDto trademarkDto);
+
+    /**
+     * 商标删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/trademark/impl/TrademarkServiceImpl.java

@@ -0,0 +1,88 @@
+package com.fjhx.common.service.trademark.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.trademark.dto.TrademarkDto;
+import com.fjhx.common.entity.trademark.dto.TrademarkSelectDto;
+import com.fjhx.common.entity.trademark.po.Trademark;
+import com.fjhx.common.entity.trademark.vo.TrademarkVo;
+import com.fjhx.common.mapper.trademark.TrademarkMapper;
+import com.fjhx.common.service.trademark.TrademarkService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 商标 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Service
+public class TrademarkServiceImpl extends ServiceImpl<TrademarkMapper, Trademark> implements TrademarkService {
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Override
+    public Page<TrademarkVo> getPage(TrademarkSelectDto dto) {
+        IWrapper<Trademark> wrapper = getWrapper();
+
+        //关键字检索
+        wrapper.keyword(dto.getKeyword(), new SqlField("t", Trademark::getName), new SqlField("t", Trademark::getCode));
+        wrapper.orderByDesc("t", Trademark::getCreateTime);
+
+        wrapper.orderByDesc("t", Trademark::getId);
+        Page<TrademarkVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<TrademarkVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+
+        //获取归属公司信息
+        Map<Long, String> deptMap = deptService.list().stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        //赋值数据
+        for (TrademarkVo record : records) {
+            //赋值归属公司信息
+            record.setCompanyName(deptMap.get(record.getCompanyId()));
+        }
+
+        return page;
+    }
+
+    @Override
+    public TrademarkVo detail(Long id) {
+        Trademark Trademark = this.getById(id);
+        TrademarkVo result = BeanUtil.toBean(Trademark, TrademarkVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(TrademarkDto trademarkDto) {
+        this.save(trademarkDto);
+    }
+
+    @Override
+    public void edit(TrademarkDto trademarkDto) {
+        this.updateById(trademarkDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-common/src/main/resources/mapper/art/ArtCopyrightMapper.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.art.ArtCopyrightMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.art.vo.ArtCopyrightVo">
+        select ac.id,
+               ac.code,
+               ac.name,
+               ac.company_id,
+               ac.create_user,
+               ac.create_time,
+               ac.update_user,
+               ac.update_time
+        from art_copyright ac
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-common/src/main/resources/mapper/contractor/ContractorMapper.xml

@@ -0,0 +1,21 @@
+<?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.contractor.ContractorMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.contractor.vo.ContractorVo">
+        select c.id,
+               c.name,
+               c.code,
+               c.account_name,
+               c.account_bank,
+               c.account_number,
+               c.tax_points,
+               c.company_id,
+               c.create_user,
+               c.create_time,
+               c.update_user,
+               c.update_time
+        from contractor c
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-common/src/main/resources/mapper/patent/PatentMapper.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.patent.PatentMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.patent.vo.PatentVo">
+        select p.id,
+               p.code,
+               p.name,
+               p.company_id,
+               p.create_user,
+               p.create_time,
+               p.update_user,
+               p.update_time
+        from patent p
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-common/src/main/resources/mapper/trademark/TrademarkMapper.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.trademark.TrademarkMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.trademark.vo.TrademarkVo">
+        select t.id,
+               t.code,
+               t.name,
+               t.company_id,
+               t.create_user,
+               t.create_time,
+               t.update_user,
+               t.update_time
+        from trademark t
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>