zhoulisky 9 months ago
parent
commit
60cd1d698a
17 changed files with 284 additions and 14 deletions
  1. 72 0
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/EnterpriseInfoEntity.java
  2. 4 0
      kd-service-api/kd-system-api/src/main/java/org/sky/system/pojo/entity/Tenant.java
  3. 54 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/EnterpriseInfoController.java
  4. 15 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/EnterpriseInfoMapper.java
  5. 32 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/EnterpriseInfoMapper.xml
  6. 30 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IEnterpriseInfoService.java
  7. 65 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/EnterpriseInfoServiceImpl.java
  8. 1 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsQtfyServiceImpl.java
  9. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsRyrgfyServiceImpl.java
  10. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsSjfyServiceImpl.java
  11. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWtwbyjkffyServiceImpl.java
  12. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWxzctxfyServiceImpl.java
  13. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZbtsysyfyServiceImpl.java
  14. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjfyycqdtfyServiceImpl.java
  15. 1 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjtrfyServiceImpl.java
  16. 3 4
      kd-service/kd-system/src/main/java/org/sky/system/controller/TenantController.java
  17. 1 1
      kd-service/kd-system/src/main/java/org/sky/system/mapper/DictMapper.xml

+ 72 - 0
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/EnterpriseInfoEntity.java

@@ -0,0 +1,72 @@
+
+package org.sky.scientific.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 企业基础信息表 实体类
+ *
+ * @author Kd
+ * @since 2025-08-14
+ */
+@Data
+@TableName("kd_enterprise_info")
+@Schema(description = "EnterpriseInfo对象")
+@EqualsAndHashCode(callSuper = true)
+public class EnterpriseInfoEntity extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "所属年份")
+	@NotNull(message = "请选择年份")
+	private String yearAndMonth;
+
+	@Schema(description = "本年度营业收入(万元)")
+	private BigDecimal currentYearIncome;
+
+	@Schema(description = "本年度研发费用(万元)")
+	private BigDecimal currentYearCost;
+
+	@Schema(description = "上年度营业收入(万元)")
+	private BigDecimal previousYearIncome;
+
+	@Schema(description = "上年度研发费用(万元)")
+	private BigDecimal previousYearCost;
+
+	@Schema(description = "上上年度营业收入(万元)")
+	private BigDecimal lastYearIncome;
+
+	@Schema(description = "上上年度研发费用(万元)")
+	private BigDecimal lastYearCost;
+
+	@Schema(description = "其他说明")
+	private String remark;
+
+	@Schema(description = "高企认定年度")
+	private String highTechYear;
+
+	@Schema(description = "高企编号")
+	private String highTechNumber;
+
+	@Schema(description = "高企证书URL")
+	private String highTechUrl;
+
+	@Schema(description = "一级高新领域")
+	private String highTechDomainL1;
+
+	@Schema(description = "二级高新领域")
+	private String highTechDomainL2;
+
+	@Schema(description = "三级高新领域")
+	private String highTechDomainL3;
+
+}

+ 4 - 0
kd-service-api/kd-system-api/src/main/java/org/sky/system/pojo/entity/Tenant.java

