Browse Source

高新口径-高新研发费用辅助明细账

zhouli 9 months ago
parent
commit
c8056a9c2d

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

@@ -117,11 +117,11 @@ public class XmController extends KdController {
 		return R.data(xmYszbVO);
 	}
 
-	@GetMapping("finance/page")
+	@GetMapping("finance/list")
 	@ApiOperationSupport(order = 20)
-	@Operation(summary = "会计/加计扣除/高新-研发项目清单-分页")
-	public R<IPage<XmFinanceEntity>> selectXmFinancePage(Query query, XmFinanceEntity dto) {
-		return R.data(xmFinanceService.selectXmFinancePage(Condition.getPage(query), dto));
+	@Operation(summary = "会计/加计扣除/高新-研发项目清单-列表")
+	public R<List<XmFinanceEntity>> selectXmFinancePage(XmFinanceEntity dto) {
+		return R.data(xmFinanceService.selectXmFinanceList(dto));
 	}
 
 	@PostMapping("finance/fetch")

+ 2 - 3
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmFinanceMapper.java

@@ -1,7 +1,6 @@
 package org.sky.scientific.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.sky.scientific.pojo.entity.XmFinanceEntity;
 
@@ -15,12 +14,12 @@ import java.util.List;
 public interface XmFinanceMapper extends BaseMapper<XmFinanceEntity> {
 
 	/**
-	 * 分页
+	 * 列表
 	 * @param page
 	 * @param dto
 	 * @return
 	 */
-	List<XmFinanceEntity> selectXmFinancePage(IPage<XmFinanceEntity> page, @Param("ew") XmFinanceEntity dto);
+	List<XmFinanceEntity> selectXmFinanceList(@Param("ew") XmFinanceEntity dto);
 
 	/**
 	 * 批量删除

+ 7 - 7
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmFinanceMapper.xml

@@ -26,20 +26,20 @@
         </foreach>
     </delete>
 
-    <select id="selectXmFinancePage" resultMap="ResultMap">
+    <select id="selectXmFinanceList" resultMap="ResultMap">
         SELECT kxf.*, xm.XMBH, xm.XMMC
         FROM kd_xm_finance kxf
         LEFT JOIN
         (
            SELECT
               xm.id,
-              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMMC' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{ew.yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMMC) AS XMMC,
-              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMBH' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{ew.yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMBH) AS XMBH,
-              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMKSSJ' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{ew.yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMKSSJ) AS XMKSSJ,
-              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMJSSJ' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{ew.yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMJSSJ) AS XMJSSJ
+              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMMC' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMMC) AS XMMC,
+              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMBH' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMBH) AS XMBH,
+              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMKSSJ' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMKSSJ) AS XMKSSJ,
+              COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMJSSJ' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMJSSJ) AS XMJSSJ
            FROM kd_xm xm
         ) xm ON xm.id = kxf.xm_id
-        WHERE kxf.year_and_month = #{ew.yearAndMonth} and kxf.type = #{ew.type}
-        <if test="ew.xmmc!=null and ew.xmmc!=''">and xm.XMMC like concat('%',#{ew.xmmc},'%')</if>
+        WHERE kxf.year_and_month = #{yearAndMonth} and kxf.type = #{type}
+        <if test="xmmc!=null and xmmc!=''">and xm.XMMC like concat('%',#{xmmc},'%')</if>
     </select>
 </mapper>

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

@@ -1,7 +1,6 @@
 
 package org.sky.scientific.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.sky.core.mp.base.BaseService;
 import org.sky.scientific.pojo.entity.XmFinanceEntity;
 
@@ -16,7 +15,7 @@ import java.util.List;
 public interface IXmFinanceService extends BaseService<XmFinanceEntity> {
 
 
-	IPage<XmFinanceEntity> selectXmFinancePage(IPage<XmFinanceEntity> page, XmFinanceEntity dto);
+	List<XmFinanceEntity> selectXmFinanceList(XmFinanceEntity dto);
 
 	/**
 	 * 新增

+ 4 - 10
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmFinanceServiceImpl.java

@@ -1,13 +1,10 @@
 
 package org.sky.scientific.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.sky.core.log.exception.ServiceException;
 import org.sky.core.mp.base.BaseServiceImpl;
-import org.sky.core.mp.support.Condition;
-import org.sky.core.mp.support.Query;
 import org.sky.core.tool.utils.Func;
 import org.sky.scientific.mapper.XmFinanceMapper;
 import org.sky.scientific.mapper.XmMapper;
@@ -34,15 +31,14 @@ public class XmFinanceServiceImpl extends BaseServiceImpl<XmFinanceMapper, XmFin
 	private XmMapper xmMapper;
 
 	@Override
-	public IPage<XmFinanceEntity> selectXmFinancePage(IPage<XmFinanceEntity> page, XmFinanceEntity dto) {
+	public List<XmFinanceEntity> selectXmFinanceList(XmFinanceEntity dto) {
 		if (Func.isBlank(dto.getYearAndMonth())) {
 			throw new ServiceException("参数yearAndMonth不能为空");
 		}
 		if (dto.getType() == null || !Arrays.asList(1, 2, 3).contains(dto.getType())) {
 			throw new ServiceException("参数type为空或者错误");
 		}
-		List<XmFinanceEntity> list = baseMapper.selectXmFinancePage(page, dto);
-		return page.setRecords(list);
+ 		return baseMapper.selectXmFinanceList(dto);
 	}
 
 	@Override
@@ -60,8 +56,7 @@ public class XmFinanceServiceImpl extends BaseServiceImpl<XmFinanceMapper, XmFin
 		}
 
 		//根据yearAndMonth和type查询已有项目
-		Query query = new Query().setCurrent(1).setSize(Integer.MAX_VALUE);
-		List<XmFinanceEntity> dbXmFinanceList = baseMapper.selectXmFinancePage(Condition.getPage(query), entity);
+ 		List<XmFinanceEntity> dbXmFinanceList = baseMapper.selectXmFinanceList(entity);
 
 		//年度研发项目
 		List<Long> xmIdList = xmListByYear.stream().map(XmEntity::getId).toList();
@@ -105,8 +100,7 @@ public class XmFinanceServiceImpl extends BaseServiceImpl<XmFinanceMapper, XmFin
 			throw new ServiceException(entity.getYearAndMonth() + "年度内无研发项目可引入");
 		}
 		//根据yearAndMonth和type查询已有项目
-		Query query = new Query().setCurrent(1).setSize(Integer.MAX_VALUE);
-		List<XmFinanceEntity> dbXmFinanceList = baseMapper.selectXmFinancePage(Condition.getPage(query), entity);
+ 		List<XmFinanceEntity> dbXmFinanceList = baseMapper.selectXmFinanceList(entity);
 		if (Func.isEmpty(dbXmFinanceList)) {
 			//本年度无会计/加计扣除/高新-研发项目清单,直接保存