From 658aa7e67594713ccc3516dd318aa5f84bf52a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=97=AD=E4=B8=9C?= <13243514401@163.com>
Date: Fri, 2 Aug 2024 17:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=9D=E9=98=B3=E7=BB=9F=E8=AE=A1=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/partyDataFill/PartyDataCustomHandler.java |  11 ++++++++++
 .../base/partyDataFill/PartyDataFillService.java   |   1 +
 .../mztb/base/partyDataFill/partyDataFillList.js   |  23 +++++++++++++--------
 .../smtweb/biz/mztb/web/MztbStartedListener.class  | Bin 1252 -> 1252 bytes
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java
index 6516868..8a9862a 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java
@@ -52,6 +52,17 @@ public class PartyDataCustomHandler extends AbstractHandler {
         if(cur_party_id != 0) {
             return R.error("当前机构已有该任务的填报数据："+params.readString("task_text"));
         }
+        int outOldData = params.readInt("outOldData");
+        if (outOldData == 1){
+            String sql ="select fo_id,fo_task\n" +
+                "from "+EntityHelper.getSchemaTableName(FillOut.ENTITY_NAME)+" a\n" +
+                "where a.fo_task = (select max(fo_task) from "+EntityHelper.getSchemaTableName(FillOut.ENTITY_NAME)+" where fo_party_id=?)\n" +
+                "and fo_party_id=? and fo_state <>-1";
+            FillOut fillOut = DbEngine.getInstance().queryEntity(sql, FillOut.class, us.getPartyId(),us.getPartyId());
+            if (EntityHelper.isEmpty(fillOut)) return R.error("未查询到上期填报数据");
+
+        }
+
         return R.success();
     }
 }
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillService.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillService.java
index b08d3c7..c1dd5aa 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillService.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillService.java
@@ -83,6 +83,7 @@ public class PartyDataFillService extends LCMsService {
                 "where a.fo_task = (select max(fo_task) from "+EntityHelper.getSchemaTableName(FillOut.ENTITY_NAME)+" where fo_party_id=?)\n" +
                 "and fo_party_id=? and fo_state <>-1";
         FillOut fillOut = DbEngine.getInstance().queryEntity(sql, FillOut.class, us.getPartyId(),us.getPartyId());
+        if (EntityHelper.isEmpty(fillOut)) return R.error("未查询到上期填报数据");
         BusinessInfo businessInfo = DbEngine.getInstance().findDao(BusinessInfo.class).queryEntityWhere("bi_fo_id=?",fillOut.getId());
         if (EntityHelper.isEmpty(businessInfo)) throw new BizException("未查询到相关的业务信息!");
         businessInfo.put("bi_type_text", DictsCache.getInstance().getItemName("tbBusinessType",businessInfo.getType()));
diff --git a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js
index bc800a6..1a8e5a8 100644
--- a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js
+++ b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js
@@ -27,16 +27,21 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillList", {
         return false
       }
       // 检查当前机构是否重复推送
-      const rt = await $$http.post("mztb/partyDataFill/checkRepetition", {task: $model.ds_1.data.form.task,task_text : $model.ds_1.data.form.task_text})
-      $api.closeDialog("tb_dialog")
-      $api.toPage("mztb.partyDataFillCard", {
-        $fromAction: 'button:add'
-        , task: $model.ds_1.data.form.task
-        , type: $model.ds_1.data.form.month
-        , task_text: $model.ds_1.data.form.task_text
-        , outOldData: $model.ds_1.data.form.outOldData,
-        year : $model.ds_1.data.form.year
+      const rt = await $$http.post("mztb/partyDataFill/checkRepetition", {task: $model.ds_1.data.form.task,
+        task_text : $model.ds_1.data.form.task_text,
+        outOldData: $model.ds_1.data.form.outOldData,}).then((res)=>{
+        if (res.code === 0){
+          $api.toPage("mztb.partyDataFillCard", {
+            $fromAction: 'button:add'
+            , task: $model.ds_1.data.form.task
+            , type: $model.ds_1.data.form.month
+            , task_text: $model.ds_1.data.form.task_text
+            , outOldData: $model.ds_1.data.form.outOldData,
+            year : $model.ds_1.data.form.year
+          })
+        }
       })
+      $api.closeDialog("tb_dialog")
     }
 
     const selectHide =(data) => {
diff --git a/mztb/target/classes/cc/smtweb/biz/mztb/web/MztbStartedListener.class b/mztb/target/classes/cc/smtweb/biz/mztb/web/MztbStartedListener.class
index 0aa6b037bde8a2be35bf30880809eb395a788368..6aa349ec9be985aa470f1024fe083ad3f755448a 100644
GIT binary patch
delta 27
jcmaFD`GiyG)W2Q(7#J8#7%aFLco-De>=QN$U19+Mgqa8p

delta 27
jcmaFD`GiyG)W2Q(7#J8#7%aFLco-De>;pCmU19+Mgh>be