@@ -37,6 +37,10 @@ public class Tenant extends BaseEntity {
 	 */
 	@Schema(description = "租户名称")
 	private String tenantName;
+
+	@Schema(description = "logo地址")
+	private String logoUrl;
+
 	/**
 	 * 域名地址
 	 */

+ 54 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/EnterpriseInfoController.java

@@ -0,0 +1,54 @@
+
+package org.sky.scientific.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.sky.core.boot.ctrl.KdController;
+import org.sky.core.tool.api.R;
+import org.sky.scientific.pojo.entity.EnterpriseInfoEntity;
+import org.sky.scientific.service.IEnterpriseInfoService;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 企业基础信息表 控制器
+ *
+ * @author Kd
+ * @since 2025-08-14
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/enterpriseInfo")
+@Tag(name = "企业基础信息表", description = "企业基础信息表接口")
+public class EnterpriseInfoController extends KdController {
+
+	private final IEnterpriseInfoService enterpriseInfoService;
+
+	@GetMapping("/detail/{yearAndMonth}")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "获取指定年份的企业信息")
+	public R<EnterpriseInfoEntity> detail(@PathVariable("yearAndMonth") String yearAndMonth) {
+		EnterpriseInfoEntity detail = enterpriseInfoService.getOne(Wrappers.<EnterpriseInfoEntity>lambdaQuery().eq(EnterpriseInfoEntity::getYearAndMonth, yearAndMonth));
+		return R.data(detail);
+	}
+
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "新增或修改", description = "传入enterpriseInfo")
+	public R submit(@Valid @RequestBody EnterpriseInfoEntity enterpriseInfo) {
+		return R.status(enterpriseInfoService.submit(enterpriseInfo));
+	}
+
+	@GetMapping("/fetchLastYearData")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "读取上年度数据")
+	public R<EnterpriseInfoEntity> fetchLastYearData(EnterpriseInfoEntity enterpriseInfo) {
+		EnterpriseInfoEntity entity = enterpriseInfoService.fetchLastYearData(enterpriseInfo);
+		return R.data(entity);
+	}
+
+
+}

+ 15 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/EnterpriseInfoMapper.java

@@ -0,0 +1,15 @@
+
+package org.sky.scientific.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.sky.scientific.pojo.entity.EnterpriseInfoEntity;
+
+/**
+ * 企业基础信息表 Mapper 接口
+ *
+ * @author Kd
+ * @since 2025-08-14
+ */
+public interface EnterpriseInfoMapper extends BaseMapper<EnterpriseInfoEntity> {
+
+}

+ 32 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/EnterpriseInfoMapper.xml

@@ -0,0 +1,32 @@
+<?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.sky.scientific.mapper.EnterpriseInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="ResultMap" type="org.sky.scientific.pojo.entity.EnterpriseInfoEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="year_and_month" property="yearAndMonth"/>
+        <result column="current_year_income" property="currentYearIncome"/>
+        <result column="current_year_cost" property="currentYearCost"/>
+        <result column="previous_year_income" property="previousYearIncome"/>
+        <result column="previous_year_cost" property="previousYearCost"/>
+        <result column="last_year_income" property="lastYearIncome"/>
+        <result column="last_year_cost" property="lastYearCost"/>
+        <result column="remark" property="remark"/>
+        <result column="high_tech_year" property="highTechYear"/>
+        <result column="high_tech_number" property="highTechNumber"/>
+        <result column="high_tech_url" property="highTechUrl"/>
+        <result column="high_tech_domain_l1" property="highTechDomainL1"/>
+        <result column="high_tech_domain_l2" property="highTechDomainL2"/>
+        <result column="high_tech_domain_l3" property="highTechDomainL3"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+</mapper>

+ 30 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IEnterpriseInfoService.java

@@ -0,0 +1,30 @@
+
+package org.sky.scientific.service;
+
+import org.sky.core.mp.base.BaseService;
+import org.sky.scientific.pojo.entity.EnterpriseInfoEntity;
+
+/**
+ * 企业基础信息表 服务类
+ *
+ * @author Kd
+ * @since 2025-08-14
+ */
+public interface IEnterpriseInfoService extends BaseService<EnterpriseInfoEntity> {
+
+	/**
+	 * 获取上一年度数据
+	 *
+	 * @param enterpriseInfo
+	 * @return
+	 */
+	EnterpriseInfoEntity fetchLastYearData(EnterpriseInfoEntity enterpriseInfo);
+
+	/**
+	 * 新增或修改
+	 *
+	 * @param enterpriseInfo
+	 * @return
+	 */
+	boolean submit(EnterpriseInfoEntity enterpriseInfo);
+}

+ 65 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/EnterpriseInfoServiceImpl.java

