diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a2b6c24..6f9d40d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/MztbStartedListener.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/MztbStartedListener.java
index d2d3e92..7fa5528 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/MztbStartedListener.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/MztbStartedListener.java
@@ -14,7 +14,7 @@ public class MztbStartedListener implements IStartListener {
@Override
public double versionTo() {
- return 0.001;
+ return 0.002;
}
@Override
public int order() {
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/FillOut.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/FillOut.java
index b0754cc..bad3850 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/FillOut.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/FillOut.java
@@ -97,4 +97,15 @@ public class FillOut extends DefaultEntity {
public void setReadTime(long fo_read_time) {
put("fo_read_time", fo_read_time);
}
+
+
+ /** 状态 */
+ public int getReadState() {
+ return getInt("fo_read_state");
+ }
+
+ /** 状态 */
+ public void setReadState(int fo_read_state) {
+ put("fo_read_state", fo_read_state);
+ }
}
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
index 9edd8b8..9072a7f 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
@@ -33,6 +33,7 @@ public class PartyDataFillHandler {
@Override
public void readFromPage(SwMap pageData, SwMap filter) {
super.readFromPage(pageData, filter);
+ this.bean.setState(0);
if(bean.getType() == 2) {
yearEndPersons = readBeanFromPage(YEAR_END_PERSONS_DS_NAME, pageData, filter);// yearEndPersonsForm
}
@@ -170,7 +171,19 @@ public class PartyDataFillHandler {
temp.put("fo_type_text",anInt == 1 ? "月报": "年报");
temp.put("fo_task_text",temp.readString("fo_task").contains("99") ? temp.readString("fo_task").replace("99","年(年报)")
: String.format("%d年%02d月 (月报)",temp.readLong("fo_task") / 100, temp.readLong("fo_task") % 100));
- temp.put("fo_state_text",temp.readInt("fo_state") == 0 ? "待确认" : temp.readInt("fo_state") == 1 ? "已确认" : "已推送");
+ String state = "待确认";
+ switch (temp.readInt("fo_state")){
+ case 1:
+ state = "已确认";
+ break;
+ case 2:
+ state = "已推送";
+ break;
+ case 3:
+ state = "已驳回";
+ break;
+ }
+ temp.put("fo_state_text", state);
});
}
}
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 dcf27d1..b08d3c7 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
@@ -1,13 +1,25 @@
package cc.smtweb.biz.mztb.web.base.partyDataFill;
+import cc.smtweb.biz.mztb.web.base.BusinessInfo;
+import cc.smtweb.biz.mztb.web.base.FillOut;
+import cc.smtweb.biz.mztb.web.base.FinanceInfo;
+import cc.smtweb.biz.mztb.web.base.YearEndPersons;
import cc.smtweb.framework.core.annotation.SwBody;
import cc.smtweb.framework.core.annotation.SwService;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
+import cc.smtweb.framework.core.db.DbEngine;
+import cc.smtweb.framework.core.db.EntityHelper;
+import cc.smtweb.framework.core.db.cache.DictsCache;
+import cc.smtweb.framework.core.exception.BizException;
import cc.smtweb.framework.core.session.UserSession;
import cc.smtweb.system.bpm.web.engine.model.listcard.lcms.LCMsService;
import cc.smtweb.framework.core.mvc.service.AbstractHandler;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
/**
* Created by 1 at 2023-12-19 11:06:53
* 页面【[机构数据填报编辑]的服务类
@@ -57,4 +69,37 @@ public class PartyDataFillService extends LCMsService {
return pageHandler(params, us, TYPE_CUSTOM, handler -> ((PartyDataCustomHandler) handler).checkRepetition(params, us));
}
+
+ public R getData(@SwBody SwMap params, UserSession us){
+ SwMap swMap = new SwMap();
+
+ //1是月报 2 是年报
+ int type = params.readInt("type");
+ //年末数据
+ int year = params.readInt("year");
+
+ 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());
+ 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()));
+ businessInfo.put("bi_property_text", DictsCache.getInstance().getItemName("tbNature",businessInfo.getProperty()));
+ businessInfo.put("bi_initiate_text", DictsCache.getInstance().getItemName("tbSubject",businessInfo.getInitiate()));
+ businessInfo.put("bi_execute_regimen_text", DictsCache.getInstance().getItemName("tbKJZD",businessInfo.getExecuteRegimen()));
+ swMap.put("businessInfo",businessInfo);
+ FinanceInfo financeInfo = DbEngine.getInstance().findDao(FinanceInfo.class).queryEntityWhere("fi_fo_id=?",fillOut.getId());
+ if (EntityHelper.isEmpty(financeInfo)) throw new BizException("未查询到相关的财务信息!");
+
+ swMap.put("financeInfo",financeInfo);
+ if (year == 1){
+ YearEndPersons yearEndPersons = DbEngine.getInstance().findDao(YearEndPersons.class).queryEntityWhere("yep_fo_id=?",fillOut.getId());
+ if (EntityHelper.isEmpty(yearEndPersons)) throw new BizException("未查询到相关的年末人数信息!");
+ swMap.put("yearEndPersons",yearEndPersons);
+ }
+ return R.success(swMap);
+ }
+
}
diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java
index dce6834..92a9679 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/controller/MztbController.java
@@ -1,7 +1,6 @@
package cc.smtweb.biz.mztb.web.controller;
import cc.smtweb.biz.mztb.web.base.*;
-import cc.smtweb.biz.mztb.web.tool.UtilPub;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
@@ -16,18 +15,16 @@ import cc.smtweb.system.bpm.web.sys.user.party.PartyCache;
import cc.smtweb.system.bpm.web.sys.user.role.group.RoleGroup;
import cc.smtweb.system.bpm.web.sys.user.role.group.RoleGroupCache;
import cc.smtweb.system.bpm.web.sys.user.user.*;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
-import java.sql.ResultSetMetaData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -46,179 +43,218 @@ public class MztbController {
public R pushWork(@RequestBody SwMap swMap) {
// addNewPartyAccount();
DbEngine instance = DbEngine.getInstance();
- List