From 4bac8f981cb6618a8a06fe1ed350e40cf625cf9b Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sun, 24 Aug 2025 17:45:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E6=94=B6=E5=85=A5=E7=94=B3=E6=8A=A5=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E3=80=81=E5=AE=A1=E8=AE=A1=E7=94=B3=E6=8A=A5=E5=8D=95?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=92=E4=BB=B6=E3=80=82=202=E3=80=81?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=94=9F=E6=88=90=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=8E=B0=E9=87=91=E6=B5=81=E6=98=A0=E5=B0=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._plugin_acceptance_income_declaration.java | 232 ++++ .../gm/OA_plugin_audit_declaration_form.java | 226 ++++ .../gm/constant/ProfilesActiveConstant.java | 3 +- .../IGmoaAcceptanceIncomeDeclarationDao.java | 23 + .../gm/dao/IGmoaAuditDeclarationFormDao.java | 25 + ...moaAcceptanceIncomeDeclarationDaoImpl.java | 32 + .../impl/GmoaAuditDeclarationFormDaoImpl.java | 34 + .../dao/impl/MdmGmSubjectBalanceDaoImpl.java | 2 +- ...GmoaAcceptanceIncomeDeclarationEntity.java | 426 +++++++ .../GmoaAcceptanceIncomeDeclarationEntity.xml | 872 +++++++++++++ .../GmoaAuditDeclarationFormEntity.java | 533 ++++++++ .../entity/GmoaAuditDeclarationFormEntity.xml | 1130 +++++++++++++++++ .../ae/comf/bd/controller/BdController.java | 28 + .../ae/comf/bd/entity/vo/BdCashflowVO.java | 24 + .../core/service/impl/ICoreServiceImpl.java | 90 +- .../impl/AePushVoucherLogServiceImpl.java | 22 +- .../gm/spring/spring-buildpackage-dao.xml | 4 + .../gm/spring/spring-buildpackage-plugin.xml | 5 + 18 files changed, 3685 insertions(+), 26 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_acceptance_income_declaration.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_audit_declaration_form.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAcceptanceIncomeDeclarationDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAuditDeclarationFormDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAcceptanceIncomeDeclarationDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAuditDeclarationFormDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdCashflowVO.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_acceptance_income_declaration.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_acceptance_income_declaration.java new file mode 100644 index 00000000..884a296f --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_acceptance_income_declaration.java @@ -0,0 +1,232 @@ +package com.hzya.frame.plugin.gm; + +import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.dao.IGmoaAcceptanceIncomeDeclarationDao; +import com.hzya.frame.plugin.gm.dao.IMdmGmSubjectBalanceDao; +import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity; +import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.locks.ReentrantLock; + +/** + * Created by zydd on 2025-08-22 16:40 + * 验收收入申报单 插件 + * 控制点： + * 1、按ts同步，如果billStatus=Y报错。=N 同步 + */ +public class OA_plugin_acceptance_income_declaration extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(OA_plugin_acceptance_income_declaration.class); + private static final ReentrantLock LOCK = new ReentrantLock(true); + // 创建格式化器 + public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + List OA_LIST_SAVE = new ArrayList<>(); + List OA_LIST_UPDATE = new ArrayList<>(); + + @Override + public void initialize() { + logger.info(getPluginLabel() + "执行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "执行销毁方法destroy()"); + } + + @Override + public String getPluginId() { + return "gm.OA_plugin_acceptance_income_declaration"; + } + + @Override + public String getPluginName() { + return "广脉：验收收入申报单同步"; + } + + @Override + public String getPluginLabel() { + return "广脉：验收收入申报单同步"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + try { + logger.info("调用：" + getPluginName() + "-插件"); + String prod = "prod"; + String param = String.valueOf(requestJson.get("param")); + if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) { + //按日期 + if (param != null && !"".equals(param)) { + String[] split = param.split("/"); + if (!(split.length == 2)) { + Assert.state(false, "时间格式传递不正确"); + } + Assert.notNull(split[0], "开始时间不能为空"); + Assert.notNull(split[1], "结束时间不能为空"); + start(split[0], split[1]); + } + } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) { + //默认 + start(); + } + } catch (Exception e) { + e.printStackTrace(); + logger.error("executeBusiness方法抛出异常", e); + } + return BaseResult.getSuccessMessageEntity("插件执行成功"); + } + + @Autowired + private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao; + @Autowired + private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil; + + @Autowired + private IGmoaAcceptanceIncomeDeclarationDao acceptanceIncomeDeclarationDao; + + + + public void start(){ + // 获取当前日期和时间,时间偏移10分钟 + LocalDateTime now = LocalDateTime.now(); + String end = now.format(formatter); + String start = now.minusMinutes(10L).format(formatter); + logger.info("自动同步==> 验收收入申报单 时间区间：[{}]-[{}]",start,end); + try { + + //查询数据 + List allOAList = queryData(start,end); + //过滤，生成凭证的报错 + filterData(allOAList); + + //保存 + saveData(OA_LIST_SAVE); + //更新 + updateData(OA_LIST_UPDATE); + }catch (Exception e){ + e.printStackTrace(); + } + } + + + + + public void start(String startTime, String endTime) { + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); + startTime+=" 00:00:00"; + endTime+=" 23:59:59"; + try { + //查询数据 + List allOAList = queryData(startTime,endTime); + + //过滤，生成凭证的报错 + filterData(allOAList); + + //保存 + saveData(OA_LIST_SAVE); + //更新 + updateData(OA_LIST_UPDATE); + }catch (Exception e){ + e.printStackTrace(); + } + + } + + private void updateData(List oaListUpdate) { + + List list=new ArrayList<>(); + + for (GmoaAcceptanceIncomeDeclarationEntity gmoaAcceptanceIncomeDeclarationEntity : oaListUpdate) { + String billCode = gmoaAcceptanceIncomeDeclarationEntity.getBillCode(); + + GmoaAcceptanceIncomeDeclarationEntity deleteEntity = new GmoaAcceptanceIncomeDeclarationEntity(); + deleteEntity.setBillCode(billCode); + acceptanceIncomeDeclarationDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl.entity_delete",deleteEntity); + list.add(gmoaAcceptanceIncomeDeclarationEntity); + } + saveData(list); + } + + //批量更新 billStatus=N,sts=Y,dataStatus=Y,id=UUID() + private void saveData(List oaListSave) { + + oaListSave.forEach(entity -> { + entity.setBillstatus("N"); + entity.setSts("Y"); + entity.setDataStatus("Y"); + entity.setId(UUID.randomUUID().toString()); // 生成 UUID 并转为字符串 + }); + + List> partition = Lists.partition(oaListSave, 500); + for (List gmoaAcceptanceIncomeDeclarationEntities : partition) { + acceptanceIncomeDeclarationDao.saveList(gmoaAcceptanceIncomeDeclarationEntities); + } + + } + + private void filterData(List allOAList) { + + for (GmoaAcceptanceIncomeDeclarationEntity gmoaAcceptanceIncomeDeclarationEntity : allOAList) { + String billCode = gmoaAcceptanceIncomeDeclarationEntity.getBillCode(); + GmoaAcceptanceIncomeDeclarationEntity acceptanceIncomeDeclarationEntity = new GmoaAcceptanceIncomeDeclarationEntity(); + acceptanceIncomeDeclarationEntity.setBillCode(billCode); + List query = acceptanceIncomeDeclarationDao.query(acceptanceIncomeDeclarationEntity); + if(query.size()==0){ + OA_LIST_SAVE.add(gmoaAcceptanceIncomeDeclarationEntity); + continue; + } + GmoaAcceptanceIncomeDeclarationEntity gmoaAcceptanceIncomeDeclarationEntity1 = query.get(0); + String billstatus = gmoaAcceptanceIncomeDeclarationEntity1.getBillstatus(); + if("Y".equals(billstatus)){ + //已经推送了凭证，又修改了单据。，报错 + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setId(UUID.randomUUID().toString()); + integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); + integrationTaskLivingDetailsEntity.setRootAppNewData(billCode); + integrationTaskLivingDetailsEntity.setNewTransmitInfo("已推送凭证"); + integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); + integrationTaskLivingDetailsEntity.setBusinessDate(gmoaAcceptanceIncomeDeclarationEntity.getTs()); + integrationTaskLivingDetailsEntity.setRootAppPk(billCode); + integrationTaskLivingDetailsEntity.setRootAppBill(billCode); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); + continue; + } + OA_LIST_UPDATE.add(gmoaAcceptanceIncomeDeclarationEntity); + } + } + + + private List queryData(String start, String end) { + GmoaAcceptanceIncomeDeclarationEntity entity = new GmoaAcceptanceIncomeDeclarationEntity(); + entity.setStartTime(start); + entity.setEndTime(end); + List all = acceptanceIncomeDeclarationDao.queryOAAll(entity); + return all; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_audit_declaration_form.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_audit_declaration_form.java new file mode 100644 index 00000000..cd92ec14 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_audit_declaration_form.java @@ -0,0 +1,226 @@ +package com.hzya.frame.plugin.gm; + +import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl; +import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity; +import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity; +import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.locks.ReentrantLock; + +/** + * Created by zydd on 2025-08-23 13:53 + */ +public class OA_plugin_audit_declaration_form extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(OA_plugin_audit_declaration_form.class); + private static final ReentrantLock LOCK = new ReentrantLock(true); + // 创建格式化器 + public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + List OA_LIST_SAVE = new ArrayList<>(); + List OA_LIST_UPDATE = new ArrayList<>(); + + + @Override + public void initialize() { + logger.info(getPluginLabel() + "执行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "执行销毁方法destroy()"); + } + + @Override + public String getPluginId() { + return "gm.OA_plugin_audit_declaration_form"; + } + + @Override + public String getPluginName() { + return "广脉：审计申报单同步"; + } + + @Override + public String getPluginLabel() { + return "广脉：审计申报单同步"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + try { + logger.info("调用：" + getPluginName() + "-插件"); + String prod = "prod"; + String param = String.valueOf(requestJson.get("param")); + if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) { + //按日期 + if (param != null && !"".equals(param)) { + String[] split = param.split("/"); + if (!(split.length == 2)) { + Assert.state(false, "时间格式传递不正确"); + } + Assert.notNull(split[0], "开始时间不能为空"); + Assert.notNull(split[1], "结束时间不能为空"); + start(split[0], split[1]); + } + } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) { + //默认 + start(); + } + } catch (Exception e) { + e.printStackTrace(); + logger.error("executeBusiness方法抛出异常", e); + } + return BaseResult.getSuccessMessageEntity("插件执行成功"); + } + + @Autowired + private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao; + @Autowired + private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil; + @Autowired + private GmoaAuditDeclarationFormDaoImpl auditDeclarationFormDao; + + + public void start() { + try { + + // 获取当前日期和时间,时间偏移10分钟 + LocalDateTime now = LocalDateTime.now(); + String end = now.format(formatter); + String start = now.minusMinutes(10L).format(formatter); + logger.info("自动同步==> 审计申报单同步 时间区间：[{}]-[{}]", start, end); + + //查询数据 + List allOAList = queryData(start, end); + + //过滤，生成凭证的报错 + filterData(allOAList); + //保存 + saveData(OA_LIST_SAVE); + //更新 + updateData(OA_LIST_UPDATE); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + + public void start(String startTime, String endTime) { + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); + startTime += " 00:00:00"; + endTime += " 23:59:59"; + try { + //查询数据 + List allOAList = queryData(startTime, endTime); + + //过滤，生成凭证的报错 + filterData(allOAList); + + //保存 + saveData(OA_LIST_SAVE); + //更新 + updateData(OA_LIST_UPDATE); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void filterData(List allOAList) { + + for (GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity : allOAList) { + String billCode = gmoaAuditDeclarationFormEntity.getBillCode(); + GmoaAuditDeclarationFormEntity auditDeclarationFormEntity = new GmoaAuditDeclarationFormEntity(); + auditDeclarationFormEntity.setBillCode(billCode); + List query = auditDeclarationFormDao.query(auditDeclarationFormEntity); + if (query.size() == 0) { + OA_LIST_SAVE.add(gmoaAuditDeclarationFormEntity); + continue; + } + GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity1 = query.get(0); + String billstatus = gmoaAuditDeclarationFormEntity1.getBillstatus(); + if ("Y".equals(billstatus)) { + //已经推送了凭证，又修改了单据。，报错 + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setId(UUID.randomUUID().toString()); + integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); + integrationTaskLivingDetailsEntity.setRootAppNewData(billCode); + integrationTaskLivingDetailsEntity.setNewTransmitInfo("已推送凭证"); + integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); + integrationTaskLivingDetailsEntity.setBusinessDate(gmoaAuditDeclarationFormEntity.getTs()); + integrationTaskLivingDetailsEntity.setRootAppPk(billCode); + integrationTaskLivingDetailsEntity.setRootAppBill(billCode); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); + continue; + } + OA_LIST_UPDATE.add(gmoaAuditDeclarationFormEntity); + } + } + + //批量更新 billStatus=N,sts=Y,dataStatus=Y,id=UUID() + private void saveData(List oaListSave) { + oaListSave.forEach(entity -> { + entity.setBillstatus("N"); + entity.setSts("Y"); + entity.setDataStatus("Y"); + entity.setId(UUID.randomUUID().toString()); // 生成 UUID 并转为字符串 + }); + + for (GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity : oaListSave) { + auditDeclarationFormDao.save(gmoaAuditDeclarationFormEntity); + } + + } + + + private void updateData(List oaListUpdate) { + + List list = new ArrayList<>(); + + for (GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity : oaListUpdate) { + String billCode = gmoaAuditDeclarationFormEntity.getBillCode(); + + GmoaAuditDeclarationFormEntity deleteEntity = new GmoaAuditDeclarationFormEntity(); + deleteEntity.setBillCode(billCode); + auditDeclarationFormDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl.entity_delete", deleteEntity); + list.add(gmoaAuditDeclarationFormEntity); + } + saveData(list); + } + + + private List queryData(String start, String end) { + GmoaAuditDeclarationFormEntity entity = new GmoaAuditDeclarationFormEntity(); + entity.setStartTime(start); + entity.setEndTime(end); + List all = auditDeclarationFormDao.queryOAAll(entity); + return all; + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java index 3472eaad..bf66f44b 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java @@ -2,7 +2,8 @@ package com.hzya.frame.plugin.gm.constant; public class ProfilesActiveConstant { - public static final String LETS_DATE_SOURCE = "gm_u8c_prod"; + public static final String GM_U8C_DATE_SOURCE = "gm_u8c_prod"; + public static final String GM_OA_DATE_SOURCE = "gm_pms_prod"; public static final String LETS_PROFILES_ACTIVE = "prod"; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAcceptanceIncomeDeclarationDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAcceptanceIncomeDeclarationDao.java new file mode 100644 index 00000000..3cf59e8a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAcceptanceIncomeDeclarationDao.java @@ -0,0 +1,23 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 广脉OA：验收收入申报单(gmoa_acceptance_income_declaration: table)表数据库访问层 + * + * @author zydd + * @since 2025-08-22 18:45:51 + */ +public interface IGmoaAcceptanceIncomeDeclarationDao extends IBaseDao { + + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + List queryOAAll(GmoaAcceptanceIncomeDeclarationEntity entity); + + void saveList(List list); +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAuditDeclarationFormDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAuditDeclarationFormDao.java new file mode 100644 index 00000000..0c651a75 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAuditDeclarationFormDao.java @@ -0,0 +1,25 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity; +import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 广脉OA：审计申报单(gmoa_audit_declaration_form: table)表数据库访问层 + * + * @author zydd + * @since 2025-08-23 14:40:52 + */ +public interface IGmoaAuditDeclarationFormDao extends IBaseDao { + + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + List queryOAAll(GmoaAuditDeclarationFormEntity entity); + + void saveList(List list); + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAcceptanceIncomeDeclarationDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAcceptanceIncomeDeclarationDaoImpl.java new file mode 100644 index 00000000..c83b2a66 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAcceptanceIncomeDeclarationDaoImpl.java @@ -0,0 +1,32 @@ +package com.hzya.frame.plugin.gm.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity; +import com.hzya.frame.plugin.gm.dao.IGmoaAcceptanceIncomeDeclarationDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 广脉OA：验收收入申报单(GmoaAcceptanceIncomeDeclaration)表数据库访问层 + * + * @author zydd + * @since 2025-08-22 18:45:51 + */ +public class GmoaAcceptanceIncomeDeclarationDaoImpl extends MybatisGenericDao implements IGmoaAcceptanceIncomeDeclarationDao { + + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + @Override + public List queryOAAll(GmoaAcceptanceIncomeDeclarationEntity entity) { + List all = (List) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl.queryOAAll", entity); + return all; + } + + @Override + public void saveList(List gmoaAcceptanceIncomeDeclarationEntities) { + insert("com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl.saveList",gmoaAcceptanceIncomeDeclarationEntities); + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAuditDeclarationFormDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAuditDeclarationFormDaoImpl.java new file mode 100644 index 00000000..c9725e98 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAuditDeclarationFormDaoImpl.java @@ -0,0 +1,34 @@ +package com.hzya.frame.plugin.gm.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity; +import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity; +import com.hzya.frame.plugin.gm.dao.IGmoaAuditDeclarationFormDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 广脉OA：审计申报单(GmoaAuditDeclarationForm)表数据库访问层 + * + * @author zydd + * @since 2025-08-23 14:40:52 + */ +public class GmoaAuditDeclarationFormDaoImpl extends MybatisGenericDao implements IGmoaAuditDeclarationFormDao{ + + + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + @Override + public List queryOAAll(GmoaAuditDeclarationFormEntity entity) { + List all = (List) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl.queryOAAll", entity); + return all; + } + + @Override + public void saveList(List list) { + insert("com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl.saveList",list); + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java index 2c670d6c..9c362d1c 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java @@ -17,7 +17,7 @@ import java.util.List; */ public class MdmGmSubjectBalanceDaoImpl extends MybatisGenericDao implements IMdmGmSubjectBalanceDao { - @DS(ProfilesActiveConstant.LETS_DATE_SOURCE) + @DS(ProfilesActiveConstant.GM_U8C_DATE_SOURCE) @Override public List queryBalanceBySubjectCodesAndPkCorp(MdmGmSubjectBalanceEntity entity) { List mdmGmSubjectBalanceEntityList = diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.java new file mode 100644 index 00000000..b917392d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.java @@ -0,0 +1,426 @@ +package com.hzya.frame.plugin.gm.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 广脉OA：验收收入申报单(GmoaAcceptanceIncomeDeclaration)实体类 + * + * @author zydd + * @since 2025-08-22 18:45:51 + */ +public class GmoaAcceptanceIncomeDeclarationEntity extends BaseEntity { + + + + /** 单据规则 */ + private String documentRule; + /** 单据规则流水号 */ + private Long documentRuleNum; + /** 数据状态 Y正常 N删除 F修改 */ + private String dataStatus; + /** 新增数据状态 0待下发 1已下发 */ + private String addStatus; + /** 修改数据状态 0待下发 1已下发 */ + private String updateStatus; + /** 删除数据状态 0待下发 1已下发 */ + private String deleteStatus; + /** 公司id */ + private String companyId; + /** data_id */ + private String dataId; + /** mdm_up_id */ + private String mdmUpId; + /** 单据号 */ + private String billCode; + /** 验收申报日期 */ + private String declareDate; + /** 项目ID */ + private String projectId; + /** 项目编号 */ + private String projectCode; + /** 项目名称 */ + private String projectName; + /** 一级项目类型 */ + private String oneProjectType; + /** 集成费（含税） */ + private String integratetaxmoney; + /** 集成费（除税） */ + private String integratemoney; + /** 集成费（税率） */ + private String integratetax; + /** 辅材费（含税） */ + private String materialstaxmoney; + /** 辅材费（除税） */ + private String materialsmoney; + /** 辅材费（税率） */ + private String materialstax; + /** 设备费（含税） */ + private String devicetaxmoney; + /** 设备费（除税） */ + private String devicemoney; + /** 设备费（税率） */ + private String devicetax; + /** 服务费（含税） */ + private String servicetaxmoney; + /** 服务费（除税） */ + private String servicemoney; + /** 服务费（税率） */ + private String servicetax; + /** 维护费（含税） */ + private String maintenancetaxmoney; + /** 维护费（除税） */ + private String maintenancemoney; + /** 维护费（税率） */ + private String maintenancetax; + /** 服务成本申报金额除税金额 */ + private String servicecost; + /** 物资成本申报除税金额合计 */ + private String materialcost; + /** 成本类别 */ + private String costtype; + /** 客商名称 */ + private String custname; + /** 制单人 */ + private String billmark; + /** 供应商 */ + private String suppliername; + /** 审核日期 */ + private String examineDate; + /** 生成状态 */ + private String billstatus; + /** 最后更新时间 */ + private String ts; + + private String startTime; + private String endTime; + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataId() { + return dataId; + } + + public void setDataId(String dataId) { + this.dataId = dataId; + } + + public String getMdmUpId() { + return mdmUpId; + } + + public void setMdmUpId(String mdmUpId) { + this.mdmUpId = mdmUpId; + } + + public String getBillCode() { + return billCode; + } + + public void setBillCode(String billCode) { + this.billCode = billCode; + } + + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getOneProjectType() { + return oneProjectType; + } + + public void setOneProjectType(String oneProjectType) { + this.oneProjectType = oneProjectType; + } + + public String getIntegratetaxmoney() { + return integratetaxmoney; + } + + public void setIntegratetaxmoney(String integratetaxmoney) { + this.integratetaxmoney = integratetaxmoney; + } + + public String getIntegratemoney() { + return integratemoney; + } + + public void setIntegratemoney(String integratemoney) { + this.integratemoney = integratemoney; + } + + public String getIntegratetax() { + return integratetax; + } + + public void setIntegratetax(String integratetax) { + this.integratetax = integratetax; + } + + public String getMaterialstaxmoney() { + return materialstaxmoney; + } + + public void setMaterialstaxmoney(String materialstaxmoney) { + this.materialstaxmoney = materialstaxmoney; + } + + public String getMaterialsmoney() { + return materialsmoney; + } + + public void setMaterialsmoney(String materialsmoney) { + this.materialsmoney = materialsmoney; + } + + public String getMaterialstax() { + return materialstax; + } + + public void setMaterialstax(String materialstax) { + this.materialstax = materialstax; + } + + public String getDevicetaxmoney() { + return devicetaxmoney; + } + + public void setDevicetaxmoney(String devicetaxmoney) { + this.devicetaxmoney = devicetaxmoney; + } + + public String getDevicemoney() { + return devicemoney; + } + + public void setDevicemoney(String devicemoney) { + this.devicemoney = devicemoney; + } + + public String getDevicetax() { + return devicetax; + } + + public void setDevicetax(String devicetax) { + this.devicetax = devicetax; + } + + public String getServicetaxmoney() { + return servicetaxmoney; + } + + public void setServicetaxmoney(String servicetaxmoney) { + this.servicetaxmoney = servicetaxmoney; + } + + public String getServicemoney() { + return servicemoney; + } + + public void setServicemoney(String servicemoney) { + this.servicemoney = servicemoney; + } + + public String getServicetax() { + return servicetax; + } + + public void setServicetax(String servicetax) { + this.servicetax = servicetax; + } + + public String getMaintenancetaxmoney() { + return maintenancetaxmoney; + } + + public void setMaintenancetaxmoney(String maintenancetaxmoney) { + this.maintenancetaxmoney = maintenancetaxmoney; + } + + public String getMaintenancemoney() { + return maintenancemoney; + } + + public void setMaintenancemoney(String maintenancemoney) { + this.maintenancemoney = maintenancemoney; + } + + public String getMaintenancetax() { + return maintenancetax; + } + + public void setMaintenancetax(String maintenancetax) { + this.maintenancetax = maintenancetax; + } + + public String getServicecost() { + return servicecost; + } + + public void setServicecost(String servicecost) { + this.servicecost = servicecost; + } + + public String getMaterialcost() { + return materialcost; + } + + public void setMaterialcost(String materialcost) { + this.materialcost = materialcost; + } + + public String getCosttype() { + return costtype; + } + + public void setCosttype(String costtype) { + this.costtype = costtype; + } + + public String getCustname() { + return custname; + } + + public void setCustname(String custname) { + this.custname = custname; + } + + public String getBillmark() { + return billmark; + } + + public void setBillmark(String billmark) { + this.billmark = billmark; + } + + public String getSuppliername() { + return suppliername; + } + + public void setSuppliername(String suppliername) { + this.suppliername = suppliername; + } + + public String getBillstatus() { + return billstatus; + } + + public void setBillstatus(String billstatus) { + this.billstatus = billstatus; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getDeclareDate() { + return declareDate; + } + + public void setDeclareDate(String declareDate) { + this.declareDate = declareDate; + } + + public String getExamineDate() { + return examineDate; + } + + public void setExamineDate(String examineDate) { + this.examineDate = examineDate; + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.xml new file mode 100644 index 00000000..31aca8c9 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.xml @@ -0,0 +1,872 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,document_rule + ,document_rule_num + ,data_status + ,add_status + ,update_status + ,delete_status + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + ,data_id + ,mdm_up_id + ,bill_code + ,declare_date + ,project_id + ,project_code + ,project_name + ,one_project_type + ,integratetaxmoney + ,integratemoney + ,integratetax + ,materialstaxmoney + ,materialsmoney + ,materialstax + ,devicetaxmoney + ,devicemoney + ,devicetax + ,servicetaxmoney + ,servicemoney + ,servicetax + ,maintenancetaxmoney + ,maintenancemoney + ,maintenancetax + ,servicecost + ,materialcost + ,costtype + ,custname + ,billmark + ,suppliername + ,examine_date + ,billStatus + ,ts + + + + + + + + + + + + + + + + insert into gmoa_acceptance_income_declaration( + + id , + document_rule , + document_rule_num , + data_status , + add_status , + update_status , + delete_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + data_id , + mdm_up_id , + bill_code , + declare_date , + project_id , + project_code , + project_name , + one_project_type , + integratetaxmoney , + integratemoney , + integratetax , + materialstaxmoney , + materialsmoney , + materialstax , + devicetaxmoney , + devicemoney , + devicetax , + servicetaxmoney , + servicemoney , + servicetax , + maintenancetaxmoney , + maintenancemoney , + maintenancetax , + servicecost , + materialcost , + costtype , + custname , + billmark , + suppliername , + examine_date , + billStatus , + ts , + sorts, + sts, + + )values( + + #{id} , + #{documentRule} , + #{documentRuleNum} , + #{dataStatus} , + #{addStatus} , + #{updateStatus} , + #{deleteStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + #{dataId} , + #{mdmUpId} , + #{billCode} , + #{declareDate} , + #{projectId} , + #{projectCode} , + #{projectName} , + #{oneProjectType} , + #{integratetaxmoney} , + #{integratemoney} , + #{integratetax} , + #{materialstaxmoney} , + #{materialsmoney} , + #{materialstax} , + #{devicetaxmoney} , + #{devicemoney} , + #{devicetax} , + #{servicetaxmoney} , + #{servicemoney} , + #{servicetax} , + #{maintenancetaxmoney} , + #{maintenancemoney} , + #{maintenancetax} , + #{servicecost} , + #{materialcost} , + #{costtype} , + #{custname} , + #{billmark} , + #{suppliername} , + #{examineDate} , + #{billstatus} , + #{ts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from + gmoa_acceptance_income_declaration a WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into gmoa_acceptance_income_declaration(document_rule, document_rule_num, data_status, add_status, + update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, + data_id, mdm_up_id, bill_code, declare_date, project_id, project_code, project_name, one_project_type, + integratetaxmoney, integratemoney, integratetax, materialstaxmoney, materialsmoney, materialstax, + devicetaxmoney, devicemoney, devicetax, servicetaxmoney, servicemoney, servicetax, maintenancetaxmoney, + maintenancemoney, maintenancetax, servicecost, materialcost, costtype, custname, billmark, suppliername, + examine_date, billStatus, ts, sts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.billCode},#{entity.declareDate},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.oneProjectType},#{entity.integratetaxmoney},#{entity.integratemoney},#{entity.integratetax},#{entity.materialstaxmoney},#{entity.materialsmoney},#{entity.materialstax},#{entity.devicetaxmoney},#{entity.devicemoney},#{entity.devicetax},#{entity.servicetaxmoney},#{entity.servicemoney},#{entity.servicetax},#{entity.maintenancetaxmoney},#{entity.maintenancemoney},#{entity.maintenancetax},#{entity.servicecost},#{entity.materialcost},#{entity.costtype},#{entity.custname},#{entity.billmark},#{entity.suppliername},#{entity.examineDate},#{entity.billstatus},#{entity.ts}, + 'Y') + + + + + insert into gmoa_acceptance_income_declaration(document_rule, document_rule_num, data_status, add_status, + update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, + data_id, mdm_up_id, bill_code, declare_date, project_id, project_code, project_name, one_project_type, + integratetaxmoney, integratemoney, integratetax, materialstaxmoney, materialsmoney, materialstax, + devicetaxmoney, devicemoney, devicetax, servicetaxmoney, servicemoney, servicetax, maintenancetaxmoney, + maintenancemoney, maintenancetax, servicecost, materialcost, costtype, custname, billmark, suppliername, + examine_date, billStatus, ts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.billCode},#{entity.declareDate},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.oneProjectType},#{entity.integratetaxmoney},#{entity.integratemoney},#{entity.integratetax},#{entity.materialstaxmoney},#{entity.materialsmoney},#{entity.materialstax},#{entity.devicetaxmoney},#{entity.devicemoney},#{entity.devicetax},#{entity.servicetaxmoney},#{entity.servicemoney},#{entity.servicetax},#{entity.maintenancetaxmoney},#{entity.maintenancemoney},#{entity.maintenancetax},#{entity.servicecost},#{entity.materialcost},#{entity.costtype},#{entity.custname},#{entity.billmark},#{entity.suppliername},#{entity.examineDate},#{entity.billstatus},#{entity.ts}) + + on duplicate key update + document_rule = values(document_rule), + document_rule_num = values(document_rule_num), + data_status = values(data_status), + add_status = values(add_status), + update_status = values(update_status), + delete_status = values(delete_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id), + data_id = values(data_id), + mdm_up_id = values(mdm_up_id), + bill_code = values(bill_code), + declare_date = values(declare_date), + project_id = values(project_id), + project_code = values(project_code), + project_name = values(project_name), + one_project_type = values(one_project_type), + integratetaxmoney = values(integratetaxmoney), + integratemoney = values(integratemoney), + integratetax = values(integratetax), + materialstaxmoney = values(materialstaxmoney), + materialsmoney = values(materialsmoney), + materialstax = values(materialstax), + devicetaxmoney = values(devicetaxmoney), + devicemoney = values(devicemoney), + devicetax = values(devicetax), + servicetaxmoney = values(servicetaxmoney), + servicemoney = values(servicemoney), + servicetax = values(servicetax), + maintenancetaxmoney = values(maintenancetaxmoney), + maintenancemoney = values(maintenancemoney), + maintenancetax = values(maintenancetax), + servicecost = values(servicecost), + materialcost = values(materialcost), + costtype = values(costtype), + custname = values(custname), + billmark = values(billmark), + suppliername = values(suppliername), + examine_date = values(examine_date), + billStatus = values(billStatus), + ts = values(ts) + + + + update gmoa_acceptance_income_declaration set + + document_rule = #{documentRule}, + document_rule_num = #{documentRuleNum}, + data_status = #{dataStatus}, + add_status = #{addStatus}, + update_status = #{updateStatus}, + delete_status = #{deleteStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + data_id = #{dataId}, + mdm_up_id = #{mdmUpId}, + bill_code = #{billCode}, + declare_date = #{declareDate}, + project_id = #{projectId}, + project_code = #{projectCode}, + project_name = #{projectName}, + one_project_type = #{oneProjectType}, + integratetaxmoney = #{integratetaxmoney}, + + integratemoney = #{integratemoney}, + integratetax = #{integratetax}, + materialstaxmoney = #{materialstaxmoney}, + + materialsmoney = #{materialsmoney}, + materialstax = #{materialstax}, + devicetaxmoney = #{devicetaxmoney}, + devicemoney = #{devicemoney}, + devicetax = #{devicetax}, + servicetaxmoney = #{servicetaxmoney}, + servicemoney = #{servicemoney}, + servicetax = #{servicetax}, + maintenancetaxmoney = + #{maintenancetaxmoney}, + + maintenancemoney = #{maintenancemoney}, + maintenancetax = #{maintenancetax}, + servicecost = #{servicecost}, + materialcost = #{materialcost}, + costtype = #{costtype}, + custname = #{custname}, + billmark = #{billmark}, + suppliername = #{suppliername}, + examine_date = #{examineDate}, + billStatus = #{billstatus}, + ts = #{ts}, + + where id = #{id} + + + + update gmoa_acceptance_income_declaration + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update gmoa_acceptance_income_declaration set sts= 'N' ,modify_time = #{modify_time},modify_user_id = + #{modify_user_id} + + and id = #{id} + and document_rule = #{documentRule} + and document_rule_num = #{documentRuleNum} + and data_status = #{dataStatus} + and add_status = #{addStatus} + and update_status = #{updateStatus} + and delete_status = #{deleteStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and data_id = #{dataId} + and mdm_up_id = #{mdmUpId} + and bill_code = #{billCode} + and declare_date = #{declareDate} + and project_id = #{projectId} + and project_code = #{projectCode} + and project_name = #{projectName} + and one_project_type = #{oneProjectType} + and integratetaxmoney = + #{integratetaxmoney} + + and integratemoney = #{integratemoney} + and integratetax = #{integratetax} + and materialstaxmoney = + #{materialstaxmoney} + + and materialsmoney = #{materialsmoney} + and materialstax = #{materialstax} + and devicetaxmoney = #{devicetaxmoney} + and devicemoney = #{devicemoney} + and devicetax = #{devicetax} + and servicetaxmoney = #{servicetaxmoney} + and servicemoney = #{servicemoney} + and servicetax = #{servicetax} + and maintenancetaxmoney = + #{maintenancetaxmoney} + + and maintenancemoney = #{maintenancemoney} + + and maintenancetax = #{maintenancetax} + and servicecost = #{servicecost} + and materialcost = #{materialcost} + and costtype = #{costtype} + and custname = #{custname} + and billmark = #{billmark} + and suppliername = #{suppliername} + and examine_date = #{examineDate} + and billStatus = #{billstatus} + and ts = #{ts} + and sts='Y' + + + + + delete + from gmoa_acceptance_income_declaration + where + 1=1 + and id = #{id} + and bill_code = #{billCode} + + + + + + + + INSERT INTO gmoa_acceptance_income_declaration ( + id, + data_status, + create_time, + sts, + bill_code, + declare_date, + project_id, + project_code, + project_name, + one_project_type, + integratetaxmoney, + integratemoney, + integratetax, + materialstaxmoney, + materialsmoney, + materialstax, + devicetaxmoney, + devicemoney, + devicetax, + servicetaxmoney, + servicemoney, + servicetax, + maintenancetaxmoney, + maintenancemoney, + maintenancetax, + servicecost, + materialcost, + costtype, + custname, + billmark, + suppliername, + examine_date, + billStatus, + ts + ) VALUES + + ( + #{item.id}, + #{item.dataStatus}, + now(), + #{item.sts}, + #{item.billCode}, + #{item.declareDate}, + #{item.projectId}, + #{item.projectCode}, + #{item.projectName}, + #{item.oneProjectType}, + #{item.integratetaxmoney}, + #{item.integratemoney}, + #{item.integratetax}, + #{item.materialstaxmoney}, + #{item.materialsmoney}, + #{item.materialstax}, + #{item.devicetaxmoney}, + #{item.devicemoney}, + #{item.devicetax}, + #{item.servicetaxmoney}, + #{item.servicemoney}, + #{item.servicetax}, + #{item.maintenancetaxmoney}, + #{item.maintenancemoney}, + #{item.maintenancetax}, + #{item.servicecost}, + #{item.materialcost}, + #{item.costtype}, + #{item.custname}, + #{item.billmark}, + #{item.suppliername}, + #{item.examineDate}, + #{item.billstatus}, + #{item.ts} + ) + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.java new file mode 100644 index 00000000..26a52ce0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.java @@ -0,0 +1,533 @@ +package com.hzya.frame.plugin.gm.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 广脉OA：审计申报单(GmoaAuditDeclarationForm)实体类 + * + * @author zydd + * @since 2025-08-23 14:40:52 + */ +public class GmoaAuditDeclarationFormEntity extends BaseEntity { + + /** 单据规则 */ + private String documentRule; + /** 单据规则流水号 */ + private Long documentRuleNum; + /** 数据状态 Y正常 N删除 F修改 */ + private String dataStatus; + /** 新增数据状态 0待下发 1已下发 */ + private String addStatus; + /** 修改数据状态 0待下发 1已下发 */ + private String updateStatus; + /** 删除数据状态 0待下发 1已下发 */ + private String deleteStatus; + /** 公司id */ + private String companyId; + /** data_id */ + private String dataId; + /** mdm_up_id */ + private String mdmUpId; + /** 单据号 */ + private String billCode; + /** 单据日期 */ + private Date declareDate; + /** 审核日期 */ + private Date examineDate; + /** 审计申报项目ID */ + private String projectId; + /** 审计申报项目编码 */ + private String projectCode; + /** 审计申报项目名称 */ + private String projectName; + /** 审计申报项目对应客商 */ + private String custname; + /** 审计申报集成费（含税） */ + private String integratetaxmoney; + /** 审计申报集成费（除税） */ + private String integratemoney; + /** 审计申报集成费（税率） */ + private String integratetax; + /** 审计申报辅材费（含税） */ + private String materialstaxmoney; + /** 审计申报辅材费（除税） */ + private String materialsmoney; + /** 审计申报辅材费（税率） */ + private String materialstax; + /** 审计申报设备费（含税） */ + private String devicetaxmoney; + /** 审计申报设备费（除税） */ + private String devicemoney; + /** 审计申报设备费（税率） */ + private String devicetax; + /** 审计申报服务费（含税） */ + private String servicetaxmoney; + /** 审计申报服务费（除税） */ + private String servicemoney; + /** 审计申报服务费（税率） */ + private String servicetax; + /** 审计申报维护费（含税） */ + private String maintenancetaxmoney; + /** 审计申报维护费（除税） */ + private String maintenancemoney; + /** 审计申报维护费（税率） */ + private String maintenancetax; + /** 审计申报制单人 */ + private String billmark; + /** 验收收入申报集成费（含税） */ + private String integratetaxmoneyys; + /** 验收收入申报集成费（除税） */ + private String integratemoneyys; + /** 验收收入申报辅材费（含税） */ + private String materialstaxmoneyys; + /** 验收收入申报辅材费（除税） */ + private String materialsmoneyys; + /** 验收收入申报设备费（含税） */ + private String devicetaxmoneyys; + /** 验收收入申报设备费（除税） */ + private String devicemoneyys; + /** 验收收入申报服务费（含税） */ + private String servicetaxmoneyys; + /** 验收收入申报服务费（除税） */ + private String servicemoneyys; + /** 验收收入申报维护费（含税） */ + private String maintenancetaxmoneyys; + /** 验收收入申报维护费（除税） */ + private String maintenancemoneyys; + /** 生成状态 */ + private String billstatus; + /** 一级项目类型 */ + private String oneProjectType; + /** 验收收入申报集成费（税率） */ + private String integratetaxys; + /** 验收收入申报辅材费（税率） */ + private String materialstaxys; + /** 验收收入申报设备费（税率） */ + private String devicetaxys; + /** 验收收入申报服务费（税率） */ + private String servicetaxys; + /** 验收收入申报维护费（税率） */ + private String maintenancetaxys; + /** 最后更新时间 */ + private String ts; + private String startTime; + private String endTime; + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataId() { + return dataId; + } + + public void setDataId(String dataId) { + this.dataId = dataId; + } + + public String getMdmUpId() { + return mdmUpId; + } + + public void setMdmUpId(String mdmUpId) { + this.mdmUpId = mdmUpId; + } + + public String getBillCode() { + return billCode; + } + + public void setBillCode(String billCode) { + this.billCode = billCode; + } + + public Date getDeclareDate() { + return declareDate; + } + + public void setDeclareDate(Date declareDate) { + this.declareDate = declareDate; + } + + public Date getExamineDate() { + return examineDate; + } + + public void setExamineDate(Date examineDate) { + this.examineDate = examineDate; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getCustname() { + return custname; + } + + public void setCustname(String custname) { + this.custname = custname; + } + + public String getIntegratetaxmoney() { + return integratetaxmoney; + } + + public void setIntegratetaxmoney(String integratetaxmoney) { + this.integratetaxmoney = integratetaxmoney; + } + + public String getIntegratemoney() { + return integratemoney; + } + + public void setIntegratemoney(String integratemoney) { + this.integratemoney = integratemoney; + } + + public String getIntegratetax() { + return integratetax; + } + + public void setIntegratetax(String integratetax) { + this.integratetax = integratetax; + } + + public String getMaterialstaxmoney() { + return materialstaxmoney; + } + + public void setMaterialstaxmoney(String materialstaxmoney) { + this.materialstaxmoney = materialstaxmoney; + } + + public String getMaterialsmoney() { + return materialsmoney; + } + + public void setMaterialsmoney(String materialsmoney) { + this.materialsmoney = materialsmoney; + } + + public String getMaterialstax() { + return materialstax; + } + + public void setMaterialstax(String materialstax) { + this.materialstax = materialstax; + } + + public String getDevicetaxmoney() { + return devicetaxmoney; + } + + public void setDevicetaxmoney(String devicetaxmoney) { + this.devicetaxmoney = devicetaxmoney; + } + + public String getDevicemoney() { + return devicemoney; + } + + public void setDevicemoney(String devicemoney) { + this.devicemoney = devicemoney; + } + + public String getDevicetax() { + return devicetax; + } + + public void setDevicetax(String devicetax) { + this.devicetax = devicetax; + } + + public String getServicetaxmoney() { + return servicetaxmoney; + } + + public void setServicetaxmoney(String servicetaxmoney) { + this.servicetaxmoney = servicetaxmoney; + } + + public String getServicemoney() { + return servicemoney; + } + + public void setServicemoney(String servicemoney) { + this.servicemoney = servicemoney; + } + + public String getServicetax() { + return servicetax; + } + + public void setServicetax(String servicetax) { + this.servicetax = servicetax; + } + + public String getMaintenancetaxmoney() { + return maintenancetaxmoney; + } + + public void setMaintenancetaxmoney(String maintenancetaxmoney) { + this.maintenancetaxmoney = maintenancetaxmoney; + } + + public String getMaintenancemoney() { + return maintenancemoney; + } + + public void setMaintenancemoney(String maintenancemoney) { + this.maintenancemoney = maintenancemoney; + } + + public String getMaintenancetax() { + return maintenancetax; + } + + public void setMaintenancetax(String maintenancetax) { + this.maintenancetax = maintenancetax; + } + + public String getBillmark() { + return billmark; + } + + public void setBillmark(String billmark) { + this.billmark = billmark; + } + + public String getIntegratetaxmoneyys() { + return integratetaxmoneyys; + } + + public void setIntegratetaxmoneyys(String integratetaxmoneyys) { + this.integratetaxmoneyys = integratetaxmoneyys; + } + + public String getIntegratemoneyys() { + return integratemoneyys; + } + + public void setIntegratemoneyys(String integratemoneyys) { + this.integratemoneyys = integratemoneyys; + } + + public String getMaterialstaxmoneyys() { + return materialstaxmoneyys; + } + + public void setMaterialstaxmoneyys(String materialstaxmoneyys) { + this.materialstaxmoneyys = materialstaxmoneyys; + } + + public String getMaterialsmoneyys() { + return materialsmoneyys; + } + + public void setMaterialsmoneyys(String materialsmoneyys) { + this.materialsmoneyys = materialsmoneyys; + } + + public String getDevicetaxmoneyys() { + return devicetaxmoneyys; + } + + public void setDevicetaxmoneyys(String devicetaxmoneyys) { + this.devicetaxmoneyys = devicetaxmoneyys; + } + + public String getDevicemoneyys() { + return devicemoneyys; + } + + public void setDevicemoneyys(String devicemoneyys) { + this.devicemoneyys = devicemoneyys; + } + + public String getServicetaxmoneyys() { + return servicetaxmoneyys; + } + + public void setServicetaxmoneyys(String servicetaxmoneyys) { + this.servicetaxmoneyys = servicetaxmoneyys; + } + + public String getServicemoneyys() { + return servicemoneyys; + } + + public void setServicemoneyys(String servicemoneyys) { + this.servicemoneyys = servicemoneyys; + } + + public String getMaintenancetaxmoneyys() { + return maintenancetaxmoneyys; + } + + public void setMaintenancetaxmoneyys(String maintenancetaxmoneyys) { + this.maintenancetaxmoneyys = maintenancetaxmoneyys; + } + + public String getMaintenancemoneyys() { + return maintenancemoneyys; + } + + public void setMaintenancemoneyys(String maintenancemoneyys) { + this.maintenancemoneyys = maintenancemoneyys; + } + + public String getBillstatus() { + return billstatus; + } + + public void setBillstatus(String billstatus) { + this.billstatus = billstatus; + } + + public String getOneProjectType() { + return oneProjectType; + } + + public void setOneProjectType(String oneProjectType) { + this.oneProjectType = oneProjectType; + } + + public String getIntegratetaxys() { + return integratetaxys; + } + + public void setIntegratetaxys(String integratetaxys) { + this.integratetaxys = integratetaxys; + } + + public String getMaterialstaxys() { + return materialstaxys; + } + + public void setMaterialstaxys(String materialstaxys) { + this.materialstaxys = materialstaxys; + } + + public String getDevicetaxys() { + return devicetaxys; + } + + public void setDevicetaxys(String devicetaxys) { + this.devicetaxys = devicetaxys; + } + + public String getServicetaxys() { + return servicetaxys; + } + + public void setServicetaxys(String servicetaxys) { + this.servicetaxys = servicetaxys; + } + + public String getMaintenancetaxys() { + return maintenancetaxys; + } + + public void setMaintenancetaxys(String maintenancetaxys) { + this.maintenancetaxys = maintenancetaxys; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.xml new file mode 100644 index 00000000..41be03bc --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.xml @@ -0,0 +1,1130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,document_rule + ,document_rule_num + ,data_status + ,add_status + ,update_status + ,delete_status + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + ,data_id + ,mdm_up_id + ,bill_code + ,declare_date + ,examine_date + ,project_id + ,project_code + ,project_name + ,custname + ,integratetaxmoney + ,integratemoney + ,integratetax + ,materialstaxmoney + ,materialsmoney + ,materialstax + ,devicetaxmoney + ,devicemoney + ,devicetax + ,servicetaxmoney + ,servicemoney + ,servicetax + ,maintenancetaxmoney + ,maintenancemoney + ,maintenancetax + ,billmark + ,integratetaxmoneyys + ,integratemoneyys + ,materialstaxmoneyys + ,materialsmoneyys + ,devicetaxmoneyys + ,devicemoneyys + ,servicetaxmoneyys + ,servicemoneyys + ,maintenancetaxmoneyys + ,maintenancemoneyys + ,billStatus + ,one_project_type + ,integratetaxys + ,materialstaxys + ,devicetaxys + ,servicetaxys + ,maintenancetaxys + ,ts + + + + + + + + + + + + + + + + insert into gmoa_audit_declaration_form( + + id , + document_rule , + document_rule_num , + data_status , + add_status , + update_status , + delete_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + data_id , + mdm_up_id , + bill_code , + declare_date , + examine_date , + project_id , + project_code , + project_name , + custname , + integratetaxmoney , + integratemoney , + integratetax , + materialstaxmoney , + materialsmoney , + materialstax , + devicetaxmoney , + devicemoney , + devicetax , + servicetaxmoney , + servicemoney , + servicetax , + maintenancetaxmoney , + maintenancemoney , + maintenancetax , + billmark , + integratetaxmoneyys , + integratemoneyys , + materialstaxmoneyys , + materialsmoneyys , + devicetaxmoneyys , + devicemoneyys , + servicetaxmoneyys , + servicemoneyys , + maintenancetaxmoneyys , + maintenancemoneyys , + billStatus , + one_project_type , + integratetaxys , + materialstaxys , + devicetaxys , + servicetaxys , + maintenancetaxys , + ts , + sorts, + sts, + + )values( + + #{id} , + #{documentRule} , + #{documentRuleNum} , + #{dataStatus} , + #{addStatus} , + #{updateStatus} , + #{deleteStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + #{dataId} , + #{mdmUpId} , + #{billCode} , + #{declareDate} , + #{examineDate} , + #{projectId} , + #{projectCode} , + #{projectName} , + #{custname} , + #{integratetaxmoney} , + #{integratemoney} , + #{integratetax} , + #{materialstaxmoney} , + #{materialsmoney} , + #{materialstax} , + #{devicetaxmoney} , + #{devicemoney} , + #{devicetax} , + #{servicetaxmoney} , + #{servicemoney} , + #{servicetax} , + #{maintenancetaxmoney} , + #{maintenancemoney} , + #{maintenancetax} , + #{billmark} , + #{integratetaxmoneyys} , + #{integratemoneyys} , + #{materialstaxmoneyys} , + #{materialsmoneyys} , + #{devicetaxmoneyys} , + #{devicemoneyys} , + #{servicetaxmoneyys} , + #{servicemoneyys} , + #{maintenancetaxmoneyys} , + #{maintenancemoneyys} , + #{billstatus} , + #{oneProjectType} , + #{integratetaxys} , + #{materialstaxys} , + #{devicetaxys} , + #{servicetaxys} , + #{maintenancetaxys} , + #{ts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from gmoa_audit_declaration_form a + WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into gmoa_audit_declaration_form(document_rule, document_rule_num, data_status, add_status, + update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, + data_id, mdm_up_id, bill_code, declare_date, examine_date, project_id, project_code, project_name, custname, + integratetaxmoney, integratemoney, integratetax, materialstaxmoney, materialsmoney, materialstax, + devicetaxmoney, devicemoney, devicetax, servicetaxmoney, servicemoney, servicetax, maintenancetaxmoney, + maintenancemoney, maintenancetax, billmark, integratetaxmoneyys, integratemoneyys, materialstaxmoneyys, + materialsmoneyys, devicetaxmoneyys, devicemoneyys, servicetaxmoneyys, servicemoneyys, maintenancetaxmoneyys, + maintenancemoneyys, billStatus, one_project_type, integratetaxys, materialstaxys, devicetaxys, servicetaxys, + maintenancetaxys, ts, sts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.billCode},#{entity.declareDate},#{entity.examineDate},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.custname},#{entity.integratetaxmoney},#{entity.integratemoney},#{entity.integratetax},#{entity.materialstaxmoney},#{entity.materialsmoney},#{entity.materialstax},#{entity.devicetaxmoney},#{entity.devicemoney},#{entity.devicetax},#{entity.servicetaxmoney},#{entity.servicemoney},#{entity.servicetax},#{entity.maintenancetaxmoney},#{entity.maintenancemoney},#{entity.maintenancetax},#{entity.billmark},#{entity.integratetaxmoneyys},#{entity.integratemoneyys},#{entity.materialstaxmoneyys},#{entity.materialsmoneyys},#{entity.devicetaxmoneyys},#{entity.devicemoneyys},#{entity.servicetaxmoneyys},#{entity.servicemoneyys},#{entity.maintenancetaxmoneyys},#{entity.maintenancemoneyys},#{entity.billstatus},#{entity.oneProjectType},#{entity.integratetaxys},#{entity.materialstaxys},#{entity.devicetaxys},#{entity.servicetaxys},#{entity.maintenancetaxys},#{entity.ts}, + 'Y') + + + + + insert into gmoa_audit_declaration_form(document_rule, document_rule_num, data_status, add_status, + update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, + data_id, mdm_up_id, bill_code, declare_date, examine_date, project_id, project_code, project_name, custname, + integratetaxmoney, integratemoney, integratetax, materialstaxmoney, materialsmoney, materialstax, + devicetaxmoney, devicemoney, devicetax, servicetaxmoney, servicemoney, servicetax, maintenancetaxmoney, + maintenancemoney, maintenancetax, billmark, integratetaxmoneyys, integratemoneyys, materialstaxmoneyys, + materialsmoneyys, devicetaxmoneyys, devicemoneyys, servicetaxmoneyys, servicemoneyys, maintenancetaxmoneyys, + maintenancemoneyys, billStatus, one_project_type, integratetaxys, materialstaxys, devicetaxys, servicetaxys, + maintenancetaxys, ts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.billCode},#{entity.declareDate},#{entity.examineDate},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.custname},#{entity.integratetaxmoney},#{entity.integratemoney},#{entity.integratetax},#{entity.materialstaxmoney},#{entity.materialsmoney},#{entity.materialstax},#{entity.devicetaxmoney},#{entity.devicemoney},#{entity.devicetax},#{entity.servicetaxmoney},#{entity.servicemoney},#{entity.servicetax},#{entity.maintenancetaxmoney},#{entity.maintenancemoney},#{entity.maintenancetax},#{entity.billmark},#{entity.integratetaxmoneyys},#{entity.integratemoneyys},#{entity.materialstaxmoneyys},#{entity.materialsmoneyys},#{entity.devicetaxmoneyys},#{entity.devicemoneyys},#{entity.servicetaxmoneyys},#{entity.servicemoneyys},#{entity.maintenancetaxmoneyys},#{entity.maintenancemoneyys},#{entity.billstatus},#{entity.oneProjectType},#{entity.integratetaxys},#{entity.materialstaxys},#{entity.devicetaxys},#{entity.servicetaxys},#{entity.maintenancetaxys},#{entity.ts}) + + on duplicate key update + document_rule = values(document_rule), + document_rule_num = values(document_rule_num), + data_status = values(data_status), + add_status = values(add_status), + update_status = values(update_status), + delete_status = values(delete_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id), + data_id = values(data_id), + mdm_up_id = values(mdm_up_id), + bill_code = values(bill_code), + declare_date = values(declare_date), + examine_date = values(examine_date), + project_id = values(project_id), + project_code = values(project_code), + project_name = values(project_name), + custname = values(custname), + integratetaxmoney = values(integratetaxmoney), + integratemoney = values(integratemoney), + integratetax = values(integratetax), + materialstaxmoney = values(materialstaxmoney), + materialsmoney = values(materialsmoney), + materialstax = values(materialstax), + devicetaxmoney = values(devicetaxmoney), + devicemoney = values(devicemoney), + devicetax = values(devicetax), + servicetaxmoney = values(servicetaxmoney), + servicemoney = values(servicemoney), + servicetax = values(servicetax), + maintenancetaxmoney = values(maintenancetaxmoney), + maintenancemoney = values(maintenancemoney), + maintenancetax = values(maintenancetax), + billmark = values(billmark), + integratetaxmoneyys = values(integratetaxmoneyys), + integratemoneyys = values(integratemoneyys), + materialstaxmoneyys = values(materialstaxmoneyys), + materialsmoneyys = values(materialsmoneyys), + devicetaxmoneyys = values(devicetaxmoneyys), + devicemoneyys = values(devicemoneyys), + servicetaxmoneyys = values(servicetaxmoneyys), + servicemoneyys = values(servicemoneyys), + maintenancetaxmoneyys = values(maintenancetaxmoneyys), + maintenancemoneyys = values(maintenancemoneyys), + billStatus = values(billStatus), + one_project_type = values(one_project_type), + integratetaxys = values(integratetaxys), + materialstaxys = values(materialstaxys), + devicetaxys = values(devicetaxys), + servicetaxys = values(servicetaxys), + maintenancetaxys = values(maintenancetaxys), + ts = values(ts) + + + + update gmoa_audit_declaration_form set + + document_rule = #{documentRule}, + document_rule_num = #{documentRuleNum}, + data_status = #{dataStatus}, + add_status = #{addStatus}, + update_status = #{updateStatus}, + delete_status = #{deleteStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + data_id = #{dataId}, + mdm_up_id = #{mdmUpId}, + bill_code = #{billCode}, + declare_date = #{declareDate}, + examine_date = #{examineDate}, + project_id = #{projectId}, + project_code = #{projectCode}, + project_name = #{projectName}, + custname = #{custname}, + integratetaxmoney = #{integratetaxmoney}, + + integratemoney = #{integratemoney}, + integratetax = #{integratetax}, + materialstaxmoney = #{materialstaxmoney}, + + materialsmoney = #{materialsmoney}, + materialstax = #{materialstax}, + devicetaxmoney = #{devicetaxmoney}, + devicemoney = #{devicemoney}, + devicetax = #{devicetax}, + servicetaxmoney = #{servicetaxmoney}, + servicemoney = #{servicemoney}, + servicetax = #{servicetax}, + maintenancetaxmoney = + #{maintenancetaxmoney}, + + maintenancemoney = #{maintenancemoney}, + maintenancetax = #{maintenancetax}, + billmark = #{billmark}, + integratetaxmoneyys = + #{integratetaxmoneyys}, + + integratemoneyys = #{integratemoneyys}, + materialstaxmoneyys = + #{materialstaxmoneyys}, + + materialsmoneyys = #{materialsmoneyys}, + devicetaxmoneyys = #{devicetaxmoneyys}, + devicemoneyys = #{devicemoneyys}, + servicetaxmoneyys = #{servicetaxmoneyys}, + + servicemoneyys = #{servicemoneyys}, + maintenancetaxmoneyys = + #{maintenancetaxmoneyys}, + + maintenancemoneyys = + #{maintenancemoneyys}, + + billStatus = #{billstatus}, + one_project_type = #{oneProjectType}, + integratetaxys = #{integratetaxys}, + materialstaxys = #{materialstaxys}, + devicetaxys = #{devicetaxys}, + servicetaxys = #{servicetaxys}, + maintenancetaxys = #{maintenancetaxys}, + ts = #{ts}, + + where id = #{id} + + + + update gmoa_audit_declaration_form + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update gmoa_audit_declaration_form set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and document_rule = #{documentRule} + and document_rule_num = #{documentRuleNum} + and data_status = #{dataStatus} + and add_status = #{addStatus} + and update_status = #{updateStatus} + and delete_status = #{deleteStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and data_id = #{dataId} + and mdm_up_id = #{mdmUpId} + and bill_code = #{billCode} + and declare_date = #{declareDate} + and examine_date = #{examineDate} + and project_id = #{projectId} + and project_code = #{projectCode} + and project_name = #{projectName} + and custname = #{custname} + and integratetaxmoney = + #{integratetaxmoney} + + and integratemoney = #{integratemoney} + and integratetax = #{integratetax} + and materialstaxmoney = + #{materialstaxmoney} + + and materialsmoney = #{materialsmoney} + and materialstax = #{materialstax} + and devicetaxmoney = #{devicetaxmoney} + and devicemoney = #{devicemoney} + and devicetax = #{devicetax} + and servicetaxmoney = #{servicetaxmoney} + and servicemoney = #{servicemoney} + and servicetax = #{servicetax} + and maintenancetaxmoney = + #{maintenancetaxmoney} + + and maintenancemoney = #{maintenancemoney} + + and maintenancetax = #{maintenancetax} + and billmark = #{billmark} + and integratetaxmoneyys = + #{integratetaxmoneyys} + + and integratemoneyys = #{integratemoneyys} + + and materialstaxmoneyys = + #{materialstaxmoneyys} + + and materialsmoneyys = #{materialsmoneyys} + + and devicetaxmoneyys = #{devicetaxmoneyys} + + and devicemoneyys = #{devicemoneyys} + and servicetaxmoneyys = + #{servicetaxmoneyys} + + and servicemoneyys = #{servicemoneyys} + and maintenancetaxmoneyys = + #{maintenancetaxmoneyys} + + and maintenancemoneyys = + #{maintenancemoneyys} + + and billStatus = #{billstatus} + and one_project_type = #{oneProjectType} + and integratetaxys = #{integratetaxys} + and materialstaxys = #{materialstaxys} + and devicetaxys = #{devicetaxys} + and servicetaxys = #{servicetaxys} + and maintenancetaxys = #{maintenancetaxys} + + and ts = #{ts} + and sts='Y' + + + + + delete + from gmoa_audit_declaration_form + where id = #{id} + + + + + + + INSERT INTO gmoa_acceptance_income_declaration ( + id, + data_status, + create_time, + sts, + + bill_code, + examine_date, + declare_date, + one_project_type, + project_id, + project_code, + project_name, + custname, + integratetaxmoney, + integratemoney, + integratetax, + materialstaxmoney, + materialsmoney, + materialstax, + devicetaxmoney, + devicemoney, + devicetax, + servicetaxmoney, + servicemoney, + servicetax, + maintenancetaxmoney, + maintenancemoney, + maintenancetax, + billmark, + integratetaxmoneyys, + integratemoneyys, + integratetaxys, + materialstaxmoneyys, + materialsmoneyys, + materialstaxys, + devicetaxmoneyys, + devicemoneyys, + devicetaxys, + servicetaxmoneyys, + servicemoneyys, + servicetaxys, + maintenancetaxmoneyys, + maintenancemoneyys, + maintenancetaxys, + ts + + ) VALUES + + ( + #{item.id}, + #{item.dataStatus}, + now(), + #{item.sts}, + + #{item.billCode}, + #{item.examineDate}, + #{item.declareDate}, + #{item.oneProjectType}, + #{item.projectId}, + #{item.projectCode}, + #{item.projectName}, + #{item.custname}, + #{item.integratetaxmoney}, + #{item.integratemoney}, + #{item.integratetax}, + #{item.materialstaxmoney}, + #{item.materialsmoney}, + #{item.materialstax}, + #{item.devicetaxmoney}, + #{item.devicemoney}, + #{item.devicetax}, + #{item.servicetaxmoney}, + #{item.servicemoney}, + #{item.servicetax}, + #{item.maintenancetaxmoney}, + #{item.maintenancemoney}, + #{item.maintenancetax}, + #{item.billmark}, + #{item.integratetaxmoneyys}, + #{item.integratemoneyys}, + #{item.integratetaxys}, + #{item.materialstaxmoneyys}, + #{item.materialsmoneyys}, + #{item.materialstaxys}, + #{item.devicetaxmoneyys}, + #{item.devicemoneyys}, + #{item.devicetaxys}, + #{item.servicetaxmoneyys}, + #{item.servicemoneyys}, + #{item.servicetaxys}, + #{item.maintenancetaxmoneyys}, + #{item.maintenancemoneyys}, + #{item.maintenancetaxys}, + #{item.ts} + ) + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java index 42a6332b..288023c7 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java @@ -8,6 +8,8 @@ import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.plugin.gm.OA_plugin_acceptance_income_declaration; +import com.hzya.frame.plugin.gm.OA_plugin_audit_declaration_form; import com.hzya.frame.plugin.gm.SubjectAssBalancePlugin; import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; import com.hzya.frame.voucher.ae.comf.bd.dao.*; @@ -414,6 +416,32 @@ public class BdController extends DefaultController { } } + @Autowired + private OA_plugin_acceptance_income_declaration oaPluginAcceptanceIncomeDeclaration; + @RequestMapping(value = "/acceptance_income_declaration", method = RequestMethod.POST) + public JsonResultEntity acceptance_income_declaration (String start,String end) { + try { + oaPluginAcceptanceIncomeDeclaration.start(start,end); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + @Autowired + private OA_plugin_audit_declaration_form oaPluginAuditDeclarationForm; + @RequestMapping(value = "/audit_declaration_form", method = RequestMethod.POST) + public JsonResultEntity audit_declaration_form (String start,String end) { + try { + oaPluginAuditDeclarationForm.start(start,end); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + // /** // * diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdCashflowVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdCashflowVO.java new file mode 100644 index 00000000..1be5afd8 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdCashflowVO.java @@ -0,0 +1,24 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity.vo; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * Created by zydd on 2025-08-24 15:16 + */ +@Data +public class BdCashflowVO extends BaseEntity { + private String pk_cashflow; + private String cfitemcode; + private String cfitemname; + private String cftype; + private String fathernode; + private String defaultdir; + private String isadjustable; + private String isseal; + private String itemflag; + private String pk_corp; + private String sealflag; + private String dr; + private String ts; +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java index d307867e..59e9dc43 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java @@ -19,6 +19,7 @@ import com.hzya.frame.sysnew.person.dao.ISysPersonDao; import com.hzya.frame.sysnew.person.entity.SysPersonEntity; import com.hzya.frame.sysnew.user.dao.ISysUserDao; import com.hzya.frame.sysnew.user.entity.SysUserEntity; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.*; import com.hzya.frame.voucher.ae.generate.core.vo.*; import com.hzya.frame.voucher.utils.Attribute; import com.hzya.frame.voucher.utils.PushU8CUtil; @@ -27,11 +28,6 @@ import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao; import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO; import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO; import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.BdCurrtypeVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.BdVoucherTypeVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO; -import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO; import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorCorrelationDao; import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorDao; import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorCorrelationEntity; @@ -556,7 +552,6 @@ public class ICoreServiceImpl implements ICoreService { if(b_jYb.compareTo(new BigDecimal(0))==0&&b_jBb.compareTo(new BigDecimal(0))==0&&b_dYb.compareTo(new BigDecimal(0))==0&&b_dBb.compareTo(new BigDecimal(0))==0){ continue; - } if ("0".equals(detail_jYb) && "0".equals(detail_jBb) && "0".equals(detail_dYb) && "0".equals(detail_dBb)) { continue; @@ -597,6 +592,9 @@ public class ICoreServiceImpl implements ICoreService { String key = assByBdCodeEntry.getKey(); String value = assByBdCodeEntry.getValue(); AeConfVoucherTemplateAssistEntity templateAssistEntity = AssByMdmId.get(key);//去单据辅助核算 + if(templateAssistEntity==null){ + Assert.state(false,"辅助核算取表失败，分录模板id：{}，辅助核算id：{}，辅助核算名称：{}",templateId,key,value); + } //辅助核算取值 Map assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO); @@ -616,18 +614,43 @@ public class ICoreServiceImpl implements ICoreService { } assList.add(assEntity); } - - } if (assList.size() != 0) { detail.setAss(assList); } - - } + + //现金流量映射 + String cashflowStr = template.getPkCashflow(); + if(cashflowStr!=null&&!"".equals(cashflowStr)){ + List cashflows = new ArrayList<>(); + VoucherData.Voucher.Detail.Cashflow cashflow = new VoucherData.Voucher.Detail.Cashflow(); + cashflows.add(cashflow); + BdCashflowVO bdCashflowVO = formulaTransCashflow(cashflowStr); + System.out.println(bdCashflowVO); + + + System.out.println(b_jYb); + System.out.println(b_jBb); + System.out.println(b_dYb); + System.out.println(b_dBb); + if(b_jYb.compareTo(new BigDecimal(0))!=0){ + cashflow.setMoney(detail_jYb); + }else if(b_jBb.compareTo(new BigDecimal(0))!=0){ + cashflow.setMoney(detail_jBb); + }else if(b_dYb.compareTo(new BigDecimal(0))!=0){ + cashflow.setMoney(detail_dYb); + }else if(b_dBb.compareTo(new BigDecimal(0))!=0){ + cashflow.setMoney(detail_dBb); + } + + cashflow.setPk_currtype(detail.getPk_currtype()); + cashflow.setPk_cashflow(bdCashflowVO.getCfitemcode()); + + detail.setCashflow(cashflows); + } + details.add(detail); - - } } @@ -636,7 +659,6 @@ public class ICoreServiceImpl implements ICoreService { //分录生成失败 Assert.state(false, "分录生成失败，失败原因：{}", e.getMessage()); } - } if(details.size()==0){ return; @@ -953,6 +975,45 @@ public class ICoreServiceImpl implements ICoreService { } } + /** + * 现金流量映射 + * @param cashflowStr + */ + private BdCashflowVO formulaTransCashflow(String cashflowStr) { + String[] parts = cashflowStr.split("\\+"); + if (parts.length > 1) { + Assert.state(false, "现金流量映射转换失败！,请检查现金流量映射公式。"); + } + String fieldPath = cashflowStr.substring(3); // 去除 @@$ + String[] split = fieldPath.split("="); + String remark = split[0].substring(0, split[0].length() - 3);//表名 + + MdmModuleDbEntity mdmModuleDbEntity = queryDb(remark); + if (mdmModuleDbEntity == null) { + Assert.state(false, "根据remark：{}，查询数据表失败", remark); + } + + //查值 + MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO(); + mdmDBQueryVO.setTablename(mdmModuleDbEntity.getDbName()); + mdmDBQueryVO.setProp1("id"); + mdmDBQueryVO.setPropValue1(split[1]); + List> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO); + if (objectList == null || objectList.size() == 0) { + Assert.state(false, "根据id：{}，查询现金流量失败", split[1]); + } + Map stringObjectMap = objectList.get(0); + BdCashflowVO bdCashflowVO = new BdCashflowVO(); + try { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + bdCashflowVO = objectMapper.convertValue(stringObjectMap, BdCashflowVO.class); + }catch (Exception e){ + e.printStackTrace(); + Assert.state(false, "现金流量转换失败，失败原因：{}。", e.getMessage()); + } + return bdCashflowVO; + } /** @@ -1687,6 +1748,9 @@ public class ICoreServiceImpl implements ICoreService { String value = (String) dataMap.get(field); // 使用 NumberFormat 解析，自动处理千分位逗号和小数点 NumberFormat format = NumberFormat.getInstance(Locale.US); + if(value==null||"".equals(value)){ + return bigDecimal; + } Number number = format.parse(value); BigDecimal amount = new BigDecimal(number.toString()); bigDecimal = bigDecimal.add(amount); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java index b55c3134..da27dda7 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java @@ -371,17 +371,17 @@ public class AePushVoucherLogServiceImpl extends BaseService> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO); -// for (Map map : maps) { -// String billstatus = map.get("billStatus").toString(); -// if("N".equals(billstatus)){ -// map.put("billStatus",null); -// map.put("billstatus",null); -// } -// if("Y".equals(billstatus)){ -// map.put("billStatus","Y"); -// map.put("billstatus","Y"); -// } -// } + for (Map map : maps) { + Object billstatus = map.get("billstatus"); + Object billStatus = map.get("billStatus"); + if(billstatus==null&&billStatus!=null){ + map.put("billstatus",billStatus.toString()); + } + if(billstatus!=null&&billStatus==null){ + map.put("billStatus",billstatus.toString()); + } + + } PageInfo pageInfo = new PageInfo(maps); return pageInfo; diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml index f6448b5f..162031cd 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml @@ -2,4 +2,8 @@ + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml index bdf1d2d5..c17771ed 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml @@ -2,4 +2,9 @@ + + + + +