@@ -0,0 +1,65 @@
+
+package org.sky.scientific.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.sky.core.log.exception.ServiceException;
+import org.sky.core.mp.base.BaseServiceImpl;
+import org.sky.core.tool.utils.DateUtil;
+import org.sky.core.tool.utils.Func;
+import org.sky.scientific.mapper.EnterpriseInfoMapper;
+import org.sky.scientific.pojo.entity.EnterpriseInfoEntity;
+import org.sky.scientific.service.IEnterpriseInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 企业基础信息表 服务实现类
+ *
+ * @author Kd
+ * @since 2025-08-14
+ */
+@Service
+public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMapper, EnterpriseInfoEntity> implements IEnterpriseInfoService {
+
+	@Override
+	public EnterpriseInfoEntity fetchLastYearData(EnterpriseInfoEntity enterpriseInfo) {
+		if (Func.isBlank(enterpriseInfo.getYearAndMonth())) {
+			throw new ServiceException("参数yearAndMonth不能为空");
+		}
+		String lastYear = DateUtil.format(DateUtil.minusYears(DateUtil.parse(enterpriseInfo.getYearAndMonth(), DateUtil.PATTERN_YYYY), 1), DateUtil.PATTERN_YYYY);
+		LambdaQueryWrapper<EnterpriseInfoEntity> eq = Wrappers.<EnterpriseInfoEntity>lambdaQuery()
+			.eq(EnterpriseInfoEntity::getYearAndMonth, lastYear);
+		EnterpriseInfoEntity one = this.getOne(eq);
+		if (Func.isNull(one)) {
+			throw new ServiceException("上年度没有数据");
+		}
+		one.setId(null);
+		one.setYearAndMonth(enterpriseInfo.getYearAndMonth());
+		return this.save(one) ? one : null;
+	}
+
+	@Override
+	public boolean submit(EnterpriseInfoEntity enterpriseInfo) {
+		if (Func.isBlank(enterpriseInfo.getYearAndMonth())) {
+			throw new ServiceException("参数yearAndMonth不能为空");
+		}
+		boolean result = this.saveOrUpdate(enterpriseInfo);
+
+//		LambdaQueryWrapper<EnterpriseInfoEntity> eq = Wrappers.<EnterpriseInfoEntity>lambdaQuery()
+//			.eq(EnterpriseInfoEntity::getYearAndMonth, enterpriseInfo.getYearAndMonth());
+//		EnterpriseInfoEntity one = this.getOne(eq);
+//
+//		if (Func.isNull(enterpriseInfo.getId())) {
+//			//新增
+//
+//
+//		} else {
+//			//修改
+//			if(Func.equals(enterpriseInfo.getId(), one.getId())){
+//				result = this.updateById(enterpriseInfo);
+//			}
+//
+//		}
+		return result;
+	}
+}

+ 1 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsQtfyServiceImpl.java

@@ -71,8 +71,7 @@ public class YsQtfyServiceImpl extends BaseServiceImpl<YsQtfyMapper, YsQtfyEntit
 			throw new ServiceException("研发项目不存在");
 		}
 
-
-		List<YsQtfyExcel> dataList = ExcelUtil.read(file, 8, 3, YsQtfyExcel.class);
+		List<YsQtfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsQtfyExcel.class);
 		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsRyrgfyServiceImpl.java

@@ -70,7 +70,7 @@ public class YsRyrgfyServiceImpl extends BaseServiceImpl<YsRyrgfyMapper, YsRyrgf
 			throw new ServiceException(xmVO.getXmkssj() + "花名册无数据");
 		}
 
-		List<YsRyrgfyExcel> dataList = ExcelUtil.read(file, 1, 3, YsRyrgfyExcel.class);
+		List<YsRyrgfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsRyrgfyExcel.class);
 
 		List<YsRyrgfyEntity> dbYsList = baseMapper.selectList(Wrappers.<YsRyrgfyEntity>lambdaQuery().eq(YsRyrgfyEntity::getXmId, xmId));
 

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsSjfyServiceImpl.java

@@ -71,7 +71,7 @@ public class YsSjfyServiceImpl extends BaseServiceImpl<YsSjfyMapper, YsSjfyEntit
 		}
 
 
-		List<YsSjfyExcel> dataList = ExcelUtil.read(file, 5, 3, YsSjfyExcel.class);
+		List<YsSjfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsSjfyExcel.class);
 		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWtwbyjkffyServiceImpl.java

