From c93801ac676b9ae5d5970dbd01e8fbb1ca76c46c Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Wed, 29 May 2024 13:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BmsCreditManagementServiceImpl.java          | 2 +-
 .../impl/BmsManufacturingServicesAwardServiceImpl.java        | 2 +-
 .../service/impl/BmsTemplateRecordServiceImpl.java            | 2 +-
 .../mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
index 62a1c8f..1f87170 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsCreditManagementServiceImpl.java
@@ -126,7 +126,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
         jsonMap.put("fileJson","{" +
                 '"' + "项目方案" + '"' + ":" + '"' + p1.getProjectPlan() + '"' + ","+
                 '"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
-                '"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
+                '"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
                 "}");
         jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
         jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
index 57959d0..d2ab867 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsManufacturingServicesAwardServiceImpl.java
@@ -125,7 +125,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
                 '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
                 '"' + "购置设备发票清单及发票扫描件" + '"' + ":" + '"' + p1.getInvoice() + '"' + ","+
                 '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
-                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' + ","+
+                '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' +
                 "}");
         jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
         jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
index a9763ed..b896b8c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
@@ -116,7 +116,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
         QueryWrapper<BmsTemplateRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("enterprise_directory", bmsTemplateRecordAddDto.getEnterpriseDirectory());
         List<BmsTemplateRecord> isFlag = baseMapper.selectList(queryWrapper);
-        if(isFlag.isEmpty()){
+        if(!isFlag.isEmpty()){
             throw new ServiceException("该申报任务标题已经存在");
         }
         //新增的时候根据当前时间判断状态是否有效
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
index 7c8722e..8e3ccb5 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
@@ -110,11 +110,11 @@
                 and a.status in (0,10)
             </if>
             <if test="statusChange == 1">
-                and a.status is not in (0,10)
+                and a.status  not in (0,10)
             </if>
             <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
         </where>
-        order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5) , a.create_time desc, e.dict_sort desc
+        order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),a.create_time desc, e.dict_sort desc
     </select>
 
     <select id="selectBmsDeclarationRecordsById" parameterType="Long" resultMap="BmsDeclarationRecordsResult">