Browse Source

对外报表

zhouli 9 months ago
parent
commit
057db9f258
21 changed files with 611 additions and 343 deletions
  1. 34 0
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/A107012.java
  2. 47 0
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/A107041.java
  3. 33 0
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/A107_1.java
  4. 66 0
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/A107_2.java
  5. 31 0
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/HighTechYB.java
  6. 4 99
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107012VO.java
  7. 7 28
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107041VO.java
  8. 4 10
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107_1VO.java
  9. 36 84
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107_2VO.java
  10. 5 7
      kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/HighTechYBVO.java
  11. 71 2
      kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/EnterpriseController.java
  12. 3 36
      kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/XmController.java
  13. 16 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107012Mapper.java
  14. 16 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107041Mapper.java
  15. 16 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107_1Mapper.java
  16. 16 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107_2Mapper.java
  17. 16 0
      kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/HighTechYbMapper.java
  18. 74 1
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IEnterpriseInfoService.java
  19. 3 34
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IXmService.java
  20. 110 4
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/EnterpriseInfoServiceImpl.java
  21. 3 38
      kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmServiceImpl.java

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

@@ -0,0 +1,34 @@
+package org.sky.scientific.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("kd_a107012")
+@Schema(description = "A107012研发费用加计扣除优惠明细表")
+public class A107012 extends TenantEntity {
+
+	@Schema(description = "所属年份,yyyy")
+	@NotBlank(message = "参数yearAndMonth不能为空")
+	@Size(min = 4, max = 4, message = "参数yearAndMonth为年份,如:yyyy")
+	private String yearAndMonth;
+
+	@Schema(description = "四、本年形成无形资产摊销额")
+	private BigDecimal d43;
+	@Schema(description = "五、以前年度形成无形资产本年摊销额")
+	private BigDecimal d44;
+	@Schema(description = "减:特殊收入部分")
+	private BigDecimal d46;
+	@Schema(description = "减:当年销售研发活动直接形成产品(包括组成部分)对应的材料部分")
+	private BigDecimal d48;
+	@Schema(description = "减:以前年度销售研发活动直接形成产品(包括组成部分)对应的材料部分结转金额")
+	private BigDecimal d49;
+}

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

@@ -0,0 +1,47 @@
+package org.sky.scientific.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("kd_a107041")
+@Schema(description = "A107041高新技术企业优惠情况及明细表")
+public class A107041 extends TenantEntity {
+
+	@Schema(description = "所属年份,yyyy")
+	@NotBlank(message = "参数yearAndMonth不能为空")
+	@Size(min = 4, max = 4, message = "参数yearAndMonth为年份,如:yyyy")
+	private String yearAndMonth;
+
+	@Schema(description = " 其中:产品(服务)收入")
+	private BigDecimal d5;
+
+	@Schema(description = " 技术性收入")
+	private BigDecimal d6;
+
+	@Schema(description = "其中:收入总额")
+	private BigDecimal d8;
+
+	@Schema(description = "不征税收入")
+	private BigDecimal d9;
+	@Schema(description = "五、本年职工总数")
+	private Integer d12;
+	@Schema(description = "八、销售(营业)收入 本年度")
+	private BigDecimal d29_1;
+	@Schema(description = "八、销售(营业)收入 前一年度")
+	private BigDecimal d29_2;
+	@Schema(description = "八、销售(营业)收入 前二年度")
+	private BigDecimal d29_3;
+	@Schema(description = "十、国家需要重点扶持的高新技术企业减征企业所得税")
+	private BigDecimal d31;
+	@Schema(description = "十一、经济特区和上海浦东新区新设立的高新技术企业定期减免税额")
+	private BigDecimal d32;
+}

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

@@ -0,0 +1,33 @@
+package org.sky.scientific.pojo.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(description = "107-1 企业研究开发项目情况")
+public class A107_1 extends TenantEntity {
+
+	@Schema(description = "所属年份,yyyy")
+	@NotBlank(message = "参数yearAndMonth不能为空")
+	@Size(min = 4, max = 4, message = "参数yearAndMonth为年份,如:yyyy")
+	private String yearAndMonth;
+
+	@Schema(description = "研发项目id")
+	@NotNull(message = "参数xmId不能为空")
+	private Long xmId;
+
+	@Schema(description = "跨年项目当年所处主要进阶段")
+	private String xmStage;
+
+	@Schema(description = "其中:政府奖金")
+	private BigDecimal govBonus;
+
+}

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

@@ -0,0 +1,66 @@
+package org.sky.scientific.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("kd_107_2")
+@Schema(description = "107-2 企业研究开发活动及相关情况")
+public class A107_2 extends TenantEntity {
+
+	@Schema(description = "所属年份,yyyy")
+	@NotBlank(message = "参数yearAndMonth不能为空")
+	@Size(min = 4, max = 4, message = "参数yearAndMonth为年份,如:yyyy")
+	private String yearAndMonth;
+
+	@Schema(description = "其中:管理和服务人员,手填")
+	private Integer d2;
+	@Schema(description = "3.来自银行贷款")
+	private BigDecimal d58;
+	@Schema(description = "4.来自风险投资")
+	private BigDecimal d55;
+	@Schema(description = "5.来自其他渠道")
+	private BigDecimal d56;
+	@Schema(description = "高新技术企业减免税金额")
+	private BigDecimal d45;
+	@Schema(description = "期末机构数")
+	private Integer d22;
+	@Schema(description = "机构研究开发人员")
+	private Integer d23;
+	@Schema(description = "其中:博士毕业")
+	private Integer d24;
+	@Schema(description = "硕士毕业")
+	private Integer d25;
+	@Schema(description = "机构研究开发费用")
+	private BigDecimal d26;
+	@Schema(description = "专利所有权转让及许可数")
+	private Integer d53;
+	@Schema(description = "专利所有权转让及许可收入")
+	private BigDecimal d54;
+	@Schema(description = "新产品销售收入")
+	private BigDecimal d36;
+	@Schema(description = "其中:出口")
+	private BigDecimal d37;
+	@Schema(description = "期末拥有注册商标")
+	private Integer d38;
+	@Schema(description = "技术改造经费支出")
+	private BigDecimal d46;
+	@Schema(description = "购买境内技术经费支出")
+	private BigDecimal d47;
+	@Schema(description = "引进境外技术经费支出")
+	private BigDecimal d48;
+	@Schema(description = "引进境外技术的消化吸收经费支出")
+	private BigDecimal d49;
+	@Schema(description = "期末企业在境外设立的研究开发机构数")
+	private Integer d50;
+	@Schema(description = "附件")
+	private String fj;
+}

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

