From 63525bf342387f05c86b3ceff7d5e8e227f1f97c Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sat, 6 Sep 2025 17:10:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A1=A3=E6=A1=88=E6=8F=92=E4=BB=B6=E3=80=82?= =?UTF-8?q?=202=E3=80=81=E4=BC=98=E5=8C=96=E5=87=AD=E8=AF=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._plugin_acceptance_income_declaration.java | 2 + .../gm/OA_plugin_audit_declaration_form.java | 3 + .../OA_plugin_contract_payment_receipt.java | 2 + .../gm/OA_plugin_cost_adjustment_audit.java | 2 + .../OA_plugin_transfer_declaration_form.java | 12 + .../plugin/gm/SubjectAssBalancePlugin.java | 9 + .../plugin/gm/U8C_plugin_bd_jobmngfil.java | 213 ++++++ .../plugin/gm/dao/IMdmBfJobmngfilDao.java | 20 + .../gm/dao/impl/MdmBfJobmngfilDaoImpl.java | 36 + .../GmoaAcceptanceIncomeDeclarationEntity.xml | 63 +- .../entity/GmoaAuditDeclarationFormEntity.xml | 2 +- .../GmoaContractPaymentReceiptEntity.java | 10 + .../GmoaContractPaymentReceiptEntity.xml | 13 + .../gm/entity/MdmBfJobmngfilEntity.java | 315 +++++++++ .../plugin/gm/entity/MdmBfJobmngfilEntity.xml | 624 ++++++++++++++++++ .../gm/entity/MdmGmSubjectBalanceEntity.java | 9 + .../gm/entity/MdmGmSubjectBalanceEntity.xml | 9 +- .../ae/comf/bd/controller/BdController.java | 13 + .../core/service/impl/ICoreServiceImpl.java | 15 +- .../gm/spring/spring-buildpackage-dao.xml | 4 + .../gm/spring/spring-buildpackage-plugin.xml | 6 + 21 files changed, 1349 insertions(+), 33 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_transfer_declaration_form.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/U8C_plugin_bd_jobmngfil.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmBfJobmngfilDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmBfJobmngfilDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmBfJobmngfilEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmBfJobmngfilEntity.xml 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 index 1f7284aa..ee6c225d 100644 --- 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 @@ -111,6 +111,8 @@ public class OA_plugin_acceptance_income_declaration extends PluginBaseEntity { public void start(){ + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); // 获取当前日期和时间,时间偏移10分钟 LocalDateTime now = LocalDateTime.now(); String end = now.format(formatter); 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 index 6cd33a49..70631c48 100644 --- 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 @@ -105,6 +105,9 @@ public class OA_plugin_audit_declaration_form extends PluginBaseEntity { public void start() { + + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); try { // 获取当前日期和时间,时间偏移10分钟 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_contract_payment_receipt.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_contract_payment_receipt.java index 63978d32..3eef9486 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_contract_payment_receipt.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_contract_payment_receipt.java @@ -105,6 +105,8 @@ public class OA_plugin_contract_payment_receipt extends PluginBaseEntity { public void start() { + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); try { // 获取当前日期和时间,时间偏移10分钟 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_cost_adjustment_audit.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_cost_adjustment_audit.java index 8a8f86a5..c59f6d23 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_cost_adjustment_audit.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_cost_adjustment_audit.java @@ -106,6 +106,8 @@ public class OA_plugin_cost_adjustment_audit extends PluginBaseEntity { public void start() { + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); try { // 获取当前日期和时间,时间偏移10分钟 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_transfer_declaration_form.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_transfer_declaration_form.java new file mode 100644 index 00000000..fe153be4 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_transfer_declaration_form.java @@ -0,0 +1,12 @@ +//package com.hzya.frame.plugin.gm; +// +//import com.hzya.frame.base.PluginBaseEntity; +// +///** +// * Created by zydd on 2025-09-06 16:58 +// */ +//public class OA_plugin_transfer_declaration_form extends PluginBaseEntity { +// +// +// +//} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java index 82d0359a..92cd7be9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java @@ -101,7 +101,13 @@ public class SubjectAssBalancePlugin extends PluginBaseEntity { @Autowired private IMdmGmSubjectBalanceDao mdmGmSubjectBalanceDao; + public static void main(String[] args) { + LocalDate now = LocalDate.now(); + LocalTime time = LocalTime.now(); + String year = now.toString().substring(0, 4); + System.out.println(year); + } /** * 科目： * 54010501 @@ -120,8 +126,11 @@ public class SubjectAssBalancePlugin extends PluginBaseEntity { try { logger.info("调用：" + getPluginName() + "-插件"); + String year = now.toString().substring(0, 4); + MdmGmSubjectBalanceEntity mdmGmSubjectBalanceEntity = new MdmGmSubjectBalanceEntity(); mdmGmSubjectBalanceEntity.setPkCorp("1001"); + mdmGmSubjectBalanceEntity.setYearv(year); mdmGmSubjectBalanceEntity.setSubjcodes(subjCodes); List mdmGmSubjectBalanceEntities = mdmGmSubjectBalanceDao.queryBalanceBySubjectCodesAndPkCorp(mdmGmSubjectBalanceEntity); if (mdmGmSubjectBalanceEntities != null && mdmGmSubjectBalanceEntities.size() != 0) { diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/U8C_plugin_bd_jobmngfil.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/U8C_plugin_bd_jobmngfil.java new file mode 100644 index 00000000..102c7c99 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/U8C_plugin_bd_jobmngfil.java @@ -0,0 +1,213 @@ +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.IGmoaCostAdjustmentAuditDao; +import com.hzya.frame.plugin.gm.dao.IMdmBfJobmngfilDao; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity; +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-09-05 13:53 + * 1、抓取U8C数据数据。 + * 2、同步中台 + */ +public class U8C_plugin_bd_jobmngfil extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(U8C_plugin_bd_jobmngfil.class); + private static final ReentrantLock LOCK = new ReentrantLock(true); + // 创建格式化器 + public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + List U8C_LIST_SAVE = new ArrayList<>(); + List U8C_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.U8C_plugin_bd_jobmngfil"; + } + + @Override + public String getPluginName() { + return "广脉：U8C项目管理档案同步"; + } + + @Override + public String getPluginLabel() { + return "广脉：U8C项目管理档案同步"; + } + + @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 IMdmBfJobmngfilDao mdmBfJobmngfilDao; + + + public void start() { + U8C_LIST_SAVE.clear(); + U8C_LIST_UPDATE.clear(); + try { + + // 获取当前日期和时间,时间偏移6分钟 + LocalDateTime now = LocalDateTime.now(); + String end = now.format(formatter); + String start = now.minusMinutes(6L).format(formatter); + logger.info("自动同步==> U8C项目管理档案同步 时间区间：[{}]-[{}]", start, end); + + //查询数据 + List allOAList = queryData(start, end); + + //过滤，生成凭证的报错 + filterData(allOAList); + //保存 + saveData(U8C_LIST_SAVE); + //更新 + updateData(U8C_LIST_UPDATE); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + + public void start(String startTime, String endTime) { + U8C_LIST_SAVE.clear(); + U8C_LIST_UPDATE.clear(); + startTime += " 00:00:00"; + endTime += " 23:59:59"; + try { + //查询数据 + List allU8CList = queryData(startTime, endTime); + + //过滤 + filterData(allU8CList); + //保存 + saveData(U8C_LIST_SAVE); + //更新 + updateData(U8C_LIST_UPDATE); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void updateData(List u8CListUpdate) { + List list = new ArrayList<>(); + for (MdmBfJobmngfilEntity mdmBfJobmngfilEntity : u8CListUpdate) { + String pkJobmngfil = mdmBfJobmngfilEntity.getPkJobmngfil(); + + MdmBfJobmngfilEntity mdmBfJobmngfil = new MdmBfJobmngfilEntity(); + mdmBfJobmngfil.setPkJobmngfil(pkJobmngfil); + mdmBfJobmngfilDao.delete("com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl.entity_delete",mdmBfJobmngfil); + list.add(mdmBfJobmngfilEntity); + } + saveData(list); + } + + private void saveData(List u8CListSave) { + u8CListSave.forEach(index -> { + index.setSts("Y"); + index.setDataStatus("Y"); + index.setId(index.getPkJobmngfil()); + }); + List> partition = Lists.partition(u8CListSave, 500); + for (List mdmBfJobmngfilEntities : partition) { + mdmBfJobmngfilDao.saveList(mdmBfJobmngfilEntities); + } + + } + + /** + * pkJobmngfil 主键唯一 + * 新增的保存，存在的修改 + * + * @param allOAList + */ + private void filterData(List allOAList) { + for (MdmBfJobmngfilEntity mdmBfJobmngfilEntity : allOAList) { + String pkJobmngfil = mdmBfJobmngfilEntity.getPkJobmngfil(); + MdmBfJobmngfilEntity mdmBfJobmngfil = new MdmBfJobmngfilEntity(); + mdmBfJobmngfil.setPkJobmngfil(pkJobmngfil); + List query = mdmBfJobmngfilDao.query(mdmBfJobmngfil); + if (query.size() == 0) { + U8C_LIST_SAVE.add(mdmBfJobmngfilEntity); + } else { + U8C_LIST_UPDATE.add(mdmBfJobmngfilEntity); + } + } + } + + + private List queryData(String start, String end) { + MdmBfJobmngfilEntity entity = new MdmBfJobmngfilEntity(); + entity.setStartTime(start); + entity.setEndTime(end); + List list = mdmBfJobmngfilDao.queryU8CAll(entity); + return list; + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmBfJobmngfilDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmBfJobmngfilDao.java new file mode 100644 index 00000000..c0911162 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmBfJobmngfilDao.java @@ -0,0 +1,20 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 基础档案：项目管理档案(mdm_bf_jobmngfil: table)表数据库访问层 + * + * @author zydd + * @since 2025-09-05 17:10:41 + */ +public interface IMdmBfJobmngfilDao extends IBaseDao { + + List queryU8CAll(MdmBfJobmngfilEntity entity); + + void saveList(List list); +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmBfJobmngfilDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmBfJobmngfilDaoImpl.java new file mode 100644 index 00000000..693068a0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmBfJobmngfilDaoImpl.java @@ -0,0 +1,36 @@ +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.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity; +import com.hzya.frame.plugin.gm.dao.IMdmBfJobmngfilDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 基础档案：项目管理档案(MdmBfJobmngfil)表数据库访问层 + * + * @author zydd + * @since 2025-09-05 17:10:41 + */ +public class MdmBfJobmngfilDaoImpl extends MybatisGenericDao implements IMdmBfJobmngfilDao { + + + @DS(ProfilesActiveConstant.GM_U8C_DATE_SOURCE) + @Override + public List queryU8CAll(MdmBfJobmngfilEntity entity) { + List all = (List) + selectList("com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl.queryU8CAll", entity); + return all; + } + + + @Override + public void saveList(List list) { + insert("com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl.saveList", list); + } +} + 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 index 31aca8c9..6b9d18fa 100644 --- 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 @@ -753,40 +753,49 @@ servicecost as servicecost, materialcost as materialcost, GREATEST( - COALESCE(aCreateTime, '1970-01-01 00:00:00'), - COALESCE(aUpdateTime, '1970-01-01 00:00:00'), - COALESCE(cUpdateTime, '1970-01-01 00:00:00'), - COALESCE(dUpdateTime, '1970-01-01 00:00:00'), - COALESCE(eUpdateTime, '1970-01-01 00:00:00'), - COALESCE(fUpdateTime, '1970-01-01 00:00:00'), - COALESCE(gUpdateTime, '1970-01-01 00:00:00'), - COALESCE(hUpdateTime, '1970-01-01 00:00:00'), - COALESCE(iUpdateTime, '1970-01-01 00:00:00') + COALESCE(aCreateTime,'1970-01-01 00:00:00'), + COALESCE(bCreateTime,'1970-01-01 00:00:00'), + COALESCE(cCreateTime,'1970-01-01 00:00:00'), + COALESCE(aUpdateTime,'1970-01-01 00:00:00'), + COALESCE(bUpdateTime,'1970-01-01 00:00:00'), + COALESCE(cUpdateTime,'1970-01-01 00:00:00'), + COALESCE(dUpdateTime,'1970-01-01 00:00:00'), + COALESCE(eUpdateTime,'1970-01-01 00:00:00'), + COALESCE(fUpdateTime,'1970-01-01 00:00:00'), + COALESCE(gUpdateTime,'1970-01-01 00:00:00'), + COALESCE(hUpdateTime,'1970-01-01 00:00:00'), + COALESCE(iUpdateTime,'1970-01-01 00:00:00') ) AS ts from u8c_acceptance_income_declaration where GREATEST( - COALESCE(aCreateTime, '1970-01-01 00:00:00'), - COALESCE(aUpdateTime, '1970-01-01 00:00:00'), - COALESCE(cUpdateTime, '1970-01-01 00:00:00'), - COALESCE(dUpdateTime, '1970-01-01 00:00:00'), - COALESCE(eUpdateTime, '1970-01-01 00:00:00'), - COALESCE(fUpdateTime, '1970-01-01 00:00:00'), - COALESCE(gUpdateTime, '1970-01-01 00:00:00'), - COALESCE(hUpdateTime, '1970-01-01 00:00:00'), - COALESCE(iUpdateTime, '1970-01-01 00:00:00') + COALESCE(aCreateTime,'1970-01-01 00:00:00'), + COALESCE(bCreateTime,'1970-01-01 00:00:00'), + COALESCE(cCreateTime,'1970-01-01 00:00:00'), + COALESCE(aUpdateTime,'1970-01-01 00:00:00'), + COALESCE(bUpdateTime,'1970-01-01 00:00:00'), + COALESCE(cUpdateTime,'1970-01-01 00:00:00'), + COALESCE(dUpdateTime,'1970-01-01 00:00:00'), + COALESCE(eUpdateTime,'1970-01-01 00:00:00'), + COALESCE(fUpdateTime,'1970-01-01 00:00:00'), + COALESCE(gUpdateTime,'1970-01-01 00:00:00'), + COALESCE(hUpdateTime,'1970-01-01 00:00:00'), + COALESCE(iUpdateTime,'1970-01-01 00:00:00') )>=#{startTime} and GREATEST( - COALESCE(aCreateTime, '1970-01-01 00:00:00'), - COALESCE(aUpdateTime, '1970-01-01 00:00:00'), - COALESCE(cUpdateTime, '1970-01-01 00:00:00'), - COALESCE(dUpdateTime, '1970-01-01 00:00:00'), - COALESCE(eUpdateTime, '1970-01-01 00:00:00'), - COALESCE(fUpdateTime, '1970-01-01 00:00:00'), - COALESCE(gUpdateTime, '1970-01-01 00:00:00'), - COALESCE(hUpdateTime, '1970-01-01 00:00:00'), - COALESCE(iUpdateTime, '1970-01-01 00:00:00') + COALESCE(aCreateTime,'1970-01-01 00:00:00'), + COALESCE(bCreateTime,'1970-01-01 00:00:00'), + COALESCE(cCreateTime,'1970-01-01 00:00:00'), + COALESCE(aUpdateTime,'1970-01-01 00:00:00'), + COALESCE(bUpdateTime,'1970-01-01 00:00:00'), + COALESCE(cUpdateTime,'1970-01-01 00:00:00'), + COALESCE(dUpdateTime,'1970-01-01 00:00:00'), + COALESCE(eUpdateTime,'1970-01-01 00:00:00'), + COALESCE(fUpdateTime,'1970-01-01 00:00:00'), + COALESCE(gUpdateTime,'1970-01-01 00:00:00'), + COALESCE(hUpdateTime,'1970-01-01 00:00:00'), + COALESCE(iUpdateTime,'1970-01-01 00:00:00') )<=#{endTime} 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 index 41be03bc..2a8ad63f 100644 --- 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 @@ -1027,7 +1027,7 @@ - INSERT INTO gmoa_acceptance_income_declaration ( + INSERT INTO gmoa_audit_declaration_form ( id, data_status, create_time, diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.java index 96e811fc..dc1f8b54 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.java @@ -281,5 +281,15 @@ public class GmoaContractPaymentReceiptEntity extends BaseEntity { this.skrhm = skrhm; } + + private String xmxztzftz; + + public String getXmxztzftz() { + return xmxztzftz; + } + + public void setXmxztzftz(String xmxztzftz) { + this.xmxztzftz = xmxztzftz; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.xml index 742de927..1282ad90 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.xml @@ -37,6 +37,7 @@ + @@ -73,6 +74,7 @@ ,khyh ,yhzh ,skrhm + ,xmxztzftz + select + + from mdm_bf_jobmngfil + + 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 create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} + and data_id = #{dataId} + and mdm_up_id = #{mdmUpId} + and pk_jobmngfil = #{pkJobmngfil} + and pk_jobbasfil = #{pkJobbasfil} + and code = #{code} + and name = #{name} + and remcode = #{remcode} + and pk_corp = #{pkCorp} + and sealflag = #{sealflag} + and ts = #{ts} + and dr = #{dr} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and sts='Y' + + order by sorts asc + order by ${sort} ${order} + + + + + + + + + + + + + + insert into mdm_bf_jobmngfil( + + 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 , + pk_jobmngfil , + pk_jobbasfil , + code , + name , + remcode , + pk_corp , + sealflag , + ts , + dr , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + 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} , + #{pkJobmngfil} , + #{pkJobbasfil} , + #{code} , + #{name} , + #{remcode} , + #{pkCorp} , + #{sealflag} , + #{ts} , + #{dr} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_bf_jobmngfil a WHERE + a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into mdm_bf_jobmngfil(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, pk_jobmngfil, pk_jobbasfil, code, name, remcode, pk_corp, sealflag, ts, dr, def1, def2, def3, def4, + def5, def6, def7, def8, def9, def10, 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.pkJobmngfil},#{entity.pkJobbasfil},#{entity.code},#{entity.name},#{entity.remcode},#{entity.pkCorp},#{entity.sealflag},#{entity.ts},#{entity.dr},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10}, + 'Y') + + + + + insert into mdm_bf_jobmngfil(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, pk_jobmngfil, pk_jobbasfil, code, name, remcode, pk_corp, sealflag, ts, dr, def1, def2, def3, def4, + def5, def6, def7, def8, def9, def10) + 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.pkJobmngfil},#{entity.pkJobbasfil},#{entity.code},#{entity.name},#{entity.remcode},#{entity.pkCorp},#{entity.sealflag},#{entity.ts},#{entity.dr},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10}) + + 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), + pk_jobmngfil = values(pk_jobmngfil), + pk_jobbasfil = values(pk_jobbasfil), + code = values(code), + name = values(name), + remcode = values(remcode), + pk_corp = values(pk_corp), + sealflag = values(sealflag), + ts = values(ts), + dr = values(dr), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6), + def7 = values(def7), + def8 = values(def8), + def9 = values(def9), + def10 = values(def10) + + + + update mdm_bf_jobmngfil 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}, + pk_jobmngfil = #{pkJobmngfil}, + pk_jobbasfil = #{pkJobbasfil}, + code = #{code}, + name = #{name}, + remcode = #{remcode}, + pk_corp = #{pkCorp}, + sealflag = #{sealflag}, + ts = #{ts}, + dr = #{dr}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + + where id = #{id} + + + + update mdm_bf_jobmngfil + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update mdm_bf_jobmngfil 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 pk_jobmngfil = #{pkJobmngfil} + and pk_jobbasfil = #{pkJobbasfil} + and code = #{code} + and name = #{name} + and remcode = #{remcode} + and pk_corp = #{pkCorp} + and sealflag = #{sealflag} + and ts = #{ts} + and dr = #{dr} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and sts='Y' + + + + + delete + from mdm_bf_jobmngfil + where + 1=1 + and id = #{id} + and pk_jobmngfil = #{pkJobmngfil} + + + + + + + + insert into mdm_bf_jobmngfil( + id, + data_status, + create_time, + sts, + + pk_jobmngfil, + pk_jobbasfil, + code, + name, + remcode, + pk_corp, + sealflag, + ts, + dr, + def1, + def2, + def3, + def4, + def5, + def6, + def7, + def8, + def9, + def10 + )values + + ( + #{item.id}, + #{item.dataStatus}, + now(), + #{item.sts}, + #{item.pkJobmngfil}, + #{item.pkJobbasfil}, + #{item.code}, + #{item.name}, + #{item.remcode}, + #{item.pkCorp}, + #{item.sealflag}, + #{item.ts}, + #{item.dr}, + #{item.def1}, + #{item.def2}, + #{item.def3}, + #{item.def4}, + #{item.def5}, + #{item.def6}, + #{item.def7}, + #{item.def8}, + #{item.def9}, + #{item.def10} + ) + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java index 48cba05d..6d1baf9f 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java @@ -77,6 +77,15 @@ public class MdmGmSubjectBalanceEntity extends BaseEntity { private String def10; /** 余额 */ private String balance; + private String yearv; + + public String getYearv() { + return yearv; + } + + public void setYearv(String yearv) { + this.yearv = yearv; + } public String getSubjcodes() { return subjcodes; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml index cae418c5..928e9431 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml @@ -653,11 +653,12 @@ INNER JOIN gl_voucher voucher ON voucher.pk_voucher = gl_detail.pk_voucher WHERE 1=1 - AND bd_accsubj.subjcode IN (${subjcodes}) - AND gl_detail.dr = 0 - AND gl_detail.discardflagv = 'N' - AND pk_managerv != 'N/A' + AND bd_accsubj.subjcode IN (${subjcodes}) + AND gl_detail.dr = 0 + AND gl_detail.discardflagv = 'N' + AND pk_managerv != 'N/A' AND gl_detail.pk_corp = #{pkCorp} + AND gl_detail.yearv = #{yearv} GROUP BY gl_detail.pk_corp, bd_accsubj.subjcode, 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 5db444da..6c4df609 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 @@ -467,6 +467,19 @@ public class BdController extends DefaultController { } } + @Autowired + private U8C_plugin_bd_jobmngfil u8CPluginBdJobmngfil; + @RequestMapping(value = "/u8CPluginBdJobmngfil", method = RequestMethod.POST) + public JsonResultEntity u8CPluginBdJobmngfil (String start,String end) { + try { + u8CPluginBdJobmngfil.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/generate/core/service/impl/ICoreServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java index 4e2eedc7..36e3f4c0 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 @@ -1843,7 +1843,14 @@ public class ICoreServiceImpl implements ICoreService { //计算 for (int i = 0; i =1){ @@ -2460,13 +2467,19 @@ public class ICoreServiceImpl implements ICoreService { if("gmoa_acceptance_income_declaration".equals(dbName)){ String one_project_type = dataValue.get(0).get("one_project_type").toString(); MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO(); + mdmDBQueryVO.setPkentityorg(vouche.getPk_corp()); mdmDBQueryVO.setTablename("mdm_bf_defdoc_quyu"); mdmDBQueryVO.setProp7("docname"); mdmDBQueryVO.setPropValue7(one_project_type); +// mdmDBQueryVO.setProp8("sealflag"); +// mdmDBQueryVO.setPropValue8("N"); List> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO); if(maps.size()>1){ Assert.state(false,"one_project_type：{}，查询mdm_bf_defdoc_quyu，根据区域查询不唯一",one_project_type); } + if(maps.size()==0){ + Assert.state(false,"one_project_type：{}，查询mdm_bf_defdoc_quyu，根据区域查询为空",one_project_type); + } String doccode = maps.get(0).get("doccode").toString(); code3=doccode; } 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 1850b599..3584bcc8 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 @@ -8,4 +8,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 867c4108..09ea115e 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 @@ -11,4 +11,10 @@ + + + + + +