利息字段增加

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/controller/EsNetworkEntryController.java

@@ -151,25 +151,33 @@ public class EsNetworkEntryController {
     })
     @PostMapping(value= "/emergencySupport/esNetworkEntry/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
     public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws Exception {
-
-        Map<String,Object> map = new HashMap<String,Object>();
-        if(file== null){
-            map.put("massage","无文件数据");
-            map.put("status","500");
-            return map;
-        }
-        //获得文件名
-        String fileName = file.getOriginalFilename();
-        //判断文件是否是excel文件
-        if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
-            map.put("massage","请使用正确的导入模板");
-            map.put("status","500");
+        Map<String, Object> map = new HashMap<>();
+
+        try {
+            // Check if file is null
+            if (file == null) {
+                map.put("message", "无文件数据"); // Note: corrected the typo from "massage" to "message"
+                map.put("status", "500");
+                return map;
+            }
+
+            // Get the file name
+            String fileName = file.getOriginalFilename();
+
+            // Check if the file is an Excel file
+            if (fileName == null || (!fileName.endsWith("xls") && !fileName.endsWith("xlsx"))) {
+                map.put("message", "请使用正确的导入模板"); // Note: corrected the typo from "massage" to "message"
+                map.put("status", "500");
+                return map;
+            }
+
+            // Process the file using the service
+            return esNetworkEntryService.importByEntityResult(file, map);
+        } catch (Exception e) {
+            // Handle exceptions
+            map.put("message", "文件处理失败: " + e.getMessage());
+            map.put("status", "500");
             return map;
         }
-
-        return esNetworkEntryService.importByEntityResult(file,map);
-
     }
-
-
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/mapper/mapping/BusinessFsInterestMaintainMapper.xml

@@ -5,14 +5,16 @@
     <select id="finfByYear"
             resultType="com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle">
         SELECT
-            org_id,
-            year,
-            SUM(actual_interest_received) actual_interest_received,
-            SUM(other_deduction) other_deduction
+            bfm.org_id,
+            bfm.year,
+            SUM(bfm.actual_interest_received) actual_interest_received,
+            SUM(bfm.other_deduction) other_deduction,
+            oi.org_name orgName
         FROM
-            business_fs_interest_maintain
-        where year=#{planYear}
-        GROUP BY org_id
+            business_fs_interest_maintain bfm
+        left join org_info oi on bfm.org_id =oi.org_id
+        where bfm.year=#{planYear}
+        GROUP BY bfm.org_id
 
     </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/entity/FsInterestSubsidySettle.java

@@ -78,5 +78,7 @@ public class FsInterestSubsidySettle {
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 11)
     private String remark;
+    @TableField(exist = false)
+    private String orgName;
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/mapper/FsInterestSubsidySettleMapper.java

@@ -14,6 +14,9 @@ package com.unis.financialSupervision.modular.fsinterestsubsidysettle.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 财务监管-省级储备粮清算管理-利息补贴清算表Mapper接口
@@ -22,4 +25,5 @@ import com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsIn
  * @date  2024/06/28 17:51
  **/
 public interface FsInterestSubsidySettleMapper extends BaseMapper<FsInterestSubsidySettle> {
+    List<FsInterestSubsidySettle> selectBylist(@Param("planYear") Integer planYear);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/mapper/mapping/FsInterestSubsidySettleMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.unis.financialSupervision.modular.fsinterestsubsidysettle.mapper.FsInterestSubsidySettleMapper">
 
+    <select id="selectBylist"
+            resultType="com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle">
+        SELECT
+            fss.*,
+            oi.org_name orgName
+        FROM
+            biz_fs_interest_subsidy_settle fss
+                LEFT JOIN depot_qh.org_info oi ON oi.org_id = fss.org_id
+        WHERE fss.`year`=#{planYear}
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/service/impl/FsInterestSubsidySettleServiceImpl.java

@@ -48,23 +48,16 @@ import java.util.List;
 @Service
 public class FsInterestSubsidySettleServiceImpl extends ServiceImpl<FsInterestSubsidySettleMapper, FsInterestSubsidySettle> implements FsInterestSubsidySettleService {
     @Resource
+    private FsInterestSubsidySettleMapper fsInterestSubsidySettleMapper;
+
+    @Resource
     private BusinessFsInterestMaintainService businessFsInterestMaintainService;
 
     @Override
     public List<FsInterestSubsidySettle> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam) {
         List<FsInterestSubsidySettle> fsInterestSubsidySettleList =new ArrayList<>();
-        QueryWrapper<FsInterestSubsidySettle> queryWrapper = new QueryWrapper<>();
-        if(ObjectUtil.isNotEmpty(fsInterestSubsidySettlePageParam.getPlanYear())) {
-            queryWrapper.lambda().eq(FsInterestSubsidySettle::getYear, fsInterestSubsidySettlePageParam.getPlanYear());
-        }
-        if(ObjectUtil.isAllNotEmpty(fsInterestSubsidySettlePageParam.getSortField(), fsInterestSubsidySettlePageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(fsInterestSubsidySettlePageParam.getSortOrder());
-            queryWrapper.orderBy(true, fsInterestSubsidySettlePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(fsInterestSubsidySettlePageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(FsInterestSubsidySettle::getId);
-        }
-        fsInterestSubsidySettleList = this.list(queryWrapper);
+
+        fsInterestSubsidySettleList = fsInterestSubsidySettleMapper.selectBylist(fsInterestSubsidySettlePageParam.getPlanYear());
         if(fsInterestSubsidySettleList.isEmpty()){
             fsInterestSubsidySettleList=   businessFsInterestMaintainService.finfByYear(fsInterestSubsidySettlePageParam.getPlanYear());
         }