From 560ff867e7f8bc040d6acbcf4462f73b0c5965d1 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 26 Aug 2025 22:32:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E8=B0=83=E6=95=B4=E5=8D=95=E5=90=8C=E6=AD=A5=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gm/OA_plugin_cost_adjustment_audit.java | 231 +++++++ .../gm/dao/IGmoaCostAdjustmentAuditDao.java | 22 + .../impl/GmoaCostAdjustmentAuditDaoImpl.java | 32 + .../entity/GmoaCostAdjustmentAuditEntity.java | 264 ++++++++ .../entity/GmoaCostAdjustmentAuditEntity.xml | 568 ++++++++++++++++++ .../ae/comf/bd/controller/BdController.java | 15 + .../src/main/resources/application-gmdev.yml | 2 +- .../gm/spring/spring-buildpackage-dao.xml | 1 + .../gm/spring/spring-buildpackage-plugin.xml | 2 + pom.xml | 27 +- 10 files changed, 1159 insertions(+), 5 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_cost_adjustment_audit.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaCostAdjustmentAuditDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaCostAdjustmentAuditDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.xml 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 new file mode 100644 index 00000000..816eb21d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_cost_adjustment_audit.java @@ -0,0 +1,231 @@ +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.impl.GmoaAuditDeclarationFormDaoImpl; +import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +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_cost_adjustment_audit extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(OA_plugin_cost_adjustment_audit.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_cost_adjustment_audit"; + } + + @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 IGmoaCostAdjustmentAuditDao adjustmentAuditDao; + + + 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 (GmoaCostAdjustmentAuditEntity gmoaCostAdjustmentAuditEntity : allOAList) { + String billCode = gmoaCostAdjustmentAuditEntity.getBillCode(); + GmoaCostAdjustmentAuditEntity adjustmentAuditEntity = new GmoaCostAdjustmentAuditEntity(); + adjustmentAuditEntity.setBillCode(billCode); + List query = adjustmentAuditDao.query(adjustmentAuditEntity); + if (query.size() == 0) { + OA_LIST_SAVE.add(gmoaCostAdjustmentAuditEntity); + continue; + } + GmoaCostAdjustmentAuditEntity gmoaCostAdjustmentAudit1 = query.get(0); + String billstatus = gmoaCostAdjustmentAudit1.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(gmoaCostAdjustmentAuditEntity.getTs()); + integrationTaskLivingDetailsEntity.setRootAppPk(billCode); + integrationTaskLivingDetailsEntity.setRootAppBill(billCode); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); + continue; + } + OA_LIST_UPDATE.add(gmoaCostAdjustmentAuditEntity); + } + } + + //批量更新 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 gmoaCostAdjustmentAuditEntities : partition) { + adjustmentAuditDao.saveList(gmoaCostAdjustmentAuditEntities); + } +// for (GmoaCostAdjustmentAuditEntity gmoaCostAdjustmentAuditEntity : oaListSave) { +// adjustmentAuditDao.save(gmoaCostAdjustmentAuditEntity); +// } + + } + + + private void updateData(List oaListUpdate) { + + List list = new ArrayList<>(); + + for (GmoaCostAdjustmentAuditEntity gmoaCostAdjustmentAuditEntity : oaListUpdate) { + String billCode = gmoaCostAdjustmentAuditEntity.getBillCode(); + + GmoaCostAdjustmentAuditEntity deleteEntity = new GmoaCostAdjustmentAuditEntity(); + deleteEntity.setBillCode(billCode); + adjustmentAuditDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl.entity_delete", deleteEntity); + list.add(gmoaCostAdjustmentAuditEntity); + } + saveData(list); + } + + + private List queryData(String start, String end) { + GmoaCostAdjustmentAuditEntity entity = new GmoaCostAdjustmentAuditEntity(); + entity.setStartTime(start); + entity.setEndTime(end); + List all = adjustmentAuditDao.queryOAAll(entity); + return all; + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaCostAdjustmentAuditDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaCostAdjustmentAuditDao.java new file mode 100644 index 00000000..4d16792a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaCostAdjustmentAuditDao.java @@ -0,0 +1,22 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 广脉OA：成本调整单(gmoa_cost_adjustment_audit: table)表数据库访问层 + * + * @author zydd + * @since 2025-08-26 20:42:59 + */ +public interface IGmoaCostAdjustmentAuditDao extends IBaseDao { + + List queryOAAll(GmoaCostAdjustmentAuditEntity entity); + + void saveList(List list); + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaCostAdjustmentAuditDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaCostAdjustmentAuditDaoImpl.java new file mode 100644 index 00000000..3602ee1b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaCostAdjustmentAuditDaoImpl.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.GmoaAuditDeclarationFormEntity; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.plugin.gm.dao.IGmoaCostAdjustmentAuditDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 广脉OA：成本调整单(GmoaCostAdjustmentAudit)表数据库访问层 + * + * @author zydd + * @since 2025-08-26 20:42:59 + */ +public class GmoaCostAdjustmentAuditDaoImpl extends MybatisGenericDao implements IGmoaCostAdjustmentAuditDao{ + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + @Override + public List queryOAAll(GmoaCostAdjustmentAuditEntity entity) { + List all = (List) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl.queryOAAll", entity); + return all; + } + + @Override + public void saveList(List list) { + insert("com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl.saveList",list); + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.java new file mode 100644 index 00000000..12484a40 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.java @@ -0,0 +1,264 @@ +package com.hzya.frame.plugin.gm.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 广脉OA：成本调整单(GmoaCostAdjustmentAudit)实体类 + * + * @author zydd + * @since 2025-08-26 20:42:59 + */ +public class GmoaCostAdjustmentAuditEntity 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; + /** 制单人 */ + private String billmark; + /** 一级项目类型 */ + private String oneProjectType; + /** 项目ID */ + private String projectId; + /** 项目编号 */ + private String projectCode; + /** 项目名称 */ + private String projectName; + /** 成本类别 */ + private String costtype; + /** 审定支出金额（除税)之和 */ + private String auditcost; + /** 验收收入申报服务成本结算金额（除税）之和 */ + private String acceptancecost; + /** 供应商 */ + private String custname; + /** 生成状态 */ + 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 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 getBillmark() { + return billmark; + } + + public void setBillmark(String billmark) { + this.billmark = billmark; + } + + public String getOneProjectType() { + return oneProjectType; + } + + public void setOneProjectType(String oneProjectType) { + this.oneProjectType = oneProjectType; + } + + 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 getCosttype() { + return costtype; + } + + public void setCosttype(String costtype) { + this.costtype = costtype; + } + + public String getAuditcost() { + return auditcost; + } + + public void setAuditcost(String auditcost) { + this.auditcost = auditcost; + } + + public String getAcceptancecost() { + return acceptancecost; + } + + public void setAcceptancecost(String acceptancecost) { + this.acceptancecost = acceptancecost; + } + + public String getCustname() { + return custname; + } + + public void setCustname(String custname) { + this.custname = custname; + } + + 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; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.xml new file mode 100644 index 00000000..e8077e59 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.xml @@ -0,0 +1,568 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + ,billmark + ,one_project_type + ,project_id + ,project_code + ,project_name + ,costtype + ,auditcost + ,acceptancecost + ,custname + ,billstatus + ,ts + + + + + + + + + + + + + + + + insert into gmoa_cost_adjustment_audit( + + 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 , + billmark , + one_project_type , + project_id , + project_code , + project_name , + costtype , + auditcost , + acceptancecost , + custname , + 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} , + #{examineDate} , + #{billmark} , + #{oneProjectType} , + #{projectId} , + #{projectCode} , + #{projectName} , + #{costtype} , + #{auditcost} , + #{acceptancecost} , + #{custname} , + #{billstatus} , + #{ts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from gmoa_cost_adjustment_audit a + WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into gmoa_cost_adjustment_audit(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, billmark, one_project_type, project_id, project_code, + project_name, costtype, auditcost, acceptancecost, custname, 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.examineDate},#{entity.billmark},#{entity.oneProjectType},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.costtype},#{entity.auditcost},#{entity.acceptancecost},#{entity.custname},#{entity.billstatus},#{entity.ts}, + 'Y') + + + + + insert into gmoa_cost_adjustment_audit(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, billmark, one_project_type, project_id, project_code, + project_name, costtype, auditcost, acceptancecost, custname, 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.examineDate},#{entity.billmark},#{entity.oneProjectType},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.costtype},#{entity.auditcost},#{entity.acceptancecost},#{entity.custname},#{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), + examine_date = values(examine_date), + billmark = values(billmark), + one_project_type = values(one_project_type), + project_id = values(project_id), + project_code = values(project_code), + project_name = values(project_name), + costtype = values(costtype), + auditcost = values(auditcost), + acceptancecost = values(acceptancecost), + custname = values(custname), + billstatus = values(billstatus), + ts = values(ts) + + + + update gmoa_cost_adjustment_audit 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}, + billmark = #{billmark}, + one_project_type = #{oneProjectType}, + project_id = #{projectId}, + project_code = #{projectCode}, + project_name = #{projectName}, + costtype = #{costtype}, + auditcost = #{auditcost}, + acceptancecost = #{acceptancecost}, + custname = #{custname}, + billstatus = #{billstatus}, + ts = #{ts}, + + where id = #{id} + + + + update gmoa_cost_adjustment_audit + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update gmoa_cost_adjustment_audit 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 billmark = #{billmark} + and one_project_type = #{oneProjectType} + and project_id = #{projectId} + and project_code = #{projectCode} + and project_name = #{projectName} + and costtype = #{costtype} + and auditcost = #{auditcost} + and acceptancecost = #{acceptancecost} + and custname = #{custname} + and billstatus = #{billstatus} + and ts = #{ts} + and sts='Y' + + + + + delete + from gmoa_cost_adjustment_audit + where id = #{id} + + + + + + + + + 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 288023c7..fb73512c 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 @@ -10,6 +10,7 @@ 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.OA_plugin_cost_adjustment_audit; import com.hzya.frame.plugin.gm.SubjectAssBalancePlugin; import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; import com.hzya.frame.voucher.ae.comf.bd.dao.*; @@ -443,6 +444,20 @@ public class BdController extends DefaultController { } + @Autowired + private OA_plugin_cost_adjustment_audit oaPluginCostAdjustmentAudit; + @RequestMapping(value = "/oaPluginCostAdjustmentAudit", method = RequestMethod.POST) + public JsonResultEntity oaPluginCostAdjustmentAudit (String start,String end) { + try { + oaPluginCostAdjustmentAudit.start(start,end); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + // /** // * // */ diff --git a/base-buildpackage/src/main/resources/application-gmdev.yml b/base-buildpackage/src/main/resources/application-gmdev.yml index 8d9409ca..138310b2 100644 --- a/base-buildpackage/src/main/resources/application-gmdev.yml +++ b/base-buildpackage/src/main/resources/application-gmdev.yml @@ -12,7 +12,7 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://127.0.0.1:3306/bussinesscenter_voucher_gm_20250815?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true + url: jdbc:mysql://127.0.0.1:3306/businesscenter_voucher_gm_20250821?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true username: root password: 9b1b3fca9719736fe4210f4e0a6df338 driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 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 162031cd..0a191c07 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 @@ -6,4 +6,5 @@ + 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 c17771ed..db9337a2 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 @@ -7,4 +7,6 @@ + + diff --git a/pom.xml b/pom.xml index dd015e4f..bb24ba32 100644 --- a/pom.xml +++ b/pom.xml @@ -335,10 +335,27 @@ + + + + + + + + + + + + + + + + + org.codehaus.mojo flatten-maven-plugin - 1.2.7 + 1.4.1 flatten @@ -346,13 +363,15 @@ flatten + + + - - resolveCiFriendliesOnly - + + org.apache.maven.plugins