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 new file mode 100644 index 00000000..9c2ef3f2 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_contract_payment_receipt.java @@ -0,0 +1,230 @@ +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.IGmoaContractPaymentReceiptDao; +import com.hzya.frame.plugin.gm.dao.IGmoaCostAdjustmentAuditDao; +import com.hzya.frame.plugin.gm.entity.GmoaContractPaymentReceiptEntity; +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_contract_payment_receipt extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(OA_plugin_contract_payment_receipt.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_contract_payment_receipt"; + } + + @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 IGmoaContractPaymentReceiptDao contractPaymentReceiptDao; + + + 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 (GmoaContractPaymentReceiptEntity gmoaContractPaymentReceiptEntity : allOAList) { + String billCode = gmoaContractPaymentReceiptEntity.getBillCode(); + GmoaContractPaymentReceiptEntity contractPaymentReceiptEntity = new GmoaContractPaymentReceiptEntity(); + contractPaymentReceiptEntity.setBillCode(billCode); + List query = contractPaymentReceiptDao.query(contractPaymentReceiptEntity); + if (query.size() == 0) { + OA_LIST_SAVE.add(gmoaContractPaymentReceiptEntity); + continue; + } + GmoaContractPaymentReceiptEntity gmoaContractPaymentReceiptEntity1 = query.get(0); + String billstatus = gmoaContractPaymentReceiptEntity1.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(gmoaContractPaymentReceiptEntity.getTs()); + integrationTaskLivingDetailsEntity.setRootAppPk(billCode); + integrationTaskLivingDetailsEntity.setRootAppBill(billCode); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); + continue; + } + OA_LIST_UPDATE.add(gmoaContractPaymentReceiptEntity); + } + } + + //批量更新 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 gmoaContractPaymentReceiptEntities : partition) { + contractPaymentReceiptDao.saveList(gmoaContractPaymentReceiptEntities); + } +// for (GmoaContractPaymentReceiptEntity gmoaContractPaymentReceiptEntity : oaListSave) { +// adjustmentAuditDao.save(gmoaContractPaymentReceiptEntity); +// } + + } + + + private void updateData(List oaListUpdate) { + + List list = new ArrayList<>(); + + for (GmoaContractPaymentReceiptEntity gmoaContractPaymentReceiptEntity : oaListUpdate) { + String billCode = gmoaContractPaymentReceiptEntity.getBillCode(); + + GmoaContractPaymentReceiptEntity deleteEntity = new GmoaContractPaymentReceiptEntity(); + deleteEntity.setBillCode(billCode); + contractPaymentReceiptDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaContractPaymentReceiptDaoImpl.entity_delete", deleteEntity); + list.add(gmoaContractPaymentReceiptEntity); + } + saveData(list); + } + + + private List queryData(String start, String end) { + GmoaContractPaymentReceiptEntity entity = new GmoaContractPaymentReceiptEntity(); + entity.setStartTime(start); + entity.setEndTime(end); + List all = contractPaymentReceiptDao.queryOAAll(entity); + return all; + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaContractPaymentReceiptDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaContractPaymentReceiptDao.java new file mode 100644 index 00000000..b81c03aa --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaContractPaymentReceiptDao.java @@ -0,0 +1,22 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.hzya.frame.plugin.gm.entity.GmoaContractPaymentReceiptEntity; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; + +import java.util.List; + +/** + * 广脉OA:合同收款单(gmoa_contract_payment_receipt: table)表数据库访问层 + * + * @author zydd + * @since 2025-08-27 09:36:34 + */ +public interface IGmoaContractPaymentReceiptDao extends IBaseDao { + + List queryOAAll(GmoaContractPaymentReceiptEntity entity); + + void saveList(List list); + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaContractPaymentReceiptDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaContractPaymentReceiptDaoImpl.java new file mode 100644 index 00000000..c7d985d0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaContractPaymentReceiptDaoImpl.java @@ -0,0 +1,33 @@ +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.GmoaContractPaymentReceiptEntity; +import com.hzya.frame.plugin.gm.dao.IGmoaContractPaymentReceiptDao; +import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 广脉OA:合同收款单(GmoaContractPaymentReceipt)表数据库访问层 + * + * @author zydd + * @since 2025-08-27 09:36:34 + */ +public class GmoaContractPaymentReceiptDaoImpl extends MybatisGenericDao implements IGmoaContractPaymentReceiptDao { + @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE) + @Override + public List queryOAAll(GmoaContractPaymentReceiptEntity entity) { + List all = + (List) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaContractPaymentReceiptDaoImpl.queryOAAll", entity); + return all; + } + + @Override + public void saveList(List list) { + insert("com.hzya.frame.plugin.gm.dao.impl.GmoaContractPaymentReceiptDaoImpl.saveList", list); + } +} + 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 new file mode 100644 index 00000000..96e811fc --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.java @@ -0,0 +1,285 @@ +package com.hzya.frame.plugin.gm.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 广脉OA:合同收款单(GmoaContractPaymentReceipt)实体类 + * + * @author zydd + * @since 2025-08-27 09:36:34 + */ +public class GmoaContractPaymentReceiptEntity 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; + /** 项目ID */ + private String projectId; + /** 项目编码 */ + private String projectCode; + /** 项目名称 */ + private String projectName; + /** 一级项目类型 */ + private String oneProjectType; + /** 收款日期 */ + private String receiveDate; + /** 审核日期 */ + private String examineDate; + /** 付款单位ID */ + private String paymentUnitId; + /** 付款单位 */ + private String paymentUnitName; + /** 制单人 */ + private String maker; + /** 收款金额 */ + private String receiveMoney; + /** 最后更新时间 */ + private String ts; + /** 生成状态 */ + private String billstatus; + /** 收款银行 */ + private String khyh; + /** 银行号 */ + private String yhzh; + /** 户名 */ + private String skrhm; + + private String startTime; + private String endTime; + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataId() { + return dataId; + } + + public void setDataId(String dataId) { + this.dataId = dataId; + } + + public String getMdmUpId() { + return mdmUpId; + } + + public void setMdmUpId(String mdmUpId) { + this.mdmUpId = mdmUpId; + } + + public String getBillCode() { + return billCode; + } + + public void setBillCode(String billCode) { + this.billCode = billCode; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getOneProjectType() { + return oneProjectType; + } + + public void setOneProjectType(String oneProjectType) { + this.oneProjectType = oneProjectType; + } + + public String getReceiveDate() { + return receiveDate; + } + + public void setReceiveDate(String receiveDate) { + this.receiveDate = receiveDate; + } + + public String getExamineDate() { + return examineDate; + } + + public void setExamineDate(String examineDate) { + this.examineDate = examineDate; + } + + public String getPaymentUnitId() { + return paymentUnitId; + } + + public void setPaymentUnitId(String paymentUnitId) { + this.paymentUnitId = paymentUnitId; + } + + public String getPaymentUnitName() { + return paymentUnitName; + } + + public void setPaymentUnitName(String paymentUnitName) { + this.paymentUnitName = paymentUnitName; + } + + public String getMaker() { + return maker; + } + + public void setMaker(String maker) { + this.maker = maker; + } + + public String getReceiveMoney() { + return receiveMoney; + } + + public void setReceiveMoney(String receiveMoney) { + this.receiveMoney = receiveMoney; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getBillstatus() { + return billstatus; + } + + public void setBillstatus(String billstatus) { + this.billstatus = billstatus; + } + + public String getKhyh() { + return khyh; + } + + public void setKhyh(String khyh) { + this.khyh = khyh; + } + + public String getYhzh() { + return yhzh; + } + + public void setYhzh(String yhzh) { + this.yhzh = yhzh; + } + + public String getSkrhm() { + return skrhm; + } + + public void setSkrhm(String skrhm) { + this.skrhm = skrhm; + } + +} + 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 new file mode 100644 index 00000000..742de927 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaContractPaymentReceiptEntity.xml @@ -0,0 +1,610 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + ,project_id + ,project_code + ,project_name + ,one_project_type + ,receive_date + ,examine_date + ,payment_unit_id + ,payment_unit_name + ,maker + ,receive_money + ,ts + ,billstatus + ,khyh + ,yhzh + ,skrhm + + + + + + + + + + + + + + + + insert into gmoa_contract_payment_receipt( + + 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 , + project_id , + project_code , + project_name , + one_project_type , + receive_date , + examine_date , + payment_unit_id , + payment_unit_name , + maker , + receive_money , + ts , + billstatus , + khyh , + yhzh , + skrhm , + 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} , + #{projectId} , + #{projectCode} , + #{projectName} , + #{oneProjectType} , + #{receiveDate} , + #{examineDate} , + #{paymentUnitId} , + #{paymentUnitName} , + #{maker} , + #{receiveMoney} , + #{ts} , + #{billstatus} , + #{khyh} , + #{yhzh} , + #{skrhm} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from gmoa_contract_payment_receipt + a WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into gmoa_contract_payment_receipt(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, project_id, project_code, project_name, one_project_type, receive_date, + examine_date, payment_unit_id, payment_unit_name, maker, receive_money, ts, billstatus, khyh, yhzh, skrhm, 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.projectId},#{entity.projectCode},#{entity.projectName},#{entity.oneProjectType},#{entity.receiveDate},#{entity.examineDate},#{entity.paymentUnitId},#{entity.paymentUnitName},#{entity.maker},#{entity.receiveMoney},#{entity.ts},#{entity.billstatus},#{entity.khyh},#{entity.yhzh},#{entity.skrhm}, + 'Y') + + + + + insert into gmoa_contract_payment_receipt(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, project_id, project_code, project_name, one_project_type, receive_date, + examine_date, payment_unit_id, payment_unit_name, maker, receive_money, ts, billstatus, khyh, yhzh, skrhm) + 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.projectId},#{entity.projectCode},#{entity.projectName},#{entity.oneProjectType},#{entity.receiveDate},#{entity.examineDate},#{entity.paymentUnitId},#{entity.paymentUnitName},#{entity.maker},#{entity.receiveMoney},#{entity.ts},#{entity.billstatus},#{entity.khyh},#{entity.yhzh},#{entity.skrhm}) + + 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), + project_id = values(project_id), + project_code = values(project_code), + project_name = values(project_name), + one_project_type = values(one_project_type), + receive_date = values(receive_date), + examine_date = values(examine_date), + payment_unit_id = values(payment_unit_id), + payment_unit_name = values(payment_unit_name), + maker = values(maker), + receive_money = values(receive_money), + ts = values(ts), + billstatus = values(billstatus), + khyh = values(khyh), + yhzh = values(yhzh), + skrhm = values(skrhm) + + + + update gmoa_contract_payment_receipt 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}, + project_id = #{projectId}, + project_code = #{projectCode}, + project_name = #{projectName}, + one_project_type = #{oneProjectType}, + receive_date = #{receiveDate}, + examine_date = #{examineDate}, + payment_unit_id = #{paymentUnitId}, + payment_unit_name = #{paymentUnitName}, + maker = #{maker}, + receive_money = #{receiveMoney}, + ts = #{ts}, + billstatus = #{billstatus}, + khyh = #{khyh}, + yhzh = #{yhzh}, + skrhm = #{skrhm}, + + where id = #{id} + + + + update gmoa_contract_payment_receipt + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update gmoa_contract_payment_receipt 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 project_id = #{projectId} + and project_code = #{projectCode} + and project_name = #{projectName} + and one_project_type = #{oneProjectType} + and receive_date = #{receiveDate} + and examine_date = #{examineDate} + and payment_unit_id = #{paymentUnitId} + and payment_unit_name = #{paymentUnitName} + and maker = #{maker} + and receive_money = #{receiveMoney} + and ts = #{ts} + and billstatus = #{billstatus} + and khyh = #{khyh} + and yhzh = #{yhzh} + and skrhm = #{skrhm} + and sts='Y' + + + + + delete + from gmoa_contract_payment_receipt + where + 1=1 + and id = #{id} + and bill_code = #{billCode} + + + + + + + + + + + + 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 index e8077e59..f44ff560 100644 --- 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 @@ -474,7 +474,10 @@ delete from gmoa_cost_adjustment_audit - where id = #{id} + where + 1=1 + and id = #{id} + and bill_code = #{billCode} @@ -527,6 +530,7 @@ data_status, create_time, sts, + billstatus, bill_code, declare_date, examine_date, @@ -547,6 +551,7 @@ #{item.dataStatus}, now(), #{item.sts}, + 'N', #{item.billCode}, #{item.declareDate}, #{item.examineDate}, 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 fb73512c..5db444da 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java @@ -8,10 +8,7 @@ import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; -import com.hzya.frame.plugin.gm.OA_plugin_acceptance_income_declaration; -import com.hzya.frame.plugin.gm.OA_plugin_audit_declaration_form; -import com.hzya.frame.plugin.gm.OA_plugin_cost_adjustment_audit; -import com.hzya.frame.plugin.gm.SubjectAssBalancePlugin; +import com.hzya.frame.plugin.gm.*; import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; import com.hzya.frame.voucher.ae.comf.bd.dao.*; import com.hzya.frame.voucher.ae.comf.bd.entity.*; @@ -457,6 +454,19 @@ public class BdController extends DefaultController { } } + @Autowired + private OA_plugin_contract_payment_receipt oaPluginContractPaymentReceipt; + @RequestMapping(value = "/oaPluginContractPaymentReceipt", method = RequestMethod.POST) + public JsonResultEntity oaPluginContractPaymentReceipt (String start,String end) { + try { + oaPluginContractPaymentReceipt.start(start,end); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + // /** // * 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 0a191c07..1850b599 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 @@ -7,4 +7,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 db9337a2..867c4108 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 @@ -9,4 +9,6 @@ + +