@@ -62,7 +62,7 @@ public class YsWtwbyjkffyServiceImpl extends BaseServiceImpl<YsWtwbyjkffyMapper,
 			throw new ServiceException("请选择研发项目");
 		}
 
-		List<YsWtwbyjkffyExcel> dataList = ExcelUtil.read(file, 7, 3, YsWtwbyjkffyExcel.class);
+		List<YsWtwbyjkffyExcel> dataList = ExcelUtil.read(file, 0, 3, YsWtwbyjkffyExcel.class);
 		if(Func.isEmpty(dataList)){
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsWxzctxfyServiceImpl.java

@@ -95,7 +95,7 @@ public class YsWxzctxfyServiceImpl extends BaseServiceImpl<YsWxzctxfyMapper, YsW
 			throw new ServiceException(xmVO.getXmkssj() + "资产清单无数据");
 		}
 
-		List<YsWxzctxfyExcel> dataList = ExcelUtil.read(file, 4, 3, YsWxzctxfyExcel.class);
+		List<YsWxzctxfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsWxzctxfyExcel.class);
 		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZbtsysyfyServiceImpl.java

@@ -66,7 +66,7 @@ public class YsZbtsysyfyServiceImpl extends BaseServiceImpl<YsZbtsysyfyMapper, Y
 			throw new ServiceException("请选择研发项目");
 		}
 
-		List<YsZbtsysyfyExcel> dataList = ExcelUtil.read(file, 6, 3, YsZbtsysyfyExcel.class);
+		List<YsZbtsysyfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsZbtsysyfyExcel.class);
 		if (Func.isEmpty(dataList)) {
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjfyycqdtfyServiceImpl.java

@@ -82,7 +82,7 @@ public class YsZjfyycqdtfyServiceImpl extends BaseServiceImpl<YsZjfyycqdtfyMappe
 			throw new ServiceException(xmVO.getXmkssj() + "资产清单无数据");
 		}
 
-		List<YsZjfyycqdtfyExcel> dataList = ExcelUtil.read(file, 3, 3, YsZjfyycqdtfyExcel.class);
+		List<YsZjfyycqdtfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsZjfyycqdtfyExcel.class);
 		if(Func.isEmpty(dataList)){
 			throw new ServiceException("读取导入数据失败,请检查数据");
 		}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjtrfyServiceImpl.java

@@ -81,7 +81,7 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 			throw new ServiceException("研发项目不存在");
 		}
 
-		List<YsZjtrfyExcel> dataList = ExcelUtil.read(file, 2, 3, YsZjtrfyExcel.class);
+		List<YsZjtrfyExcel> dataList = ExcelUtil.read(file, 0, 3, YsZjtrfyExcel.class);
 
 		List<YsZjtrfyEntity> insertList = new ArrayList<>();
 		int batchCount = 20;

+ 3 - 4
kd-service/kd-system/src/main/java/org/sky/system/controller/TenantController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -48,7 +47,7 @@ import static org.sky.system.cache.SysCache.TENANT_TENANT_ID;
  *
  */
 @NonDS
-@Hidden
+//@Hidden
 @RestController
 @AllArgsConstructor
 @RequestMapping("/tenant")
@@ -62,7 +61,7 @@ public class TenantController extends KdController {
 	/**
 	 * 详情
 	 */
-	@IsAdmin
+//	@IsAdmin
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@Operation(summary = "详情", description = "传入tenant")
@@ -117,7 +116,7 @@ public class TenantController extends KdController {
 	/**
 	 * 新增或修改
 	 */
-	@IsAdministrator
+//	@IsAdministrator
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "新增或修改", description = "传入tenant")

+ 1 - 1
kd-service/kd-system/src/main/java/org/sky/system/mapper/DictMapper.xml

@@ -48,7 +48,7 @@
         SELECT dict_value
         FROM kd_dict
         WHERE code = #{code}
-          and dict_key = #{dictValue}
+          and dict_key = #{dictKey}
           and parent_id != 0
     </select>