bugfix和新表

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -114,6 +115,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
         declarationRecords.setMatter("提交做大做强奖补申请");
         declarationRecords.setDetailId(bmsBigStrongAward.getId());
         declarationRecords.setEnterpriseId(enterpriseId);
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBrandingAwardServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +91,7 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
         declarationRecords.setMatter("提交品牌打造奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsBrandingAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCarrierConstructionAwardServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -91,6 +92,7 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
         declarationRecords.setMatter("提交载体建设奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsCarrierConstructionAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +91,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
         declarationRecords.setMatter("提交信用管理奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsCreditManagement.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -89,6 +90,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
         declarationRecords.setMatter("提交5G+工业互联网奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsIndustrialInternetAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +91,7 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
         declarationRecords.setMatter("提交两业融合奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsIntegrationIndustries.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsLogisticsDevelopmentAwardServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -91,6 +92,7 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
         declarationRecords.setMatter("提交物流发展奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsLogisticsDevelopmentAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -89,6 +90,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
         declarationRecords.setMatter("提交制造服务业有效投入奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsManufacturingServicesAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsPlatformConstructionAwardServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,6 +93,7 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
         declarationRecords.setMatter("提交平台建设奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsPlatformConstructionAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsProjectSettlementAwardServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
+import java.time.Year;
 import java.util.*;
 
 /**
@@ -119,6 +120,7 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
         declarationRecords.setMatter("提交落户奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(projectSettlementAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.Year;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +91,7 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
         declarationRecords.setMatter("提交场景开放奖补申请");
         declarationRecords.setEnterpriseId(enterpriseId);
         declarationRecords.setDetailId(bmsSceneOpeningAward.getId());
+        declarationRecords.setYear(String.valueOf(Year.now().getValue()));
         iBmsDeclarationRecordsService.save(declarationRecords);
 
         Map<String, String> allJson = getAllJson(declarationRecords.getId());

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.jjh.ent.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
+import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
+import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.Arrays;
+
+/**
+ * 企业联系人（j_enterprise_contact）表控制层
+ * @author du
+ * @since 2024/5/13 9:56
+ */
+@RestController
+@RequestMapping("/jjh/jEnterpriseContact")
+@Api(tags = "企业联系人")
+public class JEnterpriseContactController extends BaseController {
+
+    @Resource
+    private JEnterpriseContactService jEnterpriseContactService;
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param page               分页对象
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation(value = "分页查询所有数据", response = JEnterpriseContact.class)
+    @GetMapping
+    public AjaxResult selectAll(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest) {
+        return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest));
+    }
+
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @ApiOperation(value = "通过主键查询单条数据", response = JEnterpriseContact.class)
+    @GetMapping("{id}")
+    public AjaxResult selectOne(@PathVariable Serializable id) {
+        return success(jEnterpriseContactService.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param jEnterpriseContact 实体对象
+     * @return 新增结果
+     */
+    @ApiOperation(value = "新增数据")
+    @PostMapping
+    public AjaxResult insert(@RequestBody JEnterpriseContact jEnterpriseContact) {
+        return success(jEnterpriseContactService.save(jEnterpriseContact));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param jEnterpriseContact 实体对象
+     * @return 修改结果
+     */
+    @ApiOperation(value = "修改数据")
+    @PutMapping
+    public AjaxResult update(@RequestBody JEnterpriseContact jEnterpriseContact) {
+        return success(jEnterpriseContactService.updateById(jEnterpriseContact));
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @ApiOperation(value = "删除数据")
+    @DeleteMapping
+    public AjaxResult delete(@RequestParam("id") Long[] id) {
+        return success(jEnterpriseContactService.removeByIds(Arrays.asList(id)));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JEnterpriseContact.java

@@ -0,0 +1,84 @@
+package com.ruoyi.jjh.ent.entity;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.jjh.common.entity.BaseInfoEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 企业联系人（j_enterprise_contact）表实体类
+ * @author du
+ * @since 2024/5/13 9:49
+ */
+@Data
+@ApiModel("企业联系人表")
+@TableName(value = "j_enterprise_contact")
+public class JEnterpriseContact extends BaseInfoEntity {
+
+    /**
+     * Id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty("Id")
+    private Long id;
+
+    /**
+     * 企业名称
+     */
+    @Excel(name = "企业名称")
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
+    /**
+     * 统一社会信用代码
+     */
+    @Excel(name = "统一社会信用代码")
+    @ApiModelProperty("统一社会信用代码")
+    private String enterpriseCode;
+
+    /**
+     * 常用联系人姓名
+     */
+    @Excel(name = "常用联系人姓名")
+    @ApiModelProperty("常用联系人姓名")
+    private String contactName;
+
+    /**
+     * 常用联系人职务
+     */
+    @Excel(name = "常用联系人职务")
+    @ApiModelProperty("常用联系人职务")
+    private String contactOffice;
+
+    /**
+     * 常用联系人手机号
+     */
+    @Excel(name = "常用联系人手机号")
+    @ApiModelProperty("常用联系人手机号")
+    private String contactPhone;
+
+    /**
+     * 常用联系人邮箱
+     */
+    @Excel(name = "常用联系人邮箱")
+    @ApiModelProperty("常用联系人邮箱")
+    private String contactEmail;
+
+
+    /**
+     * 创建id
+     */
+    @JSONField(serialize=false)
+    @TableField(fill = FieldFill.INSERT)
+    private Long createId;
+
+    /**
+     * 更新id
+     */
+    @JSONField(serialize=false)
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updateId;
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JEnterpriseContactRequest.java

@@ -0,0 +1,28 @@
+package com.ruoyi.jjh.ent.entity.request;
+
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 企业联系人请求类
+ * @author du
+ * @since 2024/5/13 10:06
+ */
+@Data
+@ApiModel("企业联系人请求类")
+public class JEnterpriseContactRequest {
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
+    /**
+     * 统一社会信用代码
+     */
+    @ApiModelProperty("统一社会信用代码")
+    private String enterpriseCode;
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JEnterpriseContactMapper.java

@@ -0,0 +1,17 @@
+package com.ruoyi.jjh.ent.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
+import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 企业联系人（j_enterprise_contact）表数据层
+ * @author du
+ * @since 2024/5/6 13:57
+ */
+public interface JEnterpriseContactMapper extends BaseMapper<JEnterpriseContact> {
+
+    Page<JEnterpriseContact> page(Page<JEnterpriseContact> page,@Param("req") JEnterpriseContactRequest jEnterpriseContactRequest);
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JEnterpriseContactService.java

@@ -0,0 +1,25 @@
+package com.ruoyi.jjh.ent.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
+import com.ruoyi.jjh.ent.entity.JPolicyFile;
+import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
+import com.ruoyi.jjh.ent.entity.request.JPolicyFileRequest;
+
+/**
+ * 企业联系人（j_enterprise_contact）表业务层
+ * @author du
+ * @since 2024/5/13 9:58
+ */
+public interface JEnterpriseContactService extends IService<JEnterpriseContact> {
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param page     分页对象
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
+    Page<JEnterpriseContact> page(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest);
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JEnterpriseContactImpl.java

@@ -0,0 +1,30 @@
+package com.ruoyi.jjh.ent.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
+import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
+import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper;
+import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 企业联系人（j_enterprise_contact）表业务处理层
+ * @author du
+ * @since 2024/5/13 9:58
+ */
+@Service
+public class JEnterpriseContactImpl extends ServiceImpl<JEnterpriseContactMapper, JEnterpriseContact> implements JEnterpriseContactService {
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param page     分页对象
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public Page<JEnterpriseContact> page(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest) {
+        return baseMapper.page(page, jEnterpriseContactRequest);
+    }
+}

ruoyi-admin/src/main/resources/mapper/jjh/ent/JEnterpriseContactMapper.xml

@@ -0,0 +1,19 @@
+<?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.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper">
+
+    <select id="page" resultType="com.ruoyi.jjh.ent.entity.JEnterpriseContact">
+        select * from j_enterprise_contact
+        <where>
+            <if test="req.enterpriseName != null and req.enterpriseName != '' ">
+                and enterprise_name like concat('%',#{req.enterpriseName},'%')
+            </if>
+            <if test="req.enterpriseCode != null and req.enterpriseCode != '' ">
+                and enterprise_code like concat('%',#{req.enterpriseCode},'%')
+            </if>
+        </where>
+        order by create_time  desc
+    </select>
+</mapper>