@@ -0,0 +1,31 @@
+package org.sky.scientific.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.core.tenant.mp.TenantEntity;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("kd_high_tech_yearbook")
+@Schema(description = "高企年报")
+public class HighTechYB extends TenantEntity {
+
+	@Schema(description = "所属年份,yyyy")
+	@NotBlank(message = "参数yearAndMonth不能为空")
+	@Size(min = 4, max = 4, message = "参数yearAndMonth为年份,如:yyyy")
+	private String yearAndMonth;
+
+	@Schema(description = "职工总数")
+	private Integer d13;
+
+	@Schema(description = "新增就业人员数")
+	private Integer d15;
+
+	@Schema(description = "其中:吸纳高校应届毕业生人数")
+	private Integer d16;
+
+}

+ 4 - 99
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107012VO.java

@@ -2,12 +2,15 @@ package org.sky.scientific.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.scientific.pojo.entity.A107012;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "A107012研发费用加计扣除优惠明细表")
-public class A107012VO {
+public class A107012VO extends A107012 {
 
 	@Schema(description = "本年可享受研发费用加计扣除项目数量")
 	private Integer d1;
@@ -60,112 +63,14 @@ public class A107012VO {
 	@Schema(description = "(二)本年资本化金额")
 	private BigDecimal d42;
 
-	@Schema(description = "四、本年形成无形资产摊销额")
-	private BigDecimal d43;
-
-	@Schema(description = "五、以前年度形成无形资产本年摊销额")
-	private BigDecimal d44;
-
 	@Schema(description = "六、允许扣除的研发费用合计(41+43+44)")
 	private BigDecimal d45;
-
-	@Schema(description = "减:特殊收入部分")
-	private BigDecimal d46;
-
 	@Schema(description = "七、允许扣除的研发费用抵减特殊收入后的金额(45-46)")
 	private BigDecimal d47;
 
-	@Schema(description = "减:当年销售研发活动直接形成产品(包括组成部分)对应的材料部分")
-	private BigDecimal d48;
-
-	@Schema(description = "减:以前年度销售研发活动直接形成产品(包括组成部分)对应的材料部分结转金额")
-	private BigDecimal d49;
-
 	@Schema(description = "九、本年研发费用加计扣除总额(47-48-49)×50")
 	private BigDecimal d51;
 
 	@Schema(description = "十、销售研发活动直接形成产品(包括组成部分)对应材料部分转移以后年度扣减金额(当47-48-49≥0,本行=0;当47-48-49<0,本行=47-48-49的绝对值)")
 	private BigDecimal d52;
-
-
-
-//	@Schema(description = "本年可享受研发费用加计扣除项目数量")
-//	private Integer bnkxsyffyjjkcxmsl;
-//
-//	@Schema(description = "一、自主研发、合作研发、集中研发(3+7+16+19+23+34)")
-//	private BigDecimal zzyf_hzyf_jzyf;
-//
-//	@Schema(description = "(一)人员人工费用(4+5+6)")
-//	private BigDecimal ryrgfy;
-//
-//	@Schema(description = "(二)直接投入费用(8+9+10+11+12+13+14+15)")
-//	private BigDecimal zjtrfy;
-//
-//	@Schema(description = "(三)折旧费用(17+18)")
-//	private BigDecimal zjfy;
-//
-//	@Schema(description = "(四)无形资产摊销(20+21+22)")
-//	private BigDecimal wxzctx;
-//
-//	@Schema(description = "(五)新产品设计费(24+25+26+27)")
-//	private BigDecimal xcpsjf;
-//
-//	@Schema(description = "(六)其他相关费用(29+30+31+32+33)")
-//	private BigDecimal qtxgfy;
-//
-//	@Schema(description = "(七)经限额调整后的其他相关费用")
-//	private BigDecimal jxetzhdqtxgfy;
-//
-//	@Schema(description = "二、委托研发(36+37+39)")
-//	private BigDecimal wtyf;
-//
-//	@Schema(description = "(一)委托境内机构或个人进行研发活动所发生的费用")
-//	private BigDecimal wtjnjghgrjxyfhdsfsdyf;
-//
-//	@Schema(description = "(二)委托境外机构进行研发活动发生的费用")
-//	private BigDecimal wtjwjgjxyfhdfsdfy;
-//
-//	@Schema(description = "其中:允许加计扣除的委托境外机构进行研发活动发生的费用")
-//	private BigDecimal yxjjkcdwtjwjgjxyfhdfsdfy;
-//
-//	@Schema(description = "(三)委托境外个人进行研发活动发生的费用")
-//	private BigDecimal wtjwgrjxyfhdfsdfy;
-//
-//	@Schema(description = "三、年度研发费用小计(2+36×80%+38)")
-//	private BigDecimal ndyffyxj;
-//
-//	@Schema(description = "(一)本年费用化金额")
-//	private BigDecimal bnfyhje;
-//
-//	@Schema(description = "(二)本年资本化金额")
-//	private BigDecimal bnzbhje;
-//
-//	@Schema(description = "四、本年形成无形资产摊销额")
-//	private BigDecimal bnxcwxzctxe;
-//
-//	@Schema(description = "五、以前年度形成无形资产本年摊销额")
-//	private BigDecimal yqndxcwxzcbntxe;
-//
-//	@Schema(description = "六、允许扣除的研发费用合计(41+43+44)")
-//	private BigDecimal yxkcdyffyhj;
-//
-//	@Schema(description = "减:特殊收入部分")
-//	private BigDecimal tssrbf;
-//
-//	@Schema(description = "七、允许扣除的研发费用抵减特殊收入后的金额(45-46)")
-//	private BigDecimal yxkcdyffydjtssrhdje;
-//
-//	@Schema(description = "减:当年销售研发活动直接形成产品(包括组成部分)对应的材料部分")
-//	private BigDecimal dnxsyfhdzjxccpdydclbf;
-//
-//	@Schema(description = "减:以前年度销售研发活动直接形成产品(包括组成部分)对应的材料部分结转金额")
-//	private BigDecimal yqndxsyfhdzjzxcpdydclbfjzje;
-//
-//	@Schema(description = "九、本年研发费用加计扣除总额(47-48-49)×50")
-//	private BigDecimal bndyffyjjkcze;
-//
-//	@Schema(description = "十、销售研发活动直接形成产品(包括组成部分)对应材料部分转移以后年度扣减金额(当47-48-49≥0,本行=0;当47-48-49<0,本行=47-48-49的绝对值)")
-//	private BigDecimal yxkcdyffydjtssrhdje;
-
-
 }

+ 7 - 28
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107041VO.java

@@ -2,12 +2,15 @@ package org.sky.scientific.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.scientific.pojo.entity.A107041;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "A107041高新技术企业优惠情况及明细表")
-public class A107041VO {
+public class A107041VO extends A107041 {
 
 	@Schema(description = "一级领域")
 	private String d1;
@@ -19,30 +22,15 @@ public class A107041VO {
 	@Schema(description = "一、本年高新技术产品(服务)收入(5+6)")
 	private BigDecimal d4;
 
-	@Schema(description = " 其中:产品(服务)收入")
-	private BigDecimal d5;
-
-	@Schema(description = " 技术性收入")
-	private BigDecimal d6;
-
 	@Schema(description = "二、本年企业总收入(6-9)")
 	private BigDecimal d7;
 
-	@Schema(description = "其中:收入总额")
-	private BigDecimal d8;
-
-	@Schema(description = "不征税收入")
-	private BigDecimal d9;
-
 	@Schema(description = "三、本年高新技术产品(服务)收入占企业总收入的比例(4÷7)")
 	private BigDecimal d10;
 
 	@Schema(description = "四、本年企业成本(10-13)")
 	private Integer d11;
 
-	@Schema(description = "五、本年职工总数")
-	private Integer d12;
-
 	@Schema(description = "六、本年科技人员占企业当年职工总数的比例(11÷12)")
 	private BigDecimal d13;
 
@@ -55,7 +43,6 @@ public class A107041VO {
 	@Schema(description = "七、归集的高新研发费用金额(16+25)合计")
 	private BigDecimal d15_4;
 
-
 	@Schema(description = "一)内部研究开发投入 本年度")
 	private BigDecimal d16_1;
 	@Schema(description = "一)内部研究开发投入 前一年度")
@@ -174,20 +161,12 @@ public class A107041VO {
 	@Schema(description = "其中:可计入研发费用的境外的外部研发费 合计")
 	private BigDecimal d28_4;
 
-	@Schema(description = "八、销售(营业)收入 本年度")
-	private BigDecimal d29_1;
-	@Schema(description = "八、销售(营业)收入 前一年度")
-	private BigDecimal d29_2;
-	@Schema(description = "八、销售(营业)收入 前二年度")
-	private BigDecimal d29_3;
+
 	@Schema(description = "八、销售(营业)收入 合计")
 	private BigDecimal d29_4;
 
 	@Schema(description = "九、三年研发费用占销售(营业)收入的比例(15行第4列/29行第4列)")
-	private BigDecimal d30_4;
-	@Schema(description = "十、国家需要重点扶持的高新技术企业减征企业所得税")
-	private BigDecimal d31_4;
-	@Schema(description = "十一、经济特区和上海浦东新区新设立的高新技术企业定期减免税额")
-	private BigDecimal d32_4;
+	private BigDecimal d30;
+
 
 }

+ 4 - 10
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107_1VO.java

@@ -3,18 +3,18 @@ package org.sky.scientific.pojo.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.sky.core.tool.utils.DateUtil;
+import org.sky.scientific.pojo.entity.A107_1;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "107-1 企业研究开发项目情况")
-public class A107_1VO {
-
-	@Schema(description = "研发项目id")
-	private Long xmId;
+public class A107_1VO extends A107_1 {
 
 	@Schema(description = "研发项目名称")
 	private String xmmc;
@@ -41,9 +41,6 @@ public class A107_1VO {
 	@JsonFormat(pattern = DateUtil.PATTERN_YYYYMM)
 	private Date jssj;
 
-	@Schema(description = "跨年项目当年所处主要进阶段")
-	private String xmStage;
-
 	@Schema(description = "项目研究开发人员(人)")
 	private Long technicianCount;
 
@@ -53,9 +50,6 @@ public class A107_1VO {
 	@Schema(description = "项目经费支出(千元)")
 	private BigDecimal cost;
 
-	@Schema(description = "其中:政府奖金")
-	private BigDecimal govBonus;
-
 	@Schema(description = "用于科学原理的探索发现的经费总额")
 	private BigDecimal cost1;
 

+ 36 - 84
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/A107_2VO.java

@@ -2,135 +2,87 @@ package org.sky.scientific.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.scientific.pojo.entity.A107_2;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "107-2 企业研究开发活动及相关情况")
-public class A107_2VO {
+public class A107_2VO extends A107_2 {
 
 	@Schema(description = "研究开发人员合计")
-	private Integer yjkfryhj;
-	@Schema(description = "其中:管理和服务人员,手填")
-	private Integer glfwry;
+	private Integer d1;
 	@Schema(description = "其中:女性")
-	private Integer female;
+	private Integer d3;
 	@Schema(description = "其中:全职人员")
-	private Integer qzry;
+	private Integer d4;
 	@Schema(description = "其中:本科毕业及以上人员")
-	private Integer bkbyjysry;
+	private Integer d5;
 	@Schema(description = "其中:外聘人员")
-	private Integer wpry;
+	private Integer d6;
 
 	@Schema(description = "研究开发费用合计")
-	private BigDecimal yjkffyhj;
+	private BigDecimal d7;
 	@Schema(description = "1.人员人工费用")
-	private BigDecimal ryrgfy;
+	private BigDecimal d8;
 	@Schema(description = "2.直接投入费用")
-	private BigDecimal zjtrfy;
+	private BigDecimal d9;
 	@Schema(description = "3.折旧费用与长期待摊费用")
-	private BigDecimal zjfyycqdtfy;
+	private BigDecimal d10;
 	@Schema(description = "4.无形资产摊销费用")
-	private BigDecimal wxzctxfy;
+	private BigDecimal d11;
 	@Schema(description = "5.设计费用")
-	private BigDecimal sjfy;
+	private BigDecimal d12;
 	@Schema(description = "6.装备调试费用与试验费用")
-	private BigDecimal zbtsfyysyfy;
+	private BigDecimal d13;
 	@Schema(description = "7.委托外部研究开发费用")
-	private BigDecimal wtwbyjkffy;
+	private BigDecimal d14;
 	@Schema(description = "①委托境内研究机构")
-	private BigDecimal wtjnyjjg;
+	private BigDecimal d15;
 	@Schema(description = "②委托境内高等学校")
-	private BigDecimal wtjngdxx;
+	private BigDecimal d16;
 	@Schema(description = "③委托境内企业")
-	private BigDecimal wtjnqy;
+	private BigDecimal d17;
 	@Schema(description = "④委托境外机构")
-	private BigDecimal wtjwjg;
+	private BigDecimal d18;
 	@Schema(description = "8.其他费用")
-	private BigDecimal qtfy;
+	private BigDecimal d19;
 
 	@Schema(description = "当年形成用于研发开发的固定资产")
-	private BigDecimal dnxcyyyfkfdgdzc;
+	private BigDecimal d20;
 	@Schema(description = "其中:仪器和设备")
-	private BigDecimal yqhsb;
+	private BigDecimal d21;
 	@Schema(description = "1.来自企业自筹")
-	private BigDecimal lzqyzc;
+	private BigDecimal d57;
 	@Schema(description = "2.来自政府部门")
-	private BigDecimal lzzfbm;
-	@Schema(description = "3.来自银行贷款")
-	private BigDecimal lzyhdk;
-	@Schema(description = "4.来自风险投资")
-	private BigDecimal lzfxtz;
-	@Schema(description = "5.来自其他渠道")
-	private BigDecimal lzqtqd;
+	private BigDecimal d43;
 
 	@Schema(description = "申报加计扣除减免税的研究开发支出")
-	private BigDecimal sbjjkcjmsdyjkfzc;
+	private BigDecimal d52;
 	@Schema(description = "加计扣除减免税金额")
-	private BigDecimal jjkcjmsje;
-	@Schema(description = "高新技术企业减免税金额")
-	private BigDecimal gxjsqyjmsje;
+	private BigDecimal d44;
 
-	@Schema(description = "期末机构数")
-	private Integer qmjgs;
-	@Schema(description = "机构研究开发人员")
-	private Integer jgyjkfry;
-	@Schema(description = "其中:博士毕业")
-	private Integer bsby;
-	@Schema(description = "硕士毕业")
-	private Integer ssby;
-	@Schema(description = "机构研究开发费用")
-	private BigDecimal jgyjkffy;
 	@Schema(description = "期末仪器和设备原价")
-	private BigDecimal qmyqhsbyj;
+	private BigDecimal d27;
 
 
 	@Schema(description = "当年专利申请数")
-	private Integer zlsqs;
+	private Integer d29;
 	@Schema(description = "其中:发明专利")
-	private Integer fmzl;
+	private Integer d30;
 	@Schema(description = "期末有效发明专利数")
-	private Integer qmyxfmzls;
+	private Integer d32;
 	@Schema(description = "其中:已被实施")
-	private Integer ybss;
-
-	@Schema(description = "专利所有权转让及许可数")
-	private Integer zlsyqzrjxks;
-	@Schema(description = "专利所有权转让及许可收入")
-	private BigDecimal zlsyqzrjxksr;
-
-	@Schema(description = "新产品销售收入")
-	private BigDecimal xcpxscr;
-	@Schema(description = "其中:出口")
-	private BigDecimal ck;
-
-	@Schema(description = "期末拥有注册商标")
-	private Integer qmyyzcsb;
+	private Integer d33;
 
 	@Schema(description = "发表科技论文")
-	private Integer fbkjlw;
+	private Integer d40;
 
 	@Schema(description = "形成国家或行业标准")
-	private Integer xcgjhhybz;
-
-	@Schema(description = "技术改造经费支出")
-	private BigDecimal jsgzjfzc;
-
-	@Schema(description = "购买境内技术经费支出")
-	private BigDecimal gmjnjsjfzc;
-
-	@Schema(description = "引进境外技术经费支出")
-	private BigDecimal yjjwjsjfzc;
-
-	@Schema(description = "引进境外技术的消化吸收经费支出")
-	private BigDecimal yjjwjsdxhxsjfzc;
-
-	@Schema(description = "期末企业在境外设立的研究开发机构数")
-	private Integer qmqyzjwsldfjkfjgs;
+	private Integer d41;
 
 	@Schema(description = "当年企业研发准备金合计")
-	private BigDecimal dnqyyfzbjhj;
-
-	@Schema(description = "附件")
-	private String fj;
+	private BigDecimal d59;
 }

+ 5 - 7
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/vo/HighTechYBVO.java

@@ -2,16 +2,20 @@ package org.sky.scientific.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.sky.scientific.pojo.entity.HighTechYB;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "高企年报")
-public class HighTechYBVO {
+public class HighTechYBVO extends HighTechYB {
 
 	@Schema(description = "一、本年度获得的知识产权数")
 	private Integer d1;
 
 	@Schema(description = "当年获得发明专利数")
 	private Integer d2;
+
 	@Schema(description = "其中:国防专利")
 	private Integer d3;
 
@@ -40,16 +44,10 @@ public class HighTechYBVO {
 	private Integer d11;
 
 
-	@Schema(description = "职工总数")
-	private Integer d13;
 
 	@Schema(description = "科技人员数")
 	private Integer d14;
 
-	@Schema(description = "新增就业人员数")
-	private Integer d15;
 
-	@Schema(description = "其中:吸纳高校应届毕业生人数")
-	private Integer d16;
 
 }

+ 71 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/EnterpriseController.java

@@ -12,8 +12,8 @@ import org.sky.core.boot.ctrl.KdController;
 import org.sky.core.log.exception.ServiceException;
 import org.sky.core.tool.api.R;
 import org.sky.core.tool.utils.Func;
-import org.sky.scientific.pojo.entity.DepartmentEntity;
-import org.sky.scientific.pojo.entity.EnterpriseInfoEntity;
+import org.sky.scientific.pojo.entity.*;
+import org.sky.scientific.pojo.vo.*;
 import org.sky.scientific.service.IDepartmentService;
 import org.sky.scientific.service.IEnterpriseInfoService;
 import org.springframework.web.bind.annotation.*;
@@ -90,4 +90,73 @@ public class EnterpriseController extends KdController {
 		return R.status(departmentService.deleteByIds(Func.toLongList(ids)));
 	}
 
+	@GetMapping("qyyjkfxmqk")
+	@ApiOperationSupport(order = 30)
+	@Operation(summary = "107-1-企业研究开发项目情况")
+	public R<List<A107_1VO>> qyyjkfxmqk(String year) {
+		return R.data(enterpriseInfoService.qyyjkfxmqk(year));
+	}
+	@PostMapping("qyyjkfxmqk")
+	@ApiOperationSupport(order = 30)
+	@Operation(summary = "107-1-企业研究开发项目情况-修改")
+	public R<Boolean> qyyjkfxmqkUpdate(@Valid @RequestBody A107_1 a1071) {
+		return R.data(enterpriseInfoService.qyyjkfxmqkUpdate(a1071));
+	}
+
+	@GetMapping("qyyjkfhdjxgqk")
+	@ApiOperationSupport(order = 33)
+	@Operation(summary = "107-2-企业研究开发活动及相关情况")
+	public R<A107_2VO> qyyjkfhdjxgfy(String year) {
+		return R.data(enterpriseInfoService.qyyjkfhdjxgfy(year));
+	}
+
+	@PostMapping("qyyjkfhdjxgqk")
+	@ApiOperationSupport(order = 34)
+	@Operation(summary = "107-2-企业研究开发活动及相关情况-填写")
+	public R<Boolean> qyyjkfhdjxgfyUpdate(@Valid @RequestBody A107_2 a1072) {
+		return R.status(enterpriseInfoService.qyyjkfhdjxgfyUpdate(a1072));
+	}
+
+	@GetMapping("yffyjjkcyhmxb")
+	@ApiOperationSupport(order = 36)
+	@Operation(summary = "A107012研发费用加计扣除优惠明细表")
+	public R<A107012VO> yffyjjkcyhmxb(String year) {
+		return R.data(enterpriseInfoService.yffyjjkcyhmxb(year));
+	}
+
+	@PostMapping("yffyjjkcyhmxb")
+	@ApiOperationSupport(order = 37)
+	@Operation(summary = "A107012研发费用加计扣除优惠明细表-填写")
+	public R<Boolean> yffyjjkcyhmxbUpdate(@Valid @RequestBody A107012 a107012) {
+		return R.status(enterpriseInfoService.yffyjjkcyhmxbUpdate(a107012));
+	}
+
+	@GetMapping("gxjsqyyhqkjmxb")
+	@ApiOperationSupport(order = 39)
+	@Operation(summary = "A107041高新技术企业优惠情况及明细表")
+	public R<A107041VO> gxjsqyyhqkjmxb(String year) {
+		return R.data(enterpriseInfoService.gxjsqyyhqkjmxb(year));
+	}
+
+	@PostMapping("gxjsqyyhqkjmxb")
+	@ApiOperationSupport(order = 40)
+	@Operation(summary = "A107041高新技术企业优惠情况及明细表-填写")
+	public R<Boolean> gxjsqyyhqkjmxbUpdate(@Valid @RequestBody A107041 a107041) {
+		return R.status(enterpriseInfoService.gxjsqyyhqkjmxbUpdate(a107041));
+	}
+
+	@GetMapping("gqnb")
+	@ApiOperationSupport(order = 42)
+	@Operation(summary = "高企年报")
+	public R<HighTechYBVO> gqnb(String year) {
+		return R.data(enterpriseInfoService.gqnb(year));
+	}
+
+	@PostMapping("gqnb")
+	@ApiOperationSupport(order = 43)
+	@Operation(summary = "高企年报-填写")
+	public R<Boolean> gqnbUpdate(@Valid @RequestBody HighTechYB highTechYB) {
+		return R.status(enterpriseInfoService.gqnbUpdate(highTechYB));
+	}
+
 }

+ 3 - 36
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/XmController.java

@@ -25,7 +25,9 @@ import org.sky.scientific.pojo.dto.XmDTO;
 import org.sky.scientific.pojo.dto.XmUpdateDto;
 import org.sky.scientific.pojo.entity.XmEntity;
 import org.sky.scientific.pojo.entity.XmFinanceEntity;
-import org.sky.scientific.pojo.vo.*;
+import org.sky.scientific.pojo.vo.XmSummary;
+import org.sky.scientific.pojo.vo.XmVO;
+import org.sky.scientific.pojo.vo.XmYszbVO;
 import org.sky.scientific.service.IXmFinanceService;
 import org.sky.scientific.service.IXmService;
 import org.springframework.web.bind.annotation.*;
@@ -150,39 +152,4 @@ public class XmController extends KdController {
 	public R removeFinance(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(xmFinanceService.physicalDeleteByIds(Func.toLongList(ids)));
 	}
-
-	@GetMapping("qyyjkfxmqk")
-	@ApiOperationSupport(order = 30)
-	@Operation(summary = "107-1-企业研究开发项目情况")
-	public R<List<A107_1VO>> qyyjkfxmqk(String year) {
-		return R.data(service.qyyjkfxmqk(year));
-	}
-
-	@GetMapping("qyyjkfhdjxgqk")
-	@ApiOperationSupport(order = 31)
-	@Operation(summary = "107-2-企业研究开发活动及相关情况")
-	public R<A107_2VO> qyyjkfhdjxgfy(String year) {
-		return R.data(service.qyyjkfhdjxgfy(year));
-	}
-
-	@GetMapping("yffyjjkcyhmxb")
-	@ApiOperationSupport(order = 32)
-	@Operation(summary = "A107012研发费用加计扣除优惠明细表")
-	public R<A107012VO> yffyjjkcyhmxb(String year) {
-		return R.data(service.yffyjjkcyhmxb(year));
-	}
-
-	@GetMapping("gxjsqyyhqkjmxb")
-	@ApiOperationSupport(order = 33)
-	@Operation(summary = "A107041高新技术企业优惠情况及明细表")
-	public R<A107041VO> gxjsqyyhqkjmxb(String year) {
-		return R.data(service.gxjsqyyhqkjmxb(year));
-	}
-
-	@GetMapping("gqnb")
-	@ApiOperationSupport(order = 34)
-	@Operation(summary = "高企年报")
-	public R<HighTechYBVO> gqnb(String year) {
-		return R.data(service.gqnb(year));
-	}
 }

+ 16 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107012Mapper.java

@@ -0,0 +1,16 @@
+
+package org.sky.scientific.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.sky.scientific.pojo.entity.A107012;
+
+/**
+ * A107012研发费用加计扣除优惠明细表 Mapper 接口
+ *
+ * @author Kd
+ * @since 2025-06-19
+ */
+public interface A107012Mapper extends BaseMapper<A107012> {
+
+
+}

+ 16 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107041Mapper.java

@@ -0,0 +1,16 @@
+
+package org.sky.scientific.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.sky.scientific.pojo.entity.A107041;
+
+/**
+ * A107041高新技术企业优惠情况及明细表 Mapper 接口
+ *
+ * @author Kd
+ * @since 2025-06-19
+ */
+public interface A107041Mapper extends BaseMapper<A107041> {
+
+
+}

+ 16 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107_1Mapper.java

@@ -0,0 +1,16 @@
+
+package org.sky.scientific.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.sky.scientific.pojo.entity.A107_1;
+
+/**
+ * 107-1企业研究开发项目情况 Mapper 接口
+ *
+ * @author Kd
+ * @since 2025-06-19
+ */
+public interface A107_1Mapper extends BaseMapper<A107_1> {
+
+
+}

+ 16 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/A107_2Mapper.java

@@ -0,0 +1,16 @@
+
+package org.sky.scientific.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.sky.scientific.pojo.entity.A107_2;
+
+/**
+ * 107-2 企业研究开发活动及相关情况 Mapper 接口
+ *
+ * @author Kd
+ * @since 2025-06-19
+ */
+public interface A107_2Mapper extends BaseMapper<A107_2> {
+
+
+}

+ 16 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/HighTechYbMapper.java

@@ -0,0 +1,16 @@
+
+package org.sky.scientific.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.sky.scientific.pojo.entity.HighTechYB;
+
+/**
+ * 高企年报 Mapper 接口
+ *
+ * @author Kd
+ * @since 2025-06-19
+ */
+public interface HighTechYbMapper extends BaseMapper<HighTechYB> {
+
+
+}

+ 74 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IEnterpriseInfoService.java

@@ -2,7 +2,10 @@
 package org.sky.scientific.service;
 
 import org.sky.core.mp.base.BaseService;
-import org.sky.scientific.pojo.entity.EnterpriseInfoEntity;
+import org.sky.scientific.pojo.entity.*;
+import org.sky.scientific.pojo.vo.*;
+
+import java.util.List;
 
 /**
  * 企业基础信息表 服务类
@@ -27,4 +30,74 @@ public interface IEnterpriseInfoService extends BaseService<EnterpriseInfoEntity
 	 * @return
 	 */
 	boolean submit(EnterpriseInfoEntity enterpriseInfo);
+
+	/**
+	 * 107-1 企业研究开发项目情况 编辑
+	 * @param year
+	 * @return
+	 */
+	List<A107_1VO> qyyjkfxmqk(String year);
+
+	/**
+	 *
+	 * @param a1071
+	 * @return
+	 */
+	Boolean qyyjkfxmqkUpdate(A107_1 a1071);
+
+	/**
+	 * 107-2-企业研究开发活动及相关情况
+	 * @param year
+	 * @return
+	 */
+	A107_2VO qyyjkfhdjxgfy(String year);
+
+	/**
+	 * 107-2-企业研究开发活动及相关情况-编辑
+	 * @param a1072
+	 * @return
+	 */
+	boolean qyyjkfhdjxgfyUpdate(A107_2 a1072);
+
+	/**
+	 * A107012研发费用加计扣除优惠明细表
+	 * @param year
+	 * @return
+	 */
+	A107012VO yffyjjkcyhmxb(String year);
+
+	/**
+	 * A107012研发费用加计扣除优惠明细表-填写
+	 * @param a107012
+	 * @return
+	 */
+	boolean yffyjjkcyhmxbUpdate(A107012 a107012);
+
+	/**
+	 * A107041高新技术企业优惠情况及明细表
+	 * @param year
+	 * @return
+	 */
+	A107041VO gxjsqyyhqkjmxb(String year);
+
+	/**
+	 * A107041高新技术企业优惠情况及明细表-填写
+	 * @param a107041
+	 * @return
+	 */
+	boolean gxjsqyyhqkjmxbUpdate(A107041 a107041);
+
+	/**
+	 * 高企年报
+	 * @param year
+	 * @return
+	 */
+	HighTechYBVO gqnb(String year);
+
+	/**
+	 * 高企年报-填写
+	 * @param highTechYB
+	 * @return
+	 */
+	boolean gqnbUpdate(HighTechYB highTechYB);
 }

+ 3 - 34
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IXmService.java

@@ -9,7 +9,9 @@ import org.sky.scientific.excel.XmExcel;
 import org.sky.scientific.pojo.dto.XmDTO;
 import org.sky.scientific.pojo.dto.XmUpdateDto;
 import org.sky.scientific.pojo.entity.XmEntity;
-import org.sky.scientific.pojo.vo.*;
+import org.sky.scientific.pojo.vo.XmSummary;
+import org.sky.scientific.pojo.vo.XmVO;
+import org.sky.scientific.pojo.vo.XmYszbVO;
 
 import java.util.List;
 
@@ -83,38 +85,5 @@ public interface IXmService extends BaseService<XmEntity> {
 	 */
 	IPage<JSONObject> selectAssistList(IPage<JSONObject> page, XmDTO xm);
 
-	/**
-	 * 107-1 企业研究开发项目情况
-	 * @param year
-	 * @return
-	 */
-	List<A107_1VO> qyyjkfxmqk(String year);
-
-	/**
-	 * 107-2-企业研究开发活动及相关情况
-	 * @param year
-	 * @return
-	 */
-	A107_2VO qyyjkfhdjxgfy(String year);
 
-	/**
-	 * A107012研发费用加计扣除优惠明细表
-	 * @param year
-	 * @return
-	 */
-	A107012VO yffyjjkcyhmxb(String year);
-
-	/**
-	 * A107041高新技术企业优惠情况及明细表
-	 * @param year
-	 * @return
-	 */
-	A107041VO gxjsqyyhqkjmxb(String year);
-
-	/**
-	 * 高企年报
-	 * @param year
-	 * @return
-	 */
-	HighTechYBVO gqnb(String year);
 }

+ 110 - 4
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/EnterpriseInfoServiceImpl.java

@@ -3,17 +3,22 @@ package org.sky.scientific.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
 import org.sky.core.log.exception.ServiceException;
 import org.sky.core.mp.base.BaseServiceImpl;
 import org.sky.core.secure.utils.SecureUtil;
 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.mapper.*;
+import org.sky.scientific.pojo.entity.*;
+import org.sky.scientific.pojo.vo.*;
 import org.sky.scientific.service.IEnterpriseInfoService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 企业基础信息表 服务实现类
  *
@@ -21,8 +26,15 @@ import org.springframework.transaction.annotation.Transactional;
  * @since 2025-08-14
  */
 @Service
+@AllArgsConstructor
 public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMapper, EnterpriseInfoEntity> implements IEnterpriseInfoService {
 
+	private final A107_1Mapper a107_1Mapper;
+	private final A107_2Mapper a107_2Mapper;
+	private final A107012Mapper a107012Mapper;
+	private final A107041Mapper a107041Mapper;
+	private final HighTechYbMapper highTechYbMapper;
+
 	@Override
 	@Transactional
 	public Boolean fetchLastYearData(EnterpriseInfoEntity enterpriseInfo) {
@@ -41,11 +53,11 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
 		// 企业基础信息表
 		EnterpriseInfoEntity dbEntity = this.getOne(Wrappers.<EnterpriseInfoEntity>lambdaQuery()
 			.eq(EnterpriseInfoEntity::getYearAndMonth, enterpriseInfo.getYearAndMonth()));
-		if(Func.isNull(dbEntity)){
+		if (Func.isNull(dbEntity)) {
 			//新增
 			one.setId(null);
 			return this.save(one);
-		}else {
+		} else {
 			//修改
 			one.setId(dbEntity.getId());
 			return this.updateById(one);
@@ -75,4 +87,98 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
 		}
 		return result;
 	}
+
+	@Override
+	public List<A107_1VO> qyyjkfxmqk(String year) {
+		List<A107_1VO> list = new ArrayList<>();
+		A107_1VO vo = new A107_1VO();
+		list.add(vo);
+		return list;
+	}
+
+	@Override
+	public Boolean qyyjkfxmqkUpdate(A107_1 a1071) {
+		LambdaQueryWrapper<A107_1> eq = Wrappers.<A107_1>lambdaQuery().eq(A107_1::getYearAndMonth, a1071.getYearAndMonth())
+			.eq(A107_1::getXmId, a1071.getXmId());
+		A107_1 one = a107_1Mapper.selectOne(eq);
+		if (Func.isNull(one)) {
+			a1071.setTenantId(SecureUtil.getTenantId());
+			return a107_1Mapper.insert(a1071) == 1;
+		} else {
+			a1071.setId(one.getId());
+			return a107_1Mapper.updateById(a1071) == 1;
+		}
+	}
+
+	@Override
+	public A107_2VO qyyjkfhdjxgfy(String year) {
+		return new A107_2VO();
+	}
+
+	@Override
+	public boolean qyyjkfhdjxgfyUpdate(A107_2 a1072) {
+		LambdaQueryWrapper<A107_2> eq = Wrappers.<A107_2>lambdaQuery().eq(A107_2::getYearAndMonth, a1072.getYearAndMonth());
+		A107_2 one = a107_2Mapper.selectOne(eq);
+		if (Func.isNull(one)) {
+			a1072.setTenantId(SecureUtil.getTenantId());
+			return a107_2Mapper.insert(a1072) == 1;
+		} else {
+			a1072.setId(one.getId());
+			return a107_2Mapper.updateById(a1072) == 1;
+		}
+	}
+
+	@Override
+	public A107012VO yffyjjkcyhmxb(String year) {
+		return new A107012VO();
+	}
+
+	@Override
+	public boolean yffyjjkcyhmxbUpdate(A107012 a107012) {
+		LambdaQueryWrapper<A107012> eq = Wrappers.<A107012>lambdaQuery().eq(A107012::getYearAndMonth, a107012.getYearAndMonth());
+		A107012 one = a107012Mapper.selectOne(eq);
+		if (Func.isNull(one)) {
+			a107012.setTenantId(SecureUtil.getTenantId());
+			return a107012Mapper.insert(a107012) == 1;
+		} else {
+			a107012.setId(one.getId());
+			return a107012Mapper.updateById(a107012) == 1;
+		}
+	}
+
+	@Override
+	public A107041VO gxjsqyyhqkjmxb(String year) {
+		return new A107041VO();
+	}
+
+	@Override
+	public boolean gxjsqyyhqkjmxbUpdate(A107041 a107041) {
+		LambdaQueryWrapper<A107041> eq = Wrappers.<A107041>lambdaQuery().eq(A107041::getYearAndMonth, a107041.getYearAndMonth());
+		A107041 one = a107041Mapper.selectOne(eq);
+		if (Func.isNull(one)) {
+			a107041.setTenantId(SecureUtil.getTenantId());
+			return a107041Mapper.insert(a107041) == 1;
+		} else {
+			a107041.setId(one.getId());
+			return a107041Mapper.updateById(a107041) == 1;
+		}
+	}
+
+	@Override
+	public HighTechYBVO gqnb(String year) {
+		return new HighTechYBVO();
+	}
+
+	@Override
+	public boolean gqnbUpdate(HighTechYB highTechYB) {
+		LambdaQueryWrapper<HighTechYB> eq = Wrappers.<HighTechYB>lambdaQuery().eq(HighTechYB::getYearAndMonth, highTechYB.getYearAndMonth());
+		HighTechYB one = highTechYbMapper.selectOne(eq);
+		if (Func.isNull(one)) {
+			highTechYB.setTenantId(SecureUtil.getTenantId());
+			return highTechYbMapper.insert(highTechYB) == 1;
+		} else {
+			highTechYB.setId(one.getId());
+			return highTechYbMapper.updateById(highTechYB) == 1;
+		}
+	}
 }

+ 3 - 38
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmServiceImpl.java

@@ -18,6 +18,7 @@ import org.sky.scientific.excel.XmExcel;
 import org.sky.scientific.mapper.*;
 import org.sky.scientific.pojo.dto.XmDTO;
 import org.sky.scientific.pojo.dto.XmUpdateDto;
+import org.sky.scientific.pojo.entity.A107_1;
 import org.sky.scientific.pojo.entity.XmEntity;
 import org.sky.scientific.pojo.vo.*;
 import org.sky.scientific.service.IXmService;
@@ -39,17 +40,11 @@ import java.util.List;
 public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implements IXmService {
 
 	private final TechnicianMapper technicianMapper;
-
-	private final XmJtbMapper jtbMapper;
-	private final XmJdxbgMapper jdxbgMapper;
-	private final CgZlMapper cgZlMapper;
-	private final CgRjzzqMapper cgRjzzqMapper;
-	private final CgJsbzMapper cgJsbzMapper;
-	private final CgQtMapper cgQtMapper;
-	private final CgKylwMapper cgKylwMapper;
 	private final DepartmentMapper departmentMapper;
 
 
+
+
 	@Override
 	public IPage<XmEntity> selectXmList(IPage<XmEntity> page, XmDTO xm) {
 		if (StringUtil.isBlank(xm.getYearAndMonth())) {
@@ -169,37 +164,7 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 		return page.setRecords(baseMapper.selectAssistList(page, xm));
 	}
 
-	@Override
-	public List<A107_1VO> qyyjkfxmqk(String year) {
-		List<A107_1VO> list = new ArrayList<>();
-		A107_1VO vo = new A107_1VO();
-		list.add(vo);
-		return list;
-	}
-
-	@Override
-	public A107_2VO qyyjkfhdjxgfy(String year) {
-		A107_2VO vo = new A107_2VO();
-		return vo;
-	}
-
-	@Override
-	public A107012VO yffyjjkcyhmxb(String year) {
-		A107012VO vo = new A107012VO();
-		return vo;
-	}
-
-	@Override
-	public A107041VO gxjsqyyhqkjmxb(String year) {
-		A107041VO vo = new A107041VO();
-		return vo;
-	}
 
-	@Override
-	public HighTechYBVO gqnb(String year) {
-		HighTechYBVO vo = new HighTechYBVO();
-		return vo;
-	}
 
 	/**
 	 * 判断项目名称是否有效