Browse Source

对外报表

zhouli 9 months ago
parent
commit
286ae1a7a9

+ 31 - 7
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/XmController.java

@@ -25,10 +25,7 @@ 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.A107_1VO;
-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.pojo.vo.*;
 import org.sky.scientific.service.IXmFinanceService;
 import org.sky.scientific.service.IXmService;
 import org.springframework.web.bind.annotation.*;
@@ -154,11 +151,38 @@ public class XmController extends KdController {
 		return R.status(xmFinanceService.physicalDeleteByIds(Func.toLongList(ids)));
 	}
 
-	@GetMapping("annual-situation/{year}")
+	@GetMapping("qyyjkfxmqk")
 	@ApiOperationSupport(order = 30)
 	@Operation(summary = "107-1-企业研究开发项目情况")
-	public R<List<A107_1VO>> selectAnnualSituation(@Parameter(description = "年度") @PathVariable String year) {
-		return R.data(service.selectAnnualSituation(year));
+	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));
+	}
 }

+ 30 - 5
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/IXmService.java

@@ -9,10 +9,7 @@ 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.A107_1VO;
-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.pojo.vo.*;
 
 import java.util.List;
 
@@ -91,5 +88,33 @@ public interface IXmService extends BaseService<XmEntity> {
 	 * @param year
 	 * @return
 	 */
-	List<A107_1VO> selectAnnualSituation(String year);
+	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);
 }

+ 31 - 6
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmServiceImpl.java

@@ -19,13 +19,11 @@ 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.XmEntity;
-import org.sky.scientific.pojo.vo.A107_1VO;
-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.pojo.vo.*;
 import org.sky.scientific.service.IXmService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -172,8 +170,35 @@ public class XmServiceImpl extends BaseServiceImpl<XmMapper, XmEntity> implement
 	}
 
 	@Override
-	public List<A107_1VO> selectAnnualSituation(String year) {
-		return List.of();
+	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;
 	}
 
 	/**