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 index fe153be4..af6afbac 100644 --- 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 @@ -1,12 +1,229 @@ -//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 { -// -// -// -//} +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.IGmoaTransferDeclarationFormDao; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.plugin.gm.entity.GmoaTransferDeclarationFormEntity; +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-06 16:58 + */ +public class OA_plugin_transfer_declaration_form extends PluginBaseEntity { + + Logger logger = LoggerFactory.getLogger(OA_plugin_transfer_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_transfer_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 IGmoaTransferDeclarationFormDao transferDeclarationFormDao; + + + public void start() { + OA_LIST_SAVE.clear(); + OA_LIST_UPDATE.clear(); + try { + // 获取当前日期和时间,时间偏移10分钟 + LocalDateTime now = LocalDateTime.now(); + String end = now.format(formatter); + String start = now.minusMinutes(30L).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 updateData(List oaListUpdate) { + List list = new ArrayList<>(); + + for (GmoaTransferDeclarationFormEntity gmoaTransferDeclarationFormEntity : oaListUpdate) { + String billCode = gmoaTransferDeclarationFormEntity.getBillCode(); + + GmoaTransferDeclarationFormEntity deleteEntity = new GmoaTransferDeclarationFormEntity(); + deleteEntity.setBillCode(billCode); + transferDeclarationFormDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaTransferDeclarationFormDaoImpl.entity_delete",deleteEntity); + list.add(gmoaTransferDeclarationFormEntity); + } + saveData(list); + } + + 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 gmoaTransferDeclarationFormEntities : partition) { + transferDeclarationFormDao.saveList(gmoaTransferDeclarationFormEntities); + } + } + + + private void filterData(List allOAList) { + for (GmoaTransferDeclarationFormEntity gmoaTransferDeclarationFormEntity : allOAList) { + String billCode = gmoaTransferDeclarationFormEntity.getBillCode(); + GmoaTransferDeclarationFormEntity gmoaTransferDeclarationForm = new GmoaTransferDeclarationFormEntity(); + gmoaTransferDeclarationForm.setBillCode(billCode); + List query = transferDeclarationFormDao.query(gmoaTransferDeclarationForm); + if(query.size() == 0){ + OA_LIST_SAVE.add(gmoaTransferDeclarationFormEntity); + continue; + } + GmoaTransferDeclarationFormEntity gmoaTransferDeclarationFormEntity1 = query.get(0); + String billstatus = gmoaTransferDeclarationFormEntity1.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(gmoaTransferDeclarationFormEntity.getTs()); + integrationTaskLivingDetailsEntity.setRootAppPk(billCode); + integrationTaskLivingDetailsEntity.setRootAppBill(billCode); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); + continue; + } + OA_LIST_UPDATE.add(gmoaTransferDeclarationFormEntity); + } + + } + + + + + + + + + private List queryData(String start, String end) { + GmoaTransferDeclarationFormEntity entity = new GmoaTransferDeclarationFormEntity(); + entity.setStartTime(start); + entity.setEndTime(end); + List all = transferDeclarationFormDao.queryOAAll(entity); + return all; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaTransferDeclarationFormDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaTransferDeclarationFormDao.java new file mode 100644 index 00000000..175e5606 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaTransferDeclarationFormDao.java @@ -0,0 +1,22 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.plugin.gm.entity.GmoaTransferDeclarationFormEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 广脉OA:转资申报单(gmoa_transfer_declaration_form: table)表数据库访问层 + * + * @author zydd + * @since 2025-09-06 17:12:13 + */ +public interface IGmoaTransferDeclarationFormDao extends IBaseDao { + + List queryOAAll(GmoaTransferDeclarationFormEntity entity); + + void saveList(List list); + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaTransferDeclarationFormDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaTransferDeclarationFormDaoImpl.java new file mode 100644 index 00000000..a68eb75c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaTransferDeclarationFormDaoImpl.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.GmoaCostAdjustmentAuditEntity; +import com.hzya.frame.plugin.gm.entity.GmoaTransferDeclarationFormEntity; +import com.hzya.frame.plugin.gm.dao.IGmoaTransferDeclarationFormDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 广脉OA:转资申报单(GmoaTransferDeclarationForm)表数据库访问层 + * + * @author zydd + * @since 2025-09-06 17:12:13 + */ +public class GmoaTransferDeclarationFormDaoImpl extends MybatisGenericDao implements IGmoaTransferDeclarationFormDao{ + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + @Override + public List queryOAAll(GmoaTransferDeclarationFormEntity entity) { + List all = (List) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaTransferDeclarationFormDaoImpl.queryOAAll", entity); + return all; + } + + @Override + public void saveList(List list) { + insert("com.hzya.frame.plugin.gm.dao.impl.GmoaTransferDeclarationFormDaoImpl.saveList",list); + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaTransferDeclarationFormEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaTransferDeclarationFormEntity.java new file mode 100644 index 00000000..70c9192c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaTransferDeclarationFormEntity.java @@ -0,0 +1,354 @@ +package com.hzya.frame.plugin.gm.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 广脉OA:转资申报单(GmoaTransferDeclarationForm)实体类 + * + * @author zydd + * @since 2025-09-06 17:12:13 + */ +public class GmoaTransferDeclarationFormEntity 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; + /** 项目ID */ + private String projectId; + /** 项目编码 */ + private String projectCode; + /** 项目名称 */ + private String projectName; + /** 起租日期 */ + private String onhireDate; + /** 成本类别 */ + private String costType; + /** 制单人 */ + private String makerName; + /** 制单日期 */ + private Date prepareddate; + /** 审核人 */ + private String checkName; + /** 审核日期 */ + private Date checkDate; + /** 材料折旧年限1 */ + private String materialDepreciationDate1; + /** 材料折旧年限2 */ + private String materialDepreciationDate2; + /** 服务折旧年限 */ + private String serveDepreciationDate; + /** 转资金额(除税) */ + private String transferMoney; + /** 材料成本1 */ + private String materialCost1; + /** 材料成本2 */ + private String materialCost2; + /** 出租方 */ + private String lessor; + /** 建设期场租(除税) */ + private String constructionColocation; + /** 供应商 */ + private String suppliername; + /** 最后更新时间 */ + private String ts; + /** 一级项目类型 */ + private String oneProjectType; + /** 生成状态 */ + private String billstatus; + 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 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 getOnhireDate() { + return onhireDate; + } + + public void setOnhireDate(String onhireDate) { + this.onhireDate = onhireDate; + } + + public String getCostType() { + return costType; + } + + public void setCostType(String costType) { + this.costType = costType; + } + + public String getMakerName() { + return makerName; + } + + public void setMakerName(String makerName) { + this.makerName = makerName; + } + + public Date getPrepareddate() { + return prepareddate; + } + + public void setPrepareddate(Date prepareddate) { + this.prepareddate = prepareddate; + } + + public String getCheckName() { + return checkName; + } + + public void setCheckName(String checkName) { + this.checkName = checkName; + } + + public Date getCheckDate() { + return checkDate; + } + + public void setCheckDate(Date checkDate) { + this.checkDate = checkDate; + } + + public String getMaterialDepreciationDate1() { + return materialDepreciationDate1; + } + + public void setMaterialDepreciationDate1(String materialDepreciationDate1) { + this.materialDepreciationDate1 = materialDepreciationDate1; + } + + public String getMaterialDepreciationDate2() { + return materialDepreciationDate2; + } + + public void setMaterialDepreciationDate2(String materialDepreciationDate2) { + this.materialDepreciationDate2 = materialDepreciationDate2; + } + + public String getServeDepreciationDate() { + return serveDepreciationDate; + } + + public void setServeDepreciationDate(String serveDepreciationDate) { + this.serveDepreciationDate = serveDepreciationDate; + } + + public String getTransferMoney() { + return transferMoney; + } + + public void setTransferMoney(String transferMoney) { + this.transferMoney = transferMoney; + } + + public String getMaterialCost1() { + return materialCost1; + } + + public void setMaterialCost1(String materialCost1) { + this.materialCost1 = materialCost1; + } + + public String getMaterialCost2() { + return materialCost2; + } + + public void setMaterialCost2(String materialCost2) { + this.materialCost2 = materialCost2; + } + + public String getLessor() { + return lessor; + } + + public void setLessor(String lessor) { + this.lessor = lessor; + } + + public String getConstructionColocation() { + return constructionColocation; + } + + public void setConstructionColocation(String constructionColocation) { + this.constructionColocation = constructionColocation; + } + + public String getSuppliername() { + return suppliername; + } + + public void setSuppliername(String suppliername) { + this.suppliername = suppliername; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getOneProjectType() { + return oneProjectType; + } + + public void setOneProjectType(String oneProjectType) { + this.oneProjectType = oneProjectType; + } + + public String getBillstatus() { + return billstatus; + } + + public void setBillstatus(String billstatus) { + this.billstatus = billstatus; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaTransferDeclarationFormEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaTransferDeclarationFormEntity.xml new file mode 100644 index 00000000..2e5b7de0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaTransferDeclarationFormEntity.xml @@ -0,0 +1,764 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + ,onhire_date + ,cost_type + ,maker_name + ,prepareddate + ,check_name + ,check_date + ,material_depreciation_date1 + ,material_depreciation_date2 + ,serve_depreciation_date + ,transfer_money + ,material_cost1 + ,material_cost2 + ,lessor + ,construction_colocation + ,suppliername + ,ts + ,one_project_type + ,billstatus + + + + + + + + + + + + + + + + insert into gmoa_transfer_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 , + project_id , + project_code , + project_name , + onhire_date , + cost_type , + maker_name , + prepareddate , + check_name , + check_date , + material_depreciation_date1 + , + + material_depreciation_date2 + , + + serve_depreciation_date , + transfer_money , + material_cost1 , + material_cost2 , + lessor , + construction_colocation , + suppliername , + ts , + one_project_type , + billstatus , + 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} , + #{onhireDate} , + #{costType} , + #{makerName} , + #{prepareddate} , + #{checkName} , + #{checkDate} , + + #{materialDepreciationDate1} , + + + #{materialDepreciationDate2} , + + #{serveDepreciationDate} , + #{transferMoney} , + #{materialCost1} , + #{materialCost2} , + #{lessor} , + #{constructionColocation} , + #{suppliername} , + #{ts} , + #{oneProjectType} , + #{billstatus} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from + gmoa_transfer_declaration_form a WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into gmoa_transfer_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, project_id, project_code, project_name, onhire_date, cost_type, + maker_name, prepareddate, check_name, check_date, material_depreciation_date1, material_depreciation_date2, + serve_depreciation_date, transfer_money, material_cost1, material_cost2, lessor, construction_colocation, + suppliername, ts, one_project_type, billstatus, 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.onhireDate},#{entity.costType},#{entity.makerName},#{entity.prepareddate},#{entity.checkName},#{entity.checkDate},#{entity.materialDepreciationDate1},#{entity.materialDepreciationDate2},#{entity.serveDepreciationDate},#{entity.transferMoney},#{entity.materialCost1},#{entity.materialCost2},#{entity.lessor},#{entity.constructionColocation},#{entity.suppliername},#{entity.ts},#{entity.oneProjectType},#{entity.billstatus}, + 'Y') + + + + + insert into gmoa_transfer_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, project_id, project_code, project_name, onhire_date, cost_type, + maker_name, prepareddate, check_name, check_date, material_depreciation_date1, material_depreciation_date2, + serve_depreciation_date, transfer_money, material_cost1, material_cost2, lessor, construction_colocation, + suppliername, ts, one_project_type, billstatus) + 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.onhireDate},#{entity.costType},#{entity.makerName},#{entity.prepareddate},#{entity.checkName},#{entity.checkDate},#{entity.materialDepreciationDate1},#{entity.materialDepreciationDate2},#{entity.serveDepreciationDate},#{entity.transferMoney},#{entity.materialCost1},#{entity.materialCost2},#{entity.lessor},#{entity.constructionColocation},#{entity.suppliername},#{entity.ts},#{entity.oneProjectType},#{entity.billstatus}) + + 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), + onhire_date = values(onhire_date), + cost_type = values(cost_type), + maker_name = values(maker_name), + prepareddate = values(prepareddate), + check_name = values(check_name), + check_date = values(check_date), + material_depreciation_date1 = values(material_depreciation_date1), + material_depreciation_date2 = values(material_depreciation_date2), + serve_depreciation_date = values(serve_depreciation_date), + transfer_money = values(transfer_money), + material_cost1 = values(material_cost1), + material_cost2 = values(material_cost2), + lessor = values(lessor), + construction_colocation = values(construction_colocation), + suppliername = values(suppliername), + ts = values(ts), + one_project_type = values(one_project_type), + billstatus = values(billstatus) + + + + update gmoa_transfer_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}, + project_id = #{projectId}, + project_code = #{projectCode}, + project_name = #{projectName}, + onhire_date = #{onhireDate}, + cost_type = #{costType}, + maker_name = #{makerName}, + prepareddate = #{prepareddate}, + check_name = #{checkName}, + check_date = #{checkDate}, + material_depreciation_date1 + = #{materialDepreciationDate1}, + + material_depreciation_date2 + = #{materialDepreciationDate2}, + + serve_depreciation_date = + #{serveDepreciationDate}, + + transfer_money = #{transferMoney}, + material_cost1 = #{materialCost1}, + material_cost2 = #{materialCost2}, + lessor = #{lessor}, + construction_colocation = + #{constructionColocation}, + + suppliername = #{suppliername}, + ts = #{ts}, + one_project_type = #{oneProjectType}, + billstatus = #{billstatus}, + + where id = #{id} + + + + update gmoa_transfer_declaration_form + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update gmoa_transfer_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 project_id = #{projectId} + and project_code = #{projectCode} + and project_name = #{projectName} + and onhire_date = #{onhireDate} + and cost_type = #{costType} + and maker_name = #{makerName} + and prepareddate = #{prepareddate} + and check_name = #{checkName} + and check_date = #{checkDate} + and + material_depreciation_date1 = #{materialDepreciationDate1} + + and + material_depreciation_date2 = #{materialDepreciationDate2} + + and serve_depreciation_date = + #{serveDepreciationDate} + + and transfer_money = #{transferMoney} + and material_cost1 = #{materialCost1} + and material_cost2 = #{materialCost2} + and lessor = #{lessor} + and construction_colocation = + #{constructionColocation} + + and suppliername = #{suppliername} + and ts = #{ts} + and one_project_type = #{oneProjectType} + and billstatus = #{billstatus} + and sts='Y' + + + + + delete + from gmoa_transfer_declaration_form + where + 1=1 + and id = #{id} + and bill_code = #{billCode} + + + + + + + insert into gmoa_transfer_declaration_form( + id, + data_status, + create_time, + sts, + billstatus, + + + + + bill_code, + declare_date, + one_project_type, + project_id, + project_code, + project_name, + onhire_date, + cost_type, + maker_name, + prepareddate, + check_name, + check_date, + material_depreciation_date1, + material_depreciation_date2, + serve_depreciation_date, + transfer_money, + material_cost1, + material_cost2, + lessor, + construction_colocation, + suppliername, + ts + )values + + ( + #{item.id}, + #{item.dataStatus}, + now(), + #{item.sts}, + 'N', + + + + + + #{item.billCode}, + #{item.declareDate}, + #{item.oneProjectType}, + #{item.projectId}, + #{item.projectCode}, + #{item.projectName}, + #{item.onhireDate}, + #{item.costType}, + #{item.makerName}, + #{item.prepareddate}, + #{item.checkName}, + #{item.checkDate}, + #{item.materialDepreciationDate1}, + #{item.materialDepreciationDate2}, + #{item.serveDepreciationDate}, + #{item.transferMoney}, + #{item.materialCost1}, + #{item.materialCost2}, + #{item.lessor}, + #{item.constructionColocation}, + #{item.suppliername}, + #{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 6c4df609..ed23231d 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,21 @@ public class BdController extends DefaultController { } } + @Autowired + private OA_plugin_transfer_declaration_form oaPluginTransferDeclarationForm; + @RequestMapping(value = "/oaPluginTransferDeclarationForm", method = RequestMethod.POST) + public JsonResultEntity oaPluginTransferDeclarationForm (String start,String end) { + try { + oaPluginTransferDeclarationForm.start(start,end); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + + @Autowired private U8C_plugin_bd_jobmngfil u8CPluginBdJobmngfil; @RequestMapping(value = "/u8CPluginBdJobmngfil", method = RequestMethod.POST) @@ -481,6 +496,8 @@ public class BdController extends DefaultController { } + + // /** // * // */ diff --git a/base-buildpackage/src/main/resources/application-gmdev.yml b/base-buildpackage/src/main/resources/application-gmdev.yml index 138310b2..06124b5d 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/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 + url: jdbc:mysql://127.0.0.1:3306/businesscenter_voucher_gm_20250905?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 3584bcc8..2cc65353 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,6 +8,7 @@ + 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 09ea115e..91db0753 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,7 +11,8 @@ - + +