1、新增：成本调整单同步插件。

2、凭证生成，新增现金流映射功能。

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_acceptance_income_declaration.java

@@ -0,0 +1,232 @@
+package com.hzya.frame.plugin.gm;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.dao.IGmoaAcceptanceIncomeDeclarationDao;
+import com.hzya.frame.plugin.gm.dao.IMdmGmSubjectBalanceDao;
+import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity;
+import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Created by zydd on 2025-08-22 16:40
+ * 验收收入申报单 插件
+ * 控制点：
+ * 1、按ts同步，如果billStatus=Y报错。=N 同步
+ */
+public class OA_plugin_acceptance_income_declaration extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(OA_plugin_acceptance_income_declaration.class);
+    private static final ReentrantLock LOCK = new ReentrantLock(true);
+    // 创建格式化器
+    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    List<GmoaAcceptanceIncomeDeclarationEntity> OA_LIST_SAVE = new ArrayList<>();
+    List<GmoaAcceptanceIncomeDeclarationEntity> OA_LIST_UPDATE = new ArrayList<>();
+
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "执行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "执行销毁方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "gm.OA_plugin_acceptance_income_declaration";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "广脉：验收收入申报单同步";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "广脉：验收收入申报单同步";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        try {
+            logger.info("调用：" + getPluginName() + "-插件");
+            String prod = "prod";
+            String param = String.valueOf(requestJson.get("param"));
+            if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) {
+                //按日期
+                if (param != null && !"".equals(param)) {
+                    String[] split = param.split("/");
+                    if (!(split.length == 2)) {
+                        Assert.state(false, "时间格式传递不正确");
+                    }
+                    Assert.notNull(split[0], "开始时间不能为空");
+                    Assert.notNull(split[1], "结束时间不能为空");
+                    start(split[0], split[1]);
+                }
+            } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) {
+                //默认
+                start();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("executeBusiness方法抛出异常", e);
+        }
+        return BaseResult.getSuccessMessageEntity("插件执行成功");
+    }
+
+    @Autowired
+    private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao;
+    @Autowired
+    private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil;
+
+    @Autowired
+    private IGmoaAcceptanceIncomeDeclarationDao acceptanceIncomeDeclarationDao;
+
+
+
+    public void start(){
+        // 获取当前日期和时间,时间偏移10分钟
+        LocalDateTime now = LocalDateTime.now();
+        String end = now.format(formatter);
+        String start = now.minusMinutes(10L).format(formatter);
+        logger.info("自动同步==> 验收收入申报单 时间区间：[{}]-[{}]",start,end);
+        try {
+
+            //查询数据
+            List<GmoaAcceptanceIncomeDeclarationEntity> 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<GmoaAcceptanceIncomeDeclarationEntity> allOAList = queryData(startTime,endTime);
+
+            //过滤，生成凭证的报错
+            filterData(allOAList);
+
+            //保存
+            saveData(OA_LIST_SAVE);
+            //更新
+            updateData(OA_LIST_UPDATE);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+    private void updateData(List<GmoaAcceptanceIncomeDeclarationEntity> oaListUpdate) {
+
+        List<GmoaAcceptanceIncomeDeclarationEntity> list=new ArrayList<>();
+
+        for (GmoaAcceptanceIncomeDeclarationEntity gmoaAcceptanceIncomeDeclarationEntity : oaListUpdate) {
+            String billCode = gmoaAcceptanceIncomeDeclarationEntity.getBillCode();
+
+            GmoaAcceptanceIncomeDeclarationEntity deleteEntity = new GmoaAcceptanceIncomeDeclarationEntity();
+            deleteEntity.setBillCode(billCode);
+            acceptanceIncomeDeclarationDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl.entity_delete",deleteEntity);
+            list.add(gmoaAcceptanceIncomeDeclarationEntity);
+        }
+        saveData(list);
+    }
+
+    //批量更新 billStatus=N,sts=Y,dataStatus=Y,id=UUID()
+    private void saveData(List<GmoaAcceptanceIncomeDeclarationEntity> oaListSave) {
+
+        oaListSave.forEach(entity -> {
+            entity.setBillstatus("N");
+            entity.setSts("Y");
+            entity.setDataStatus("Y");
+            entity.setId(UUID.randomUUID().toString()); // 生成 UUID 并转为字符串
+        });
+
+        List<List<GmoaAcceptanceIncomeDeclarationEntity>> partition = Lists.partition(oaListSave, 500);
+        for (List<GmoaAcceptanceIncomeDeclarationEntity> gmoaAcceptanceIncomeDeclarationEntities : partition) {
+            acceptanceIncomeDeclarationDao.saveList(gmoaAcceptanceIncomeDeclarationEntities);
+        }
+
+    }
+
+    private void filterData(List<GmoaAcceptanceIncomeDeclarationEntity> allOAList) {
+
+        for (GmoaAcceptanceIncomeDeclarationEntity gmoaAcceptanceIncomeDeclarationEntity : allOAList) {
+            String billCode = gmoaAcceptanceIncomeDeclarationEntity.getBillCode();
+            GmoaAcceptanceIncomeDeclarationEntity acceptanceIncomeDeclarationEntity = new GmoaAcceptanceIncomeDeclarationEntity();
+            acceptanceIncomeDeclarationEntity.setBillCode(billCode);
+            List<GmoaAcceptanceIncomeDeclarationEntity> query = acceptanceIncomeDeclarationDao.query(acceptanceIncomeDeclarationEntity);
+            if(query.size()==0){
+                OA_LIST_SAVE.add(gmoaAcceptanceIncomeDeclarationEntity);
+                continue;
+            }
+            GmoaAcceptanceIncomeDeclarationEntity gmoaAcceptanceIncomeDeclarationEntity1 = query.get(0);
+            String billstatus = gmoaAcceptanceIncomeDeclarationEntity1.getBillstatus();
+            if("Y".equals(billstatus)){
+                //已经推送了凭证，又修改了单据。，报错
+                IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+                integrationTaskLivingDetailsEntity.setId(UUID.randomUUID().toString());
+                integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N);
+                integrationTaskLivingDetailsEntity.setRootAppNewData(billCode);
+                integrationTaskLivingDetailsEntity.setNewTransmitInfo("已推送凭证");
+                integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
+                integrationTaskLivingDetailsEntity.setBusinessDate(gmoaAcceptanceIncomeDeclarationEntity.getTs());
+                integrationTaskLivingDetailsEntity.setRootAppPk(billCode);
+                integrationTaskLivingDetailsEntity.setRootAppBill(billCode);
+                integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+                iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity);
+                continue;
+            }
+            OA_LIST_UPDATE.add(gmoaAcceptanceIncomeDeclarationEntity);
+        }
+    }
+
+
+    private List<GmoaAcceptanceIncomeDeclarationEntity> queryData(String start, String end) {
+        GmoaAcceptanceIncomeDeclarationEntity entity = new GmoaAcceptanceIncomeDeclarationEntity();
+        entity.setStartTime(start);
+        entity.setEndTime(end);
+        List<GmoaAcceptanceIncomeDeclarationEntity> all = acceptanceIncomeDeclarationDao.queryOAAll(entity);
+        return all;
+    }
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/OA_plugin_audit_declaration_form.java

@@ -0,0 +1,226 @@
+package com.hzya.frame.plugin.gm;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl;
+import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity;
+import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity;
+import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Created by zydd on 2025-08-23 13:53
+ */
+public class OA_plugin_audit_declaration_form extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(OA_plugin_audit_declaration_form.class);
+    private static final ReentrantLock LOCK = new ReentrantLock(true);
+    // 创建格式化器
+    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    List<GmoaAuditDeclarationFormEntity> OA_LIST_SAVE = new ArrayList<>();
+    List<GmoaAuditDeclarationFormEntity> OA_LIST_UPDATE = new ArrayList<>();
+
+
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "执行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "执行销毁方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "gm.OA_plugin_audit_declaration_form";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "广脉：审计申报单同步";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "广脉：审计申报单同步";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        try {
+            logger.info("调用：" + getPluginName() + "-插件");
+            String prod = "prod";
+            String param = String.valueOf(requestJson.get("param"));
+            if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) {
+                //按日期
+                if (param != null && !"".equals(param)) {
+                    String[] split = param.split("/");
+                    if (!(split.length == 2)) {
+                        Assert.state(false, "时间格式传递不正确");
+                    }
+                    Assert.notNull(split[0], "开始时间不能为空");
+                    Assert.notNull(split[1], "结束时间不能为空");
+                    start(split[0], split[1]);
+                }
+            } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) {
+                //默认
+                start();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("executeBusiness方法抛出异常", e);
+        }
+        return BaseResult.getSuccessMessageEntity("插件执行成功");
+    }
+
+    @Autowired
+    private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao;
+    @Autowired
+    private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil;
+    @Autowired
+    private GmoaAuditDeclarationFormDaoImpl auditDeclarationFormDao;
+
+
+    public void start() {
+        try {
+
+            // 获取当前日期和时间,时间偏移10分钟
+            LocalDateTime now = LocalDateTime.now();
+            String end = now.format(formatter);
+            String start = now.minusMinutes(10L).format(formatter);
+            logger.info("自动同步==> 审计申报单同步 时间区间：[{}]-[{}]", start, end);
+
+            //查询数据
+            List<GmoaAuditDeclarationFormEntity> 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<GmoaAuditDeclarationFormEntity> allOAList = queryData(startTime, endTime);
+
+            //过滤，生成凭证的报错
+            filterData(allOAList);
+
+            //保存
+            saveData(OA_LIST_SAVE);
+            //更新
+            updateData(OA_LIST_UPDATE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void filterData(List<GmoaAuditDeclarationFormEntity> allOAList) {
+
+        for (GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity : allOAList) {
+            String billCode = gmoaAuditDeclarationFormEntity.getBillCode();
+            GmoaAuditDeclarationFormEntity auditDeclarationFormEntity = new GmoaAuditDeclarationFormEntity();
+            auditDeclarationFormEntity.setBillCode(billCode);
+            List<GmoaAuditDeclarationFormEntity> query = auditDeclarationFormDao.query(auditDeclarationFormEntity);
+            if (query.size() == 0) {
+                OA_LIST_SAVE.add(gmoaAuditDeclarationFormEntity);
+                continue;
+            }
+            GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity1 = query.get(0);
+            String billstatus = gmoaAuditDeclarationFormEntity1.getBillstatus();
+            if ("Y".equals(billstatus)) {
+                //已经推送了凭证，又修改了单据。，报错
+                IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+                integrationTaskLivingDetailsEntity.setId(UUID.randomUUID().toString());
+                integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N);
+                integrationTaskLivingDetailsEntity.setRootAppNewData(billCode);
+                integrationTaskLivingDetailsEntity.setNewTransmitInfo("已推送凭证");
+                integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
+                integrationTaskLivingDetailsEntity.setBusinessDate(gmoaAuditDeclarationFormEntity.getTs());
+                integrationTaskLivingDetailsEntity.setRootAppPk(billCode);
+                integrationTaskLivingDetailsEntity.setRootAppBill(billCode);
+                integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+                iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity);
+                continue;
+            }
+            OA_LIST_UPDATE.add(gmoaAuditDeclarationFormEntity);
+        }
+    }
+
+    //批量更新 billStatus=N,sts=Y,dataStatus=Y,id=UUID()
+    private void saveData(List<GmoaAuditDeclarationFormEntity> oaListSave) {
+        oaListSave.forEach(entity -> {
+            entity.setBillstatus("N");
+            entity.setSts("Y");
+            entity.setDataStatus("Y");
+            entity.setId(UUID.randomUUID().toString()); // 生成 UUID 并转为字符串
+        });
+
+        for (GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity : oaListSave) {
+            auditDeclarationFormDao.save(gmoaAuditDeclarationFormEntity);
+        }
+
+    }
+
+
+    private void updateData(List<GmoaAuditDeclarationFormEntity> oaListUpdate) {
+
+        List<GmoaAuditDeclarationFormEntity> list = new ArrayList<>();
+
+        for (GmoaAuditDeclarationFormEntity gmoaAuditDeclarationFormEntity : oaListUpdate) {
+            String billCode = gmoaAuditDeclarationFormEntity.getBillCode();
+
+            GmoaAuditDeclarationFormEntity deleteEntity = new GmoaAuditDeclarationFormEntity();
+            deleteEntity.setBillCode(billCode);
+            auditDeclarationFormDao.delete("com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl.entity_delete", deleteEntity);
+            list.add(gmoaAuditDeclarationFormEntity);
+        }
+        saveData(list);
+    }
+
+
+    private List<GmoaAuditDeclarationFormEntity> queryData(String start, String end) {
+        GmoaAuditDeclarationFormEntity entity = new GmoaAuditDeclarationFormEntity();
+        entity.setStartTime(start);
+        entity.setEndTime(end);
+        List<GmoaAuditDeclarationFormEntity> all = auditDeclarationFormDao.queryOAAll(entity);
+        return all;
+    }
+
+
+}

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<GmoaCostAdjustmentAuditEntity> OA_LIST_SAVE = new ArrayList<>();
+    List<GmoaCostAdjustmentAuditEntity> 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<GmoaCostAdjustmentAuditEntity> 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<GmoaCostAdjustmentAuditEntity> allOAList = queryData(startTime, endTime);
+
+            //过滤，生成凭证的报错
+            filterData(allOAList);
+
+            //保存
+            saveData(OA_LIST_SAVE);
+            //更新
+            updateData(OA_LIST_UPDATE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void filterData(List<GmoaCostAdjustmentAuditEntity> allOAList) {
+
+        for (GmoaCostAdjustmentAuditEntity gmoaCostAdjustmentAuditEntity : allOAList) {
+            String billCode = gmoaCostAdjustmentAuditEntity.getBillCode();
+            GmoaCostAdjustmentAuditEntity adjustmentAuditEntity = new GmoaCostAdjustmentAuditEntity();
+            adjustmentAuditEntity.setBillCode(billCode);
+            List<GmoaCostAdjustmentAuditEntity> 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<GmoaCostAdjustmentAuditEntity> oaListSave) {
+        oaListSave.forEach(entity -> {
+            entity.setBillstatus("N");
+            entity.setSts("Y");
+            entity.setDataStatus("Y");
+            entity.setId(UUID.randomUUID().toString()); // 生成 UUID 并转为字符串
+        });
+
+        List<List<GmoaCostAdjustmentAuditEntity>> partition = Lists.partition(oaListSave, 500);
+        for (List<GmoaCostAdjustmentAuditEntity> gmoaCostAdjustmentAuditEntities : partition) {
+            adjustmentAuditDao.saveList(gmoaCostAdjustmentAuditEntities);
+        }
+//        for (GmoaCostAdjustmentAuditEntity gmoaCostAdjustmentAuditEntity : oaListSave) {
+//            adjustmentAuditDao.save(gmoaCostAdjustmentAuditEntity);
+//        }
+
+    }
+
+
+    private void updateData(List<GmoaCostAdjustmentAuditEntity> oaListUpdate) {
+
+        List<GmoaCostAdjustmentAuditEntity> 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<GmoaCostAdjustmentAuditEntity> queryData(String start, String end) {
+        GmoaCostAdjustmentAuditEntity entity = new GmoaCostAdjustmentAuditEntity();
+        entity.setStartTime(start);
+        entity.setEndTime(end);
+        List<GmoaCostAdjustmentAuditEntity> all = adjustmentAuditDao.queryOAAll(entity);
+        return all;
+    }
+
+
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java

@@ -2,7 +2,8 @@ package com.hzya.frame.plugin.gm.constant;
 
 public class ProfilesActiveConstant {
 
-    public static final String LETS_DATE_SOURCE = "gm_u8c_prod";
+    public static final String GM_U8C_DATE_SOURCE = "gm_u8c_prod";
+    public static final String GM_OA_DATE_SOURCE = "gm_pms_prod";
 
     public static final String LETS_PROFILES_ACTIVE = "prod";
 

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAcceptanceIncomeDeclarationDao.java

@@ -0,0 +1,23 @@
+package com.hzya.frame.plugin.gm.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+
+/**
+ * 广脉OA：验收收入申报单(gmoa_acceptance_income_declaration: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-22 18:45:51
+ */
+public interface IGmoaAcceptanceIncomeDeclarationDao extends IBaseDao<GmoaAcceptanceIncomeDeclarationEntity, String> {
+
+    @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE)
+    List<GmoaAcceptanceIncomeDeclarationEntity> queryOAAll(GmoaAcceptanceIncomeDeclarationEntity entity);
+
+    void saveList(List<GmoaAcceptanceIncomeDeclarationEntity> list);
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IGmoaAuditDeclarationFormDao.java

@@ -0,0 +1,25 @@
+package com.hzya.frame.plugin.gm.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity;
+import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+
+/**
+ * 广脉OA：审计申报单(gmoa_audit_declaration_form: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-23 14:40:52
+ */
+public interface IGmoaAuditDeclarationFormDao extends IBaseDao<GmoaAuditDeclarationFormEntity, String> {
+
+    @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE)
+    List<GmoaAuditDeclarationFormEntity> queryOAAll(GmoaAuditDeclarationFormEntity entity);
+
+    void saveList(List<GmoaAuditDeclarationFormEntity> list);
+
+}
+

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<GmoaCostAdjustmentAuditEntity, String> {
+
+    List<GmoaCostAdjustmentAuditEntity> queryOAAll(GmoaCostAdjustmentAuditEntity entity);
+
+    void saveList(List<GmoaCostAdjustmentAuditEntity> list);
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAcceptanceIncomeDeclarationDaoImpl.java

@@ -0,0 +1,32 @@
+package com.hzya.frame.plugin.gm.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity;
+import com.hzya.frame.plugin.gm.dao.IGmoaAcceptanceIncomeDeclarationDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 广脉OA：验收收入申报单(GmoaAcceptanceIncomeDeclaration)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-22 18:45:51
+ */
+public class GmoaAcceptanceIncomeDeclarationDaoImpl extends MybatisGenericDao<GmoaAcceptanceIncomeDeclarationEntity, String> implements IGmoaAcceptanceIncomeDeclarationDao {
+
+    @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE)
+    @Override
+    public List<GmoaAcceptanceIncomeDeclarationEntity> queryOAAll(GmoaAcceptanceIncomeDeclarationEntity entity) {
+        List<GmoaAcceptanceIncomeDeclarationEntity> all = (List<GmoaAcceptanceIncomeDeclarationEntity>) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl.queryOAAll", entity);
+        return all;
+    }
+
+    @Override
+    public void saveList(List<GmoaAcceptanceIncomeDeclarationEntity> gmoaAcceptanceIncomeDeclarationEntities) {
+        insert("com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl.saveList",gmoaAcceptanceIncomeDeclarationEntities);
+    }
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/GmoaAuditDeclarationFormDaoImpl.java

@@ -0,0 +1,34 @@
+package com.hzya.frame.plugin.gm.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity;
+import com.hzya.frame.plugin.gm.entity.GmoaAuditDeclarationFormEntity;
+import com.hzya.frame.plugin.gm.dao.IGmoaAuditDeclarationFormDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 广脉OA：审计申报单(GmoaAuditDeclarationForm)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-23 14:40:52
+ */
+public class GmoaAuditDeclarationFormDaoImpl extends MybatisGenericDao<GmoaAuditDeclarationFormEntity, String> implements IGmoaAuditDeclarationFormDao{
+
+
+    @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE)
+    @Override
+    public List<GmoaAuditDeclarationFormEntity> queryOAAll(GmoaAuditDeclarationFormEntity entity) {
+        List<GmoaAuditDeclarationFormEntity> all = (List<GmoaAuditDeclarationFormEntity>) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl.queryOAAll", entity);
+        return all;
+    }
+
+    @Override
+    public void saveList(List<GmoaAuditDeclarationFormEntity> list) {
+        insert("com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl.saveList",list);
+    }
+}
+

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<GmoaCostAdjustmentAuditEntity, String> implements IGmoaCostAdjustmentAuditDao{
+    @DS(ProfilesActiveConstant.GM_OA_DATE_SOURCE)
+    @Override
+    public List<GmoaCostAdjustmentAuditEntity> queryOAAll(GmoaCostAdjustmentAuditEntity entity) {
+        List<GmoaCostAdjustmentAuditEntity> all = (List<GmoaCostAdjustmentAuditEntity>) selectList("com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl.queryOAAll", entity);
+        return all;
+    }
+
+    @Override
+    public void saveList(List<GmoaCostAdjustmentAuditEntity> list) {
+        insert("com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl.saveList",list);
+    }
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class MdmGmSubjectBalanceDaoImpl extends MybatisGenericDao<MdmGmSubjectBalanceEntity, String> implements IMdmGmSubjectBalanceDao {
 
-    @DS(ProfilesActiveConstant.LETS_DATE_SOURCE)
+    @DS(ProfilesActiveConstant.GM_U8C_DATE_SOURCE)
     @Override
     public List<MdmGmSubjectBalanceEntity> queryBalanceBySubjectCodesAndPkCorp(MdmGmSubjectBalanceEntity entity) {
         List<MdmGmSubjectBalanceEntity> mdmGmSubjectBalanceEntityList =

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.java

@@ -0,0 +1,426 @@
+package com.hzya.frame.plugin.gm.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 广脉OA：验收收入申报单(GmoaAcceptanceIncomeDeclaration)实体类
+ *
+ * @author zydd
+ * @since 2025-08-22 18:45:51
+ */
+public class GmoaAcceptanceIncomeDeclarationEntity extends BaseEntity {
+
+
+ 
+  /**  单据规则 */
+   private String documentRule;
+  /**  单据规则流水号 */
+   private Long documentRuleNum;
+  /**  数据状态 Y正常 N删除 F修改 */
+   private String dataStatus;
+  /**  新增数据状态 0待下发 1已下发 */
+   private String addStatus;
+  /**  修改数据状态 0待下发 1已下发 */
+   private String updateStatus;
+  /**  删除数据状态 0待下发 1已下发 */
+   private String deleteStatus;
+  /**  公司id */
+   private String companyId;
+  /**  data_id */
+   private String dataId;
+  /**  mdm_up_id */
+   private String mdmUpId;
+  /**  单据号 */
+   private String billCode;
+  /**  验收申报日期 */
+   private String declareDate;
+  /**  项目ID */
+   private String projectId;
+  /**  项目编号 */
+   private String projectCode;
+  /**  项目名称 */
+   private String projectName;
+  /**  一级项目类型 */
+   private String oneProjectType;
+  /**  集成费（含税） */
+   private String integratetaxmoney;
+  /**  集成费（除税） */
+   private String integratemoney;
+  /**  集成费（税率） */
+   private String integratetax;
+  /**  辅材费（含税） */
+   private String materialstaxmoney;
+  /**  辅材费（除税） */
+   private String materialsmoney;
+  /**  辅材费（税率） */
+   private String materialstax;
+  /**  设备费（含税） */
+   private String devicetaxmoney;
+  /**  设备费（除税） */
+   private String devicemoney;
+  /**  设备费（税率） */
+   private String devicetax;
+  /**  服务费（含税） */
+   private String servicetaxmoney;
+  /**  服务费（除税） */
+   private String servicemoney;
+  /**  服务费（税率） */
+   private String servicetax;
+  /**  维护费（含税） */
+   private String maintenancetaxmoney;
+  /**  维护费（除税） */
+   private String maintenancemoney;
+  /**  维护费（税率） */
+   private String maintenancetax;
+  /**  服务成本申报金额除税金额 */
+   private String servicecost;
+  /**  物资成本申报除税金额合计 */
+   private String materialcost;
+  /**  成本类别 */
+   private String costtype;
+  /**  客商名称 */
+   private String custname;
+  /**  制单人 */
+   private String billmark;
+  /**  供应商 */
+   private String suppliername;
+  /**  审核日期 */
+   private String examineDate;
+  /**  生成状态 */
+   private String billstatus;
+  /**  最后更新时间 */
+   private String ts;
+
+   private String startTime;
+   private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getDocumentRule() {
+        return documentRule;
+    }
+
+    public void setDocumentRule(String documentRule) {
+        this.documentRule = documentRule;
+    }
+
+    public Long getDocumentRuleNum() {
+        return documentRuleNum;
+    }
+
+    public void setDocumentRuleNum(Long documentRuleNum) {
+        this.documentRuleNum = documentRuleNum;
+    }
+
+    public String getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(String dataStatus) {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getAddStatus() {
+        return addStatus;
+    }
+
+    public void setAddStatus(String addStatus) {
+        this.addStatus = addStatus;
+    }
+
+    public String getUpdateStatus() {
+        return updateStatus;
+    }
+
+    public void setUpdateStatus(String updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
+    public String getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(String deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+
+    public String getMdmUpId() {
+        return mdmUpId;
+    }
+
+    public void setMdmUpId(String mdmUpId) {
+        this.mdmUpId = mdmUpId;
+    }
+
+    public String getBillCode() {
+        return billCode;
+    }
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getOneProjectType() {
+        return oneProjectType;
+    }
+
+    public void setOneProjectType(String oneProjectType) {
+        this.oneProjectType = oneProjectType;
+    }
+
+    public String getIntegratetaxmoney() {
+        return integratetaxmoney;
+    }
+
+    public void setIntegratetaxmoney(String integratetaxmoney) {
+        this.integratetaxmoney = integratetaxmoney;
+    }
+
+    public String getIntegratemoney() {
+        return integratemoney;
+    }
+
+    public void setIntegratemoney(String integratemoney) {
+        this.integratemoney = integratemoney;
+    }
+
+    public String getIntegratetax() {
+        return integratetax;
+    }
+
+    public void setIntegratetax(String integratetax) {
+        this.integratetax = integratetax;
+    }
+
+    public String getMaterialstaxmoney() {
+        return materialstaxmoney;
+    }
+
+    public void setMaterialstaxmoney(String materialstaxmoney) {
+        this.materialstaxmoney = materialstaxmoney;
+    }
+
+    public String getMaterialsmoney() {
+        return materialsmoney;
+    }
+
+    public void setMaterialsmoney(String materialsmoney) {
+        this.materialsmoney = materialsmoney;
+    }
+
+    public String getMaterialstax() {
+        return materialstax;
+    }
+
+    public void setMaterialstax(String materialstax) {
+        this.materialstax = materialstax;
+    }
+
+    public String getDevicetaxmoney() {
+        return devicetaxmoney;
+    }
+
+    public void setDevicetaxmoney(String devicetaxmoney) {
+        this.devicetaxmoney = devicetaxmoney;
+    }
+
+    public String getDevicemoney() {
+        return devicemoney;
+    }
+
+    public void setDevicemoney(String devicemoney) {
+        this.devicemoney = devicemoney;
+    }
+
+    public String getDevicetax() {
+        return devicetax;
+    }
+
+    public void setDevicetax(String devicetax) {
+        this.devicetax = devicetax;
+    }
+
+    public String getServicetaxmoney() {
+        return servicetaxmoney;
+    }
+
+    public void setServicetaxmoney(String servicetaxmoney) {
+        this.servicetaxmoney = servicetaxmoney;
+    }
+
+    public String getServicemoney() {
+        return servicemoney;
+    }
+
+    public void setServicemoney(String servicemoney) {
+        this.servicemoney = servicemoney;
+    }
+
+    public String getServicetax() {
+        return servicetax;
+    }
+
+    public void setServicetax(String servicetax) {
+        this.servicetax = servicetax;
+    }
+
+    public String getMaintenancetaxmoney() {
+        return maintenancetaxmoney;
+    }
+
+    public void setMaintenancetaxmoney(String maintenancetaxmoney) {
+        this.maintenancetaxmoney = maintenancetaxmoney;
+    }
+
+    public String getMaintenancemoney() {
+        return maintenancemoney;
+    }
+
+    public void setMaintenancemoney(String maintenancemoney) {
+        this.maintenancemoney = maintenancemoney;
+    }
+
+    public String getMaintenancetax() {
+        return maintenancetax;
+    }
+
+    public void setMaintenancetax(String maintenancetax) {
+        this.maintenancetax = maintenancetax;
+    }
+
+    public String getServicecost() {
+        return servicecost;
+    }
+
+    public void setServicecost(String servicecost) {
+        this.servicecost = servicecost;
+    }
+
+    public String getMaterialcost() {
+        return materialcost;
+    }
+
+    public void setMaterialcost(String materialcost) {
+        this.materialcost = materialcost;
+    }
+
+    public String getCosttype() {
+        return costtype;
+    }
+
+    public void setCosttype(String costtype) {
+        this.costtype = costtype;
+    }
+
+    public String getCustname() {
+        return custname;
+    }
+
+    public void setCustname(String custname) {
+        this.custname = custname;
+    }
+
+    public String getBillmark() {
+        return billmark;
+    }
+
+    public void setBillmark(String billmark) {
+        this.billmark = billmark;
+    }
+
+    public String getSuppliername() {
+        return suppliername;
+    }
+
+    public void setSuppliername(String suppliername) {
+        this.suppliername = suppliername;
+    }
+
+    public String getBillstatus() {
+        return billstatus;
+    }
+
+    public void setBillstatus(String billstatus) {
+        this.billstatus = billstatus;
+    }
+
+    public String getTs() {
+        return ts;
+    }
+
+    public void setTs(String ts) {
+        this.ts = ts;
+    }
+
+    public String getDeclareDate() {
+        return declareDate;
+    }
+
+    public void setDeclareDate(String declareDate) {
+        this.declareDate = declareDate;
+    }
+
+    public String getExamineDate() {
+        return examineDate;
+    }
+
+    public void setExamineDate(String examineDate) {
+        this.examineDate = examineDate;
+    }
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAcceptanceIncomeDeclarationEntity.xml

@@ -0,0 +1,872 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl">
+
+    <resultMap id="get-GmoaAcceptanceIncomeDeclarationEntity-result"
+               type="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
+        <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
+        <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
+        <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
+        <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
+        <result property="deleteStatus" column="delete_status" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+        <result property="dataId" column="data_id" jdbcType="VARCHAR"/>
+        <result property="mdmUpId" column="mdm_up_id" jdbcType="VARCHAR"/>
+        <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
+        <result property="declareDate" column="declare_date" jdbcType="TIMESTAMP"/>
+        <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
+        <result property="projectCode" column="project_code" jdbcType="VARCHAR"/>
+        <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
+        <result property="oneProjectType" column="one_project_type" jdbcType="VARCHAR"/>
+        <result property="integratetaxmoney" column="integratetaxmoney" jdbcType="VARCHAR"/>
+        <result property="integratemoney" column="integratemoney" jdbcType="VARCHAR"/>
+        <result property="integratetax" column="integratetax" jdbcType="VARCHAR"/>
+        <result property="materialstaxmoney" column="materialstaxmoney" jdbcType="VARCHAR"/>
+        <result property="materialsmoney" column="materialsmoney" jdbcType="VARCHAR"/>
+        <result property="materialstax" column="materialstax" jdbcType="VARCHAR"/>
+        <result property="devicetaxmoney" column="devicetaxmoney" jdbcType="VARCHAR"/>
+        <result property="devicemoney" column="devicemoney" jdbcType="VARCHAR"/>
+        <result property="devicetax" column="devicetax" jdbcType="VARCHAR"/>
+        <result property="servicetaxmoney" column="servicetaxmoney" jdbcType="VARCHAR"/>
+        <result property="servicemoney" column="servicemoney" jdbcType="VARCHAR"/>
+        <result property="servicetax" column="servicetax" jdbcType="VARCHAR"/>
+        <result property="maintenancetaxmoney" column="maintenancetaxmoney" jdbcType="VARCHAR"/>
+        <result property="maintenancemoney" column="maintenancemoney" jdbcType="VARCHAR"/>
+        <result property="maintenancetax" column="maintenancetax" jdbcType="VARCHAR"/>
+        <result property="servicecost" column="servicecost" jdbcType="VARCHAR"/>
+        <result property="materialcost" column="materialcost" jdbcType="VARCHAR"/>
+        <result property="costtype" column="costtype" jdbcType="VARCHAR"/>
+        <result property="custname" column="custname" jdbcType="VARCHAR"/>
+        <result property="billmark" column="billmark" jdbcType="VARCHAR"/>
+        <result property="suppliername" column="suppliername" jdbcType="VARCHAR"/>
+        <result property="examineDate" column="examine_date" jdbcType="TIMESTAMP"/>
+        <result property="billstatus" column="billStatus" jdbcType="VARCHAR"/>
+        <result property="ts" column="ts" jdbcType="TIMESTAMP"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="GmoaAcceptanceIncomeDeclarationEntity_Base_Column_List">
+        id
+        ,document_rule
+        ,document_rule_num 
+        ,data_status 
+        ,add_status 
+        ,update_status 
+        ,delete_status 
+        ,sorts 
+        ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
+        ,company_id 
+        ,data_id 
+        ,mdm_up_id 
+        ,bill_code 
+        ,declare_date 
+        ,project_id 
+        ,project_code 
+        ,project_name 
+        ,one_project_type 
+        ,integratetaxmoney 
+        ,integratemoney 
+        ,integratetax 
+        ,materialstaxmoney 
+        ,materialsmoney 
+        ,materialstax 
+        ,devicetaxmoney 
+        ,devicemoney 
+        ,devicetax 
+        ,servicetaxmoney 
+        ,servicemoney 
+        ,servicetax 
+        ,maintenancetaxmoney 
+        ,maintenancemoney 
+        ,maintenancetax 
+        ,servicecost 
+        ,materialcost 
+        ,costtype 
+        ,custname 
+        ,billmark 
+        ,suppliername 
+        ,examine_date 
+        ,billStatus 
+        ,ts
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-GmoaAcceptanceIncomeDeclarationEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        select
+        <include refid="GmoaAcceptanceIncomeDeclarationEntity_Base_Column_List"/>
+        from gmoa_acceptance_income_declaration
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="declareDate != null">and declare_date = #{declareDate}</if>
+            <if test="projectId != null and projectId != ''">and project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">and project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">and project_name = #{projectName}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type = #{oneProjectType}</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">and integratetaxmoney =
+                #{integratetaxmoney}
+            </if>
+            <if test="integratemoney != null and integratemoney != ''">and integratemoney = #{integratemoney}</if>
+            <if test="integratetax != null and integratetax != ''">and integratetax = #{integratetax}</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">and materialstaxmoney =
+                #{materialstaxmoney}
+            </if>
+            <if test="materialsmoney != null and materialsmoney != ''">and materialsmoney = #{materialsmoney}</if>
+            <if test="materialstax != null and materialstax != ''">and materialstax = #{materialstax}</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">and devicetaxmoney = #{devicetaxmoney}</if>
+            <if test="devicemoney != null and devicemoney != ''">and devicemoney = #{devicemoney}</if>
+            <if test="devicetax != null and devicetax != ''">and devicetax = #{devicetax}</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">and servicetaxmoney = #{servicetaxmoney}</if>
+            <if test="servicemoney != null and servicemoney != ''">and servicemoney = #{servicemoney}</if>
+            <if test="servicetax != null and servicetax != ''">and servicetax = #{servicetax}</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">and maintenancetaxmoney =
+                #{maintenancetaxmoney}
+            </if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">and maintenancemoney = #{maintenancemoney}
+            </if>
+            <if test="maintenancetax != null and maintenancetax != ''">and maintenancetax = #{maintenancetax}</if>
+            <if test="servicecost != null and servicecost != ''">and servicecost = #{servicecost}</if>
+            <if test="materialcost != null and materialcost != ''">and materialcost = #{materialcost}</if>
+            <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+            <if test="custname != null and custname != ''">and custname = #{custname}</if>
+            <if test="billmark != null and billmark != ''">and billmark = #{billmark}</if>
+            <if test="suppliername != null and suppliername != ''">and suppliername = #{suppliername}</if>
+            <if test="examineDate != null">and examine_date = #{examineDate}</if>
+            <if test="billstatus != null and billstatus != ''">and billStatus = #{billstatus}</if>
+            <if test="ts != null">and ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        select count(1) from gmoa_acceptance_income_declaration
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="declareDate != null">and declare_date = #{declareDate}</if>
+            <if test="projectId != null and projectId != ''">and project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">and project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">and project_name = #{projectName}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type = #{oneProjectType}</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">and integratetaxmoney =
+                #{integratetaxmoney}
+            </if>
+            <if test="integratemoney != null and integratemoney != ''">and integratemoney = #{integratemoney}</if>
+            <if test="integratetax != null and integratetax != ''">and integratetax = #{integratetax}</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">and materialstaxmoney =
+                #{materialstaxmoney}
+            </if>
+            <if test="materialsmoney != null and materialsmoney != ''">and materialsmoney = #{materialsmoney}</if>
+            <if test="materialstax != null and materialstax != ''">and materialstax = #{materialstax}</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">and devicetaxmoney = #{devicetaxmoney}</if>
+            <if test="devicemoney != null and devicemoney != ''">and devicemoney = #{devicemoney}</if>
+            <if test="devicetax != null and devicetax != ''">and devicetax = #{devicetax}</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">and servicetaxmoney = #{servicetaxmoney}</if>
+            <if test="servicemoney != null and servicemoney != ''">and servicemoney = #{servicemoney}</if>
+            <if test="servicetax != null and servicetax != ''">and servicetax = #{servicetax}</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">and maintenancetaxmoney =
+                #{maintenancetaxmoney}
+            </if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">and maintenancemoney = #{maintenancemoney}
+            </if>
+            <if test="maintenancetax != null and maintenancetax != ''">and maintenancetax = #{maintenancetax}</if>
+            <if test="servicecost != null and servicecost != ''">and servicecost = #{servicecost}</if>
+            <if test="materialcost != null and materialcost != ''">and materialcost = #{materialcost}</if>
+            <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+            <if test="custname != null and custname != ''">and custname = #{custname}</if>
+            <if test="billmark != null and billmark != ''">and billmark = #{billmark}</if>
+            <if test="suppliername != null and suppliername != ''">and suppliername = #{suppliername}</if>
+            <if test="examineDate != null">and examine_date = #{examineDate}</if>
+            <if test="billstatus != null and billstatus != ''">and billStatus = #{billstatus}</if>
+            <if test="ts != null">and ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-GmoaAcceptanceIncomeDeclarationEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        select
+        <include refid="GmoaAcceptanceIncomeDeclarationEntity_Base_Column_List"/>
+        from gmoa_acceptance_income_declaration
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule like
+                concat('%',#{documentRule},'%')
+            </if>
+            <if test="documentRuleNum != null">and document_rule_num like concat('%',#{documentRuleNum},'%')</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status like concat('%',#{dataStatus},'%')</if>
+            <if test="addStatus != null and addStatus != ''">and add_status like concat('%',#{addStatus},'%')</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status like
+                concat('%',#{updateStatus},'%')
+            </if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status like
+                concat('%',#{deleteStatus},'%')
+            </if>
+            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
+            <if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
+            <if test="dataId != null and dataId != ''">and data_id like concat('%',#{dataId},'%')</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id like concat('%',#{mdmUpId},'%')</if>
+            <if test="billCode != null and billCode != ''">and bill_code like concat('%',#{billCode},'%')</if>
+            <if test="declareDate != null">and declare_date like concat('%',#{declareDate},'%')</if>
+            <if test="projectId != null and projectId != ''">and project_id like concat('%',#{projectId},'%')</if>
+            <if test="projectCode != null and projectCode != ''">and project_code like concat('%',#{projectCode},'%')
+            </if>
+            <if test="projectName != null and projectName != ''">and project_name like concat('%',#{projectName},'%')
+            </if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type like
+                concat('%',#{oneProjectType},'%')
+            </if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">and integratetaxmoney like
+                concat('%',#{integratetaxmoney},'%')
+            </if>
+            <if test="integratemoney != null and integratemoney != ''">and integratemoney like
+                concat('%',#{integratemoney},'%')
+            </if>
+            <if test="integratetax != null and integratetax != ''">and integratetax like
+                concat('%',#{integratetax},'%')
+            </if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">and materialstaxmoney like
+                concat('%',#{materialstaxmoney},'%')
+            </if>
+            <if test="materialsmoney != null and materialsmoney != ''">and materialsmoney like
+                concat('%',#{materialsmoney},'%')
+            </if>
+            <if test="materialstax != null and materialstax != ''">and materialstax like
+                concat('%',#{materialstax},'%')
+            </if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">and devicetaxmoney like
+                concat('%',#{devicetaxmoney},'%')
+            </if>
+            <if test="devicemoney != null and devicemoney != ''">and devicemoney like concat('%',#{devicemoney},'%')
+            </if>
+            <if test="devicetax != null and devicetax != ''">and devicetax like concat('%',#{devicetax},'%')</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">and servicetaxmoney like
+                concat('%',#{servicetaxmoney},'%')
+            </if>
+            <if test="servicemoney != null and servicemoney != ''">and servicemoney like
+                concat('%',#{servicemoney},'%')
+            </if>
+            <if test="servicetax != null and servicetax != ''">and servicetax like concat('%',#{servicetax},'%')</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">and maintenancetaxmoney like
+                concat('%',#{maintenancetaxmoney},'%')
+            </if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">and maintenancemoney like
+                concat('%',#{maintenancemoney},'%')
+            </if>
+            <if test="maintenancetax != null and maintenancetax != ''">and maintenancetax like
+                concat('%',#{maintenancetax},'%')
+            </if>
+            <if test="servicecost != null and servicecost != ''">and servicecost like concat('%',#{servicecost},'%')
+            </if>
+            <if test="materialcost != null and materialcost != ''">and materialcost like
+                concat('%',#{materialcost},'%')
+            </if>
+            <if test="costtype != null and costtype != ''">and costtype like concat('%',#{costtype},'%')</if>
+            <if test="custname != null and custname != ''">and custname like concat('%',#{custname},'%')</if>
+            <if test="billmark != null and billmark != ''">and billmark like concat('%',#{billmark},'%')</if>
+            <if test="suppliername != null and suppliername != ''">and suppliername like
+                concat('%',#{suppliername},'%')
+            </if>
+            <if test="examineDate != null">and examine_date like concat('%',#{examineDate},'%')</if>
+            <if test="billstatus != null and billstatus != ''">and billStatus like concat('%',#{billstatus},'%')</if>
+            <if test="ts != null">and ts like concat('%',#{ts},'%')</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="GmoaAcceptanceIncomeDeclarationentity_list_or"
+            resultMap="get-GmoaAcceptanceIncomeDeclarationEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        select
+        <include refid="GmoaAcceptanceIncomeDeclarationEntity_Base_Column_List"/>
+        from gmoa_acceptance_income_declaration
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">or document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">or document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">or data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">or add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">or update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">or delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">or sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">or data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">or mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">or bill_code = #{billCode}</if>
+            <if test="declareDate != null">or declare_date = #{declareDate}</if>
+            <if test="projectId != null and projectId != ''">or project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">or project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">or project_name = #{projectName}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">or one_project_type = #{oneProjectType}</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">or integratetaxmoney =
+                #{integratetaxmoney}
+            </if>
+            <if test="integratemoney != null and integratemoney != ''">or integratemoney = #{integratemoney}</if>
+            <if test="integratetax != null and integratetax != ''">or integratetax = #{integratetax}</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">or materialstaxmoney =
+                #{materialstaxmoney}
+            </if>
+            <if test="materialsmoney != null and materialsmoney != ''">or materialsmoney = #{materialsmoney}</if>
+            <if test="materialstax != null and materialstax != ''">or materialstax = #{materialstax}</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">or devicetaxmoney = #{devicetaxmoney}</if>
+            <if test="devicemoney != null and devicemoney != ''">or devicemoney = #{devicemoney}</if>
+            <if test="devicetax != null and devicetax != ''">or devicetax = #{devicetax}</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">or servicetaxmoney = #{servicetaxmoney}</if>
+            <if test="servicemoney != null and servicemoney != ''">or servicemoney = #{servicemoney}</if>
+            <if test="servicetax != null and servicetax != ''">or servicetax = #{servicetax}</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">or maintenancetaxmoney =
+                #{maintenancetaxmoney}
+            </if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">or maintenancemoney = #{maintenancemoney}
+            </if>
+            <if test="maintenancetax != null and maintenancetax != ''">or maintenancetax = #{maintenancetax}</if>
+            <if test="servicecost != null and servicecost != ''">or servicecost = #{servicecost}</if>
+            <if test="materialcost != null and materialcost != ''">or materialcost = #{materialcost}</if>
+            <if test="costtype != null and costtype != ''">or costtype = #{costtype}</if>
+            <if test="custname != null and custname != ''">or custname = #{custname}</if>
+            <if test="billmark != null and billmark != ''">or billmark = #{billmark}</if>
+            <if test="suppliername != null and suppliername != ''">or suppliername = #{suppliername}</if>
+            <if test="examineDate != null">or examine_date = #{examineDate}</if>
+            <if test="billstatus != null and billstatus != ''">or billStatus = #{billstatus}</if>
+            <if test="ts != null">or ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity"
+            keyProperty="id" useGeneratedKeys="true">
+        insert into gmoa_acceptance_income_declaration(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="documentRule != null and documentRule != ''">document_rule ,</if>
+            <if test="documentRuleNum != null">document_rule_num ,</if>
+            <if test="dataStatus != null and dataStatus != ''">data_status ,</if>
+            <if test="addStatus != null and addStatus != ''">add_status ,</if>
+            <if test="updateStatus != null and updateStatus != ''">update_status ,</if>
+            <if test="deleteStatus != null and deleteStatus != ''">delete_status ,</if>
+            <if test="sorts != null">sorts ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="org_id != null and org_id != ''">org_id ,</if>
+            <if test="companyId != null and companyId != ''">company_id ,</if>
+            <if test="dataId != null and dataId != ''">data_id ,</if>
+            <if test="mdmUpId != null and mdmUpId != ''">mdm_up_id ,</if>
+            <if test="billCode != null and billCode != ''">bill_code ,</if>
+            <if test="declareDate != null">declare_date ,</if>
+            <if test="projectId != null and projectId != ''">project_id ,</if>
+            <if test="projectCode != null and projectCode != ''">project_code ,</if>
+            <if test="projectName != null and projectName != ''">project_name ,</if>
+            <if test="oneProjectType != null and oneProjectType != ''">one_project_type ,</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">integratetaxmoney ,</if>
+            <if test="integratemoney != null and integratemoney != ''">integratemoney ,</if>
+            <if test="integratetax != null and integratetax != ''">integratetax ,</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">materialstaxmoney ,</if>
+            <if test="materialsmoney != null and materialsmoney != ''">materialsmoney ,</if>
+            <if test="materialstax != null and materialstax != ''">materialstax ,</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">devicetaxmoney ,</if>
+            <if test="devicemoney != null and devicemoney != ''">devicemoney ,</if>
+            <if test="devicetax != null and devicetax != ''">devicetax ,</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">servicetaxmoney ,</if>
+            <if test="servicemoney != null and servicemoney != ''">servicemoney ,</if>
+            <if test="servicetax != null and servicetax != ''">servicetax ,</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">maintenancetaxmoney ,</if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">maintenancemoney ,</if>
+            <if test="maintenancetax != null and maintenancetax != ''">maintenancetax ,</if>
+            <if test="servicecost != null and servicecost != ''">servicecost ,</if>
+            <if test="materialcost != null and materialcost != ''">materialcost ,</if>
+            <if test="costtype != null and costtype != ''">costtype ,</if>
+            <if test="custname != null and custname != ''">custname ,</if>
+            <if test="billmark != null and billmark != ''">billmark ,</if>
+            <if test="suppliername != null and suppliername != ''">suppliername ,</if>
+            <if test="examineDate != null">examine_date ,</if>
+            <if test="billstatus != null and billstatus != ''">billStatus ,</if>
+            <if test="ts != null">ts ,</if>
+            <if test="sorts == null ">sorts,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="documentRule != null and documentRule != ''">#{documentRule} ,</if>
+            <if test="documentRuleNum != null">#{documentRuleNum} ,</if>
+            <if test="dataStatus != null and dataStatus != ''">#{dataStatus} ,</if>
+            <if test="addStatus != null and addStatus != ''">#{addStatus} ,</if>
+            <if test="updateStatus != null and updateStatus != ''">#{updateStatus} ,</if>
+            <if test="deleteStatus != null and deleteStatus != ''">#{deleteStatus} ,</if>
+            <if test="sorts != null">#{sorts} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="org_id != null and org_id != ''">#{org_id} ,</if>
+            <if test="companyId != null and companyId != ''">#{companyId} ,</if>
+            <if test="dataId != null and dataId != ''">#{dataId} ,</if>
+            <if test="mdmUpId != null and mdmUpId != ''">#{mdmUpId} ,</if>
+            <if test="billCode != null and billCode != ''">#{billCode} ,</if>
+            <if test="declareDate != null">#{declareDate} ,</if>
+            <if test="projectId != null and projectId != ''">#{projectId} ,</if>
+            <if test="projectCode != null and projectCode != ''">#{projectCode} ,</if>
+            <if test="projectName != null and projectName != ''">#{projectName} ,</if>
+            <if test="oneProjectType != null and oneProjectType != ''">#{oneProjectType} ,</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">#{integratetaxmoney} ,</if>
+            <if test="integratemoney != null and integratemoney != ''">#{integratemoney} ,</if>
+            <if test="integratetax != null and integratetax != ''">#{integratetax} ,</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">#{materialstaxmoney} ,</if>
+            <if test="materialsmoney != null and materialsmoney != ''">#{materialsmoney} ,</if>
+            <if test="materialstax != null and materialstax != ''">#{materialstax} ,</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">#{devicetaxmoney} ,</if>
+            <if test="devicemoney != null and devicemoney != ''">#{devicemoney} ,</if>
+            <if test="devicetax != null and devicetax != ''">#{devicetax} ,</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">#{servicetaxmoney} ,</if>
+            <if test="servicemoney != null and servicemoney != ''">#{servicemoney} ,</if>
+            <if test="servicetax != null and servicetax != ''">#{servicetax} ,</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">#{maintenancetaxmoney} ,</if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">#{maintenancemoney} ,</if>
+            <if test="maintenancetax != null and maintenancetax != ''">#{maintenancetax} ,</if>
+            <if test="servicecost != null and servicecost != ''">#{servicecost} ,</if>
+            <if test="materialcost != null and materialcost != ''">#{materialcost} ,</if>
+            <if test="costtype != null and costtype != ''">#{costtype} ,</if>
+            <if test="custname != null and custname != ''">#{custname} ,</if>
+            <if test="billmark != null and billmark != ''">#{billmark} ,</if>
+            <if test="suppliername != null and suppliername != ''">#{suppliername} ,</if>
+            <if test="examineDate != null">#{examineDate} ,</if>
+            <if test="billstatus != null and billstatus != ''">#{billstatus} ,</if>
+            <if test="ts != null">#{ts} ,</if>
+            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from
+                gmoa_acceptance_income_declaration a WHERE a.sts = 'Y' ),
+            </if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into gmoa_acceptance_income_declaration(document_rule, document_rule_num, data_status, add_status,
+        update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,
+        data_id, mdm_up_id, bill_code, declare_date, project_id, project_code, project_name, one_project_type,
+        integratetaxmoney, integratemoney, integratetax, materialstaxmoney, materialsmoney, materialstax,
+        devicetaxmoney, devicemoney, devicetax, servicetaxmoney, servicemoney, servicetax, maintenancetaxmoney,
+        maintenancemoney, maintenancetax, servicecost, materialcost, costtype, custname, billmark, suppliername,
+        examine_date, billStatus, ts, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.billCode},#{entity.declareDate},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.oneProjectType},#{entity.integratetaxmoney},#{entity.integratemoney},#{entity.integratetax},#{entity.materialstaxmoney},#{entity.materialsmoney},#{entity.materialstax},#{entity.devicetaxmoney},#{entity.devicemoney},#{entity.devicetax},#{entity.servicetaxmoney},#{entity.servicemoney},#{entity.servicetax},#{entity.maintenancetaxmoney},#{entity.maintenancemoney},#{entity.maintenancetax},#{entity.servicecost},#{entity.materialcost},#{entity.costtype},#{entity.custname},#{entity.billmark},#{entity.suppliername},#{entity.examineDate},#{entity.billstatus},#{entity.ts},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into gmoa_acceptance_income_declaration(document_rule, document_rule_num, data_status, add_status,
+        update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,
+        data_id, mdm_up_id, bill_code, declare_date, project_id, project_code, project_name, one_project_type,
+        integratetaxmoney, integratemoney, integratetax, materialstaxmoney, materialsmoney, materialstax,
+        devicetaxmoney, devicemoney, devicetax, servicetaxmoney, servicemoney, servicetax, maintenancetaxmoney,
+        maintenancemoney, maintenancetax, servicecost, materialcost, costtype, custname, billmark, suppliername,
+        examine_date, billStatus, ts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.billCode},#{entity.declareDate},#{entity.projectId},#{entity.projectCode},#{entity.projectName},#{entity.oneProjectType},#{entity.integratetaxmoney},#{entity.integratemoney},#{entity.integratetax},#{entity.materialstaxmoney},#{entity.materialsmoney},#{entity.materialstax},#{entity.devicetaxmoney},#{entity.devicemoney},#{entity.devicetax},#{entity.servicetaxmoney},#{entity.servicemoney},#{entity.servicetax},#{entity.maintenancetaxmoney},#{entity.maintenancemoney},#{entity.maintenancetax},#{entity.servicecost},#{entity.materialcost},#{entity.costtype},#{entity.custname},#{entity.billmark},#{entity.suppliername},#{entity.examineDate},#{entity.billstatus},#{entity.ts})
+        </foreach>
+        on duplicate key update
+        document_rule = values(document_rule),
+        document_rule_num = values(document_rule_num),
+        data_status = values(data_status),
+        add_status = values(add_status),
+        update_status = values(update_status),
+        delete_status = values(delete_status),
+        create_user_id = values(create_user_id),
+        create_time = values(create_time),
+        modify_user_id = values(modify_user_id),
+        modify_time = values(modify_time),
+        sts = values(sts),
+        org_id = values(org_id),
+        company_id = values(company_id),
+        data_id = values(data_id),
+        mdm_up_id = values(mdm_up_id),
+        bill_code = values(bill_code),
+        declare_date = values(declare_date),
+        project_id = values(project_id),
+        project_code = values(project_code),
+        project_name = values(project_name),
+        one_project_type = values(one_project_type),
+        integratetaxmoney = values(integratetaxmoney),
+        integratemoney = values(integratemoney),
+        integratetax = values(integratetax),
+        materialstaxmoney = values(materialstaxmoney),
+        materialsmoney = values(materialsmoney),
+        materialstax = values(materialstax),
+        devicetaxmoney = values(devicetaxmoney),
+        devicemoney = values(devicemoney),
+        devicetax = values(devicetax),
+        servicetaxmoney = values(servicetaxmoney),
+        servicemoney = values(servicemoney),
+        servicetax = values(servicetax),
+        maintenancetaxmoney = values(maintenancetaxmoney),
+        maintenancemoney = values(maintenancemoney),
+        maintenancetax = values(maintenancetax),
+        servicecost = values(servicecost),
+        materialcost = values(materialcost),
+        costtype = values(costtype),
+        custname = values(custname),
+        billmark = values(billmark),
+        suppliername = values(suppliername),
+        examine_date = values(examine_date),
+        billStatus = values(billStatus),
+        ts = values(ts)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        update gmoa_acceptance_income_declaration set
+        <trim suffix="" suffixOverrides=",">
+            <if test="documentRule != null and documentRule != ''">document_rule = #{documentRule},</if>
+            <if test="documentRuleNum != null">document_rule_num = #{documentRuleNum},</if>
+            <if test="dataStatus != null and dataStatus != ''">data_status = #{dataStatus},</if>
+            <if test="addStatus != null and addStatus != ''">add_status = #{addStatus},</if>
+            <if test="updateStatus != null and updateStatus != ''">update_status = #{updateStatus},</if>
+            <if test="deleteStatus != null and deleteStatus != ''">delete_status = #{deleteStatus},</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
+            <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
+            <if test="dataId != null and dataId != ''">data_id = #{dataId},</if>
+            <if test="mdmUpId != null and mdmUpId != ''">mdm_up_id = #{mdmUpId},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="declareDate != null">declare_date = #{declareDate},</if>
+            <if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
+            <if test="projectCode != null and projectCode != ''">project_code = #{projectCode},</if>
+            <if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
+            <if test="oneProjectType != null and oneProjectType != ''">one_project_type = #{oneProjectType},</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">integratetaxmoney = #{integratetaxmoney},
+            </if>
+            <if test="integratemoney != null and integratemoney != ''">integratemoney = #{integratemoney},</if>
+            <if test="integratetax != null and integratetax != ''">integratetax = #{integratetax},</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">materialstaxmoney = #{materialstaxmoney},
+            </if>
+            <if test="materialsmoney != null and materialsmoney != ''">materialsmoney = #{materialsmoney},</if>
+            <if test="materialstax != null and materialstax != ''">materialstax = #{materialstax},</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">devicetaxmoney = #{devicetaxmoney},</if>
+            <if test="devicemoney != null and devicemoney != ''">devicemoney = #{devicemoney},</if>
+            <if test="devicetax != null and devicetax != ''">devicetax = #{devicetax},</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">servicetaxmoney = #{servicetaxmoney},</if>
+            <if test="servicemoney != null and servicemoney != ''">servicemoney = #{servicemoney},</if>
+            <if test="servicetax != null and servicetax != ''">servicetax = #{servicetax},</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">maintenancetaxmoney =
+                #{maintenancetaxmoney},
+            </if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">maintenancemoney = #{maintenancemoney},</if>
+            <if test="maintenancetax != null and maintenancetax != ''">maintenancetax = #{maintenancetax},</if>
+            <if test="servicecost != null and servicecost != ''">servicecost = #{servicecost},</if>
+            <if test="materialcost != null and materialcost != ''">materialcost = #{materialcost},</if>
+            <if test="costtype != null and costtype != ''">costtype = #{costtype},</if>
+            <if test="custname != null and custname != ''">custname = #{custname},</if>
+            <if test="billmark != null and billmark != ''">billmark = #{billmark},</if>
+            <if test="suppliername != null and suppliername != ''">suppliername = #{suppliername},</if>
+            <if test="examineDate != null">examine_date = #{examineDate},</if>
+            <if test="billstatus != null and billstatus != ''">billStatus = #{billstatus},</if>
+            <if test="ts != null">ts = #{ts},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        update gmoa_acceptance_income_declaration
+        set sts= 'N',
+            modify_time = #{modify_time},
+            modify_user_id = #{modify_user_id}
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        update gmoa_acceptance_income_declaration set sts= 'N' ,modify_time = #{modify_time},modify_user_id =
+        #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="declareDate != null">and declare_date = #{declareDate}</if>
+            <if test="projectId != null and projectId != ''">and project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">and project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">and project_name = #{projectName}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type = #{oneProjectType}</if>
+            <if test="integratetaxmoney != null and integratetaxmoney != ''">and integratetaxmoney =
+                #{integratetaxmoney}
+            </if>
+            <if test="integratemoney != null and integratemoney != ''">and integratemoney = #{integratemoney}</if>
+            <if test="integratetax != null and integratetax != ''">and integratetax = #{integratetax}</if>
+            <if test="materialstaxmoney != null and materialstaxmoney != ''">and materialstaxmoney =
+                #{materialstaxmoney}
+            </if>
+            <if test="materialsmoney != null and materialsmoney != ''">and materialsmoney = #{materialsmoney}</if>
+            <if test="materialstax != null and materialstax != ''">and materialstax = #{materialstax}</if>
+            <if test="devicetaxmoney != null and devicetaxmoney != ''">and devicetaxmoney = #{devicetaxmoney}</if>
+            <if test="devicemoney != null and devicemoney != ''">and devicemoney = #{devicemoney}</if>
+            <if test="devicetax != null and devicetax != ''">and devicetax = #{devicetax}</if>
+            <if test="servicetaxmoney != null and servicetaxmoney != ''">and servicetaxmoney = #{servicetaxmoney}</if>
+            <if test="servicemoney != null and servicemoney != ''">and servicemoney = #{servicemoney}</if>
+            <if test="servicetax != null and servicetax != ''">and servicetax = #{servicetax}</if>
+            <if test="maintenancetaxmoney != null and maintenancetaxmoney != ''">and maintenancetaxmoney =
+                #{maintenancetaxmoney}
+            </if>
+            <if test="maintenancemoney != null and maintenancemoney != ''">and maintenancemoney = #{maintenancemoney}
+            </if>
+            <if test="maintenancetax != null and maintenancetax != ''">and maintenancetax = #{maintenancetax}</if>
+            <if test="servicecost != null and servicecost != ''">and servicecost = #{servicecost}</if>
+            <if test="materialcost != null and materialcost != ''">and materialcost = #{materialcost}</if>
+            <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+            <if test="custname != null and custname != ''">and custname = #{custname}</if>
+            <if test="billmark != null and billmark != ''">and billmark = #{billmark}</if>
+            <if test="suppliername != null and suppliername != ''">and suppliername = #{suppliername}</if>
+            <if test="examineDate != null">and examine_date = #{examineDate}</if>
+            <if test="billstatus != null and billstatus != ''">and billStatus = #{billstatus}</if>
+            <if test="ts != null">and ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from gmoa_acceptance_income_declaration
+        where
+            1=1
+        <if test="id != null and id != ''">and id = #{id}</if>
+        <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+    </delete>
+
+
+    <select id="queryOAAll" resultMap="get-GmoaAcceptanceIncomeDeclarationEntity-result" parameterType="com.hzya.frame.plugin.gm.entity.GmoaAcceptanceIncomeDeclarationEntity">
+        select billno            as bill_code,
+               supplierName      as suppliername,
+               declare_date,
+               one_project_type,
+               examine_date,
+               project_id,
+               project_code,
+               project_name,
+               custname,
+               integrateTaxMoney as integratetaxmoney,
+               integrateMoney    as integratemoney,
+               integrateTax      as integratetax,
+               materialsTaxMoney as materialstaxmoney,
+               materialsMoney    as materialsmoney,
+               materialsTax      as materialstax,
+               deviceTaxMoney    as devicetaxmoney,
+               deviceMoney       as devicemoney,
+               deviceTax         as devicetax,
+               serviceTaxMoney   as servicetaxmoney,
+               serviceMoney      as servicemoney,
+               serviceTax        as servicetax,
+               billMark          as billmark,
+               costtype          as costtype,
+               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')
+                   )             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')
+                )&gt;=#{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')
+                )&lt;=#{endTime}
+    </select>
+
+
+    <insert id="saveList" parameterType="java.util.List">
+        INSERT INTO gmoa_acceptance_income_declaration (
+        id,
+        data_status,
+        create_time,
+        sts,
+        bill_code,
+        declare_date,
+        project_id,
+        project_code,
+        project_name,
+        one_project_type,
+        integratetaxmoney,
+        integratemoney,
+        integratetax,
+        materialstaxmoney,
+        materialsmoney,
+        materialstax,
+        devicetaxmoney,
+        devicemoney,
+        devicetax,
+        servicetaxmoney,
+        servicemoney,
+        servicetax,
+        maintenancetaxmoney,
+        maintenancemoney,
+        maintenancetax,
+        servicecost,
+        materialcost,
+        costtype,
+        custname,
+        billmark,
+        suppliername,
+        examine_date,
+        billStatus,
+        ts
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.dataStatus},
+            now(),
+            #{item.sts},
+            #{item.billCode},
+            #{item.declareDate},
+            #{item.projectId},
+            #{item.projectCode},
+            #{item.projectName},
+            #{item.oneProjectType},
+            #{item.integratetaxmoney},
+            #{item.integratemoney},
+            #{item.integratetax},
+            #{item.materialstaxmoney},
+            #{item.materialsmoney},
+            #{item.materialstax},
+            #{item.devicetaxmoney},
+            #{item.devicemoney},
+            #{item.devicetax},
+            #{item.servicetaxmoney},
+            #{item.servicemoney},
+            #{item.servicetax},
+            #{item.maintenancetaxmoney},
+            #{item.maintenancemoney},
+            #{item.maintenancetax},
+            #{item.servicecost},
+            #{item.materialcost},
+            #{item.costtype},
+            #{item.custname},
+            #{item.billmark},
+            #{item.suppliername},
+            #{item.examineDate},
+            #{item.billstatus},
+            #{item.ts}
+            )
+        </foreach>
+    </insert>
+
+</mapper>
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaAuditDeclarationFormEntity.java

@@ -0,0 +1,533 @@
+package com.hzya.frame.plugin.gm.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 广脉OA：审计申报单(GmoaAuditDeclarationForm)实体类
+ *
+ * @author zydd
+ * @since 2025-08-23 14:40:52
+ */
+public class GmoaAuditDeclarationFormEntity extends BaseEntity {
+ 
+  /**  单据规则 */
+   private String documentRule;
+  /**  单据规则流水号 */
+   private Long documentRuleNum;
+  /**  数据状态 Y正常 N删除 F修改 */
+   private String dataStatus;
+  /**  新增数据状态 0待下发 1已下发 */
+   private String addStatus;
+  /**  修改数据状态 0待下发 1已下发 */
+   private String updateStatus;
+  /**  删除数据状态 0待下发 1已下发 */
+   private String deleteStatus;
+  /**  公司id */
+   private String companyId;
+  /**  data_id */
+   private String dataId;
+  /**  mdm_up_id */
+   private String mdmUpId;
+  /**  单据号 */
+   private String billCode;
+  /**  单据日期 */
+   private Date declareDate;
+  /**  审核日期 */
+   private Date examineDate;
+  /**  审计申报项目ID */
+   private String projectId;
+  /**  审计申报项目编码 */
+   private String projectCode;
+  /**  审计申报项目名称 */
+   private String projectName;
+  /**  审计申报项目对应客商 */
+   private String custname;
+  /**  审计申报集成费（含税） */
+   private String integratetaxmoney;
+  /**  审计申报集成费（除税） */
+   private String integratemoney;
+  /**  审计申报集成费（税率） */
+   private String integratetax;
+  /**  审计申报辅材费（含税） */
+   private String materialstaxmoney;
+  /**  审计申报辅材费（除税） */
+   private String materialsmoney;
+  /**  审计申报辅材费（税率） */
+   private String materialstax;
+  /**  审计申报设备费（含税） */
+   private String devicetaxmoney;
+  /**  审计申报设备费（除税） */
+   private String devicemoney;
+  /**  审计申报设备费（税率） */
+   private String devicetax;
+  /**  审计申报服务费（含税） */
+   private String servicetaxmoney;
+  /**  审计申报服务费（除税） */
+   private String servicemoney;
+  /**  审计申报服务费（税率） */
+   private String servicetax;
+  /**  审计申报维护费（含税） */
+   private String maintenancetaxmoney;
+  /**  审计申报维护费（除税） */
+   private String maintenancemoney;
+  /**  审计申报维护费（税率） */
+   private String maintenancetax;
+  /**  审计申报制单人 */
+   private String billmark;
+  /**  验收收入申报集成费（含税） */
+   private String integratetaxmoneyys;
+  /**  验收收入申报集成费（除税） */
+   private String integratemoneyys;
+  /**  验收收入申报辅材费（含税） */
+   private String materialstaxmoneyys;
+  /**  验收收入申报辅材费（除税） */
+   private String materialsmoneyys;
+  /**  验收收入申报设备费（含税） */
+   private String devicetaxmoneyys;
+  /**  验收收入申报设备费（除税） */
+   private String devicemoneyys;
+  /**  验收收入申报服务费（含税） */
+   private String servicetaxmoneyys;
+  /**  验收收入申报服务费（除税） */
+   private String servicemoneyys;
+  /**  验收收入申报维护费（含税） */
+   private String maintenancetaxmoneyys;
+  /**  验收收入申报维护费（除税） */
+   private String maintenancemoneyys;
+  /**  生成状态 */
+   private String billstatus;
+  /**  一级项目类型 */
+   private String oneProjectType;
+  /**  验收收入申报集成费（税率） */
+   private String integratetaxys;
+  /**  验收收入申报辅材费（税率） */
+   private String materialstaxys;
+  /**  验收收入申报设备费（税率） */
+   private String devicetaxys;
+  /**  验收收入申报服务费（税率） */
+   private String servicetaxys;
+  /**  验收收入申报维护费（税率） */
+   private String maintenancetaxys;
+  /**  最后更新时间 */
+   private String ts;
+    private String startTime;
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getDocumentRule() {
+        return documentRule;
+    }
+
+    public void setDocumentRule(String documentRule) {
+        this.documentRule = documentRule;
+    }
+
+    public Long getDocumentRuleNum() {
+        return documentRuleNum;
+    }
+
+    public void setDocumentRuleNum(Long documentRuleNum) {
+        this.documentRuleNum = documentRuleNum;
+    }
+
+    public String getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(String dataStatus) {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getAddStatus() {
+        return addStatus;
+    }
+
+    public void setAddStatus(String addStatus) {
+        this.addStatus = addStatus;
+    }
+
+    public String getUpdateStatus() {
+        return updateStatus;
+    }
+
+    public void setUpdateStatus(String updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
+    public String getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(String deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+
+    public String getMdmUpId() {
+        return mdmUpId;
+    }
+
+    public void setMdmUpId(String mdmUpId) {
+        this.mdmUpId = mdmUpId;
+    }
+
+    public String getBillCode() {
+        return billCode;
+    }
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+    public Date getDeclareDate() {
+        return declareDate;
+    }
+
+    public void setDeclareDate(Date declareDate) {
+        this.declareDate = declareDate;
+    }
+
+    public Date getExamineDate() {
+        return examineDate;
+    }
+
+    public void setExamineDate(Date examineDate) {
+        this.examineDate = examineDate;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getCustname() {
+        return custname;
+    }
+
+    public void setCustname(String custname) {
+        this.custname = custname;
+    }
+
+    public String getIntegratetaxmoney() {
+        return integratetaxmoney;
+    }
+
+    public void setIntegratetaxmoney(String integratetaxmoney) {
+        this.integratetaxmoney = integratetaxmoney;
+    }
+
+    public String getIntegratemoney() {
+        return integratemoney;
+    }
+
+    public void setIntegratemoney(String integratemoney) {
+        this.integratemoney = integratemoney;
+    }
+
+    public String getIntegratetax() {
+        return integratetax;
+    }
+
+    public void setIntegratetax(String integratetax) {
+        this.integratetax = integratetax;
+    }
+
+    public String getMaterialstaxmoney() {
+        return materialstaxmoney;
+    }
+
+    public void setMaterialstaxmoney(String materialstaxmoney) {
+        this.materialstaxmoney = materialstaxmoney;
+    }
+
+    public String getMaterialsmoney() {
+        return materialsmoney;
+    }
+
+    public void setMaterialsmoney(String materialsmoney) {
+        this.materialsmoney = materialsmoney;
+    }
+
+    public String getMaterialstax() {
+        return materialstax;
+    }
+
+    public void setMaterialstax(String materialstax) {
+        this.materialstax = materialstax;
+    }
+
+    public String getDevicetaxmoney() {
+        return devicetaxmoney;
+    }
+
+    public void setDevicetaxmoney(String devicetaxmoney) {
+        this.devicetaxmoney = devicetaxmoney;
+    }
+
+    public String getDevicemoney() {
+        return devicemoney;
+    }
+
+    public void setDevicemoney(String devicemoney) {
+        this.devicemoney = devicemoney;
+    }
+
+    public String getDevicetax() {
+        return devicetax;
+    }
+
+    public void setDevicetax(String devicetax) {
+        this.devicetax = devicetax;
+    }
+
+    public String getServicetaxmoney() {
+        return servicetaxmoney;
+    }
+
+    public void setServicetaxmoney(String servicetaxmoney) {
+        this.servicetaxmoney = servicetaxmoney;
+    }
+
+    public String getServicemoney() {
+        return servicemoney;
+    }
+
+    public void setServicemoney(String servicemoney) {
+        this.servicemoney = servicemoney;
+    }
+
+    public String getServicetax() {
+        return servicetax;
+    }
+
+    public void setServicetax(String servicetax) {
+        this.servicetax = servicetax;
+    }
+
+    public String getMaintenancetaxmoney() {
+        return maintenancetaxmoney;
+    }
+
+    public void setMaintenancetaxmoney(String maintenancetaxmoney) {
+        this.maintenancetaxmoney = maintenancetaxmoney;
+    }
+
+    public String getMaintenancemoney() {
+        return maintenancemoney;
+    }
+
+    public void setMaintenancemoney(String maintenancemoney) {
+        this.maintenancemoney = maintenancemoney;
+    }
+
+    public String getMaintenancetax() {
+        return maintenancetax;
+    }
+
+    public void setMaintenancetax(String maintenancetax) {
+        this.maintenancetax = maintenancetax;
+    }
+
+    public String getBillmark() {
+        return billmark;
+    }
+
+    public void setBillmark(String billmark) {
+        this.billmark = billmark;
+    }
+
+    public String getIntegratetaxmoneyys() {
+        return integratetaxmoneyys;
+    }
+
+    public void setIntegratetaxmoneyys(String integratetaxmoneyys) {
+        this.integratetaxmoneyys = integratetaxmoneyys;
+    }
+
+    public String getIntegratemoneyys() {
+        return integratemoneyys;
+    }
+
+    public void setIntegratemoneyys(String integratemoneyys) {
+        this.integratemoneyys = integratemoneyys;
+    }
+
+    public String getMaterialstaxmoneyys() {
+        return materialstaxmoneyys;
+    }
+
+    public void setMaterialstaxmoneyys(String materialstaxmoneyys) {
+        this.materialstaxmoneyys = materialstaxmoneyys;
+    }
+
+    public String getMaterialsmoneyys() {
+        return materialsmoneyys;
+    }
+
+    public void setMaterialsmoneyys(String materialsmoneyys) {
+        this.materialsmoneyys = materialsmoneyys;
+    }
+
+    public String getDevicetaxmoneyys() {
+        return devicetaxmoneyys;
+    }
+
+    public void setDevicetaxmoneyys(String devicetaxmoneyys) {
+        this.devicetaxmoneyys = devicetaxmoneyys;
+    }
+
+    public String getDevicemoneyys() {
+        return devicemoneyys;
+    }
+
+    public void setDevicemoneyys(String devicemoneyys) {
+        this.devicemoneyys = devicemoneyys;
+    }
+
+    public String getServicetaxmoneyys() {
+        return servicetaxmoneyys;
+    }
+
+    public void setServicetaxmoneyys(String servicetaxmoneyys) {
+        this.servicetaxmoneyys = servicetaxmoneyys;
+    }
+
+    public String getServicemoneyys() {
+        return servicemoneyys;
+    }
+
+    public void setServicemoneyys(String servicemoneyys) {
+        this.servicemoneyys = servicemoneyys;
+    }
+
+    public String getMaintenancetaxmoneyys() {
+        return maintenancetaxmoneyys;
+    }
+
+    public void setMaintenancetaxmoneyys(String maintenancetaxmoneyys) {
+        this.maintenancetaxmoneyys = maintenancetaxmoneyys;
+    }
+
+    public String getMaintenancemoneyys() {
+        return maintenancemoneyys;
+    }
+
+    public void setMaintenancemoneyys(String maintenancemoneyys) {
+        this.maintenancemoneyys = maintenancemoneyys;
+    }
+
+    public String getBillstatus() {
+        return billstatus;
+    }
+
+    public void setBillstatus(String billstatus) {
+        this.billstatus = billstatus;
+    }
+
+    public String getOneProjectType() {
+        return oneProjectType;
+    }
+
+    public void setOneProjectType(String oneProjectType) {
+        this.oneProjectType = oneProjectType;
+    }
+
+    public String getIntegratetaxys() {
+        return integratetaxys;
+    }
+
+    public void setIntegratetaxys(String integratetaxys) {
+        this.integratetaxys = integratetaxys;
+    }
+
+    public String getMaterialstaxys() {
+        return materialstaxys;
+    }
+
+    public void setMaterialstaxys(String materialstaxys) {
+        this.materialstaxys = materialstaxys;
+    }
+
+    public String getDevicetaxys() {
+        return devicetaxys;
+    }
+
+    public void setDevicetaxys(String devicetaxys) {
+        this.devicetaxys = devicetaxys;
+    }
+
+    public String getServicetaxys() {
+        return servicetaxys;
+    }
+
+    public void setServicetaxys(String servicetaxys) {
+        this.servicetaxys = servicetaxys;
+    }
+
+    public String getMaintenancetaxys() {
+        return maintenancetaxys;
+    }
+
+    public void setMaintenancetaxys(String maintenancetaxys) {
+        this.maintenancetaxys = maintenancetaxys;
+    }
+
+    public String getTs() {
+        return ts;
+    }
+
+    public void setTs(String ts) {
+        this.ts = ts;
+    }
+
+}
+

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;
+    }
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/GmoaCostAdjustmentAuditEntity.xml

@@ -0,0 +1,568 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl">
+
+    <resultMap id="get-GmoaCostAdjustmentAuditEntity-result"
+               type="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
+        <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
+        <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
+        <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
+        <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
+        <result property="deleteStatus" column="delete_status" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+        <result property="dataId" column="data_id" jdbcType="VARCHAR"/>
+        <result property="mdmUpId" column="mdm_up_id" jdbcType="VARCHAR"/>
+        <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
+        <result property="declareDate" column="declare_date" jdbcType="TIMESTAMP"/>
+        <result property="examineDate" column="examine_date" jdbcType="TIMESTAMP"/>
+        <result property="billmark" column="billmark" jdbcType="VARCHAR"/>
+        <result property="oneProjectType" column="one_project_type" jdbcType="VARCHAR"/>
+        <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
+        <result property="projectCode" column="project_code" jdbcType="VARCHAR"/>
+        <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
+        <result property="costtype" column="costtype" jdbcType="VARCHAR"/>
+        <result property="auditcost" column="auditcost" jdbcType="VARCHAR"/>
+        <result property="acceptancecost" column="acceptancecost" jdbcType="VARCHAR"/>
+        <result property="custname" column="custname" jdbcType="VARCHAR"/>
+        <result property="billstatus" column="billstatus" jdbcType="VARCHAR"/>
+        <result property="ts" column="ts" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="GmoaCostAdjustmentAuditEntity_Base_Column_List">
+        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
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-GmoaCostAdjustmentAuditEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        select
+        <include refid="GmoaCostAdjustmentAuditEntity_Base_Column_List"/>
+        from gmoa_cost_adjustment_audit
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="declareDate != null">and declare_date = #{declareDate}</if>
+            <if test="examineDate != null">and examine_date = #{examineDate}</if>
+            <if test="billmark != null and billmark != ''">and billmark = #{billmark}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type = #{oneProjectType}</if>
+            <if test="projectId != null and projectId != ''">and project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">and project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">and project_name = #{projectName}</if>
+            <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+            <if test="auditcost != null and auditcost != ''">and auditcost = #{auditcost}</if>
+            <if test="acceptancecost != null and acceptancecost != ''">and acceptancecost = #{acceptancecost}</if>
+            <if test="custname != null and custname != ''">and custname = #{custname}</if>
+            <if test="billstatus != null and billstatus != ''">and billstatus = #{billstatus}</if>
+            <if test="ts != null and ts != ''">and ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        select count(1) from gmoa_cost_adjustment_audit
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="declareDate != null">and declare_date = #{declareDate}</if>
+            <if test="examineDate != null">and examine_date = #{examineDate}</if>
+            <if test="billmark != null and billmark != ''">and billmark = #{billmark}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type = #{oneProjectType}</if>
+            <if test="projectId != null and projectId != ''">and project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">and project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">and project_name = #{projectName}</if>
+            <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+            <if test="auditcost != null and auditcost != ''">and auditcost = #{auditcost}</if>
+            <if test="acceptancecost != null and acceptancecost != ''">and acceptancecost = #{acceptancecost}</if>
+            <if test="custname != null and custname != ''">and custname = #{custname}</if>
+            <if test="billstatus != null and billstatus != ''">and billstatus = #{billstatus}</if>
+            <if test="ts != null and ts != ''">and ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-GmoaCostAdjustmentAuditEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        select
+        <include refid="GmoaCostAdjustmentAuditEntity_Base_Column_List"/>
+        from gmoa_cost_adjustment_audit
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule like
+                concat('%',#{documentRule},'%')
+            </if>
+            <if test="documentRuleNum != null">and document_rule_num like concat('%',#{documentRuleNum},'%')</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status like concat('%',#{dataStatus},'%')</if>
+            <if test="addStatus != null and addStatus != ''">and add_status like concat('%',#{addStatus},'%')</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status like
+                concat('%',#{updateStatus},'%')
+            </if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status like
+                concat('%',#{deleteStatus},'%')
+            </if>
+            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
+            <if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
+            <if test="dataId != null and dataId != ''">and data_id like concat('%',#{dataId},'%')</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id like concat('%',#{mdmUpId},'%')</if>
+            <if test="billCode != null and billCode != ''">and bill_code like concat('%',#{billCode},'%')</if>
+            <if test="declareDate != null">and declare_date like concat('%',#{declareDate},'%')</if>
+            <if test="examineDate != null">and examine_date like concat('%',#{examineDate},'%')</if>
+            <if test="billmark != null and billmark != ''">and billmark like concat('%',#{billmark},'%')</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type like
+                concat('%',#{oneProjectType},'%')
+            </if>
+            <if test="projectId != null and projectId != ''">and project_id like concat('%',#{projectId},'%')</if>
+            <if test="projectCode != null and projectCode != ''">and project_code like concat('%',#{projectCode},'%')
+            </if>
+            <if test="projectName != null and projectName != ''">and project_name like concat('%',#{projectName},'%')
+            </if>
+            <if test="costtype != null and costtype != ''">and costtype like concat('%',#{costtype},'%')</if>
+            <if test="auditcost != null and auditcost != ''">and auditcost like concat('%',#{auditcost},'%')</if>
+            <if test="acceptancecost != null and acceptancecost != ''">and acceptancecost like
+                concat('%',#{acceptancecost},'%')
+            </if>
+            <if test="custname != null and custname != ''">and custname like concat('%',#{custname},'%')</if>
+            <if test="billstatus != null and billstatus != ''">and billstatus like concat('%',#{billstatus},'%')</if>
+            <if test="ts != null and ts != ''">and ts like concat('%',#{ts},'%')</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="GmoaCostAdjustmentAuditentity_list_or" resultMap="get-GmoaCostAdjustmentAuditEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        select
+        <include refid="GmoaCostAdjustmentAuditEntity_Base_Column_List"/>
+        from gmoa_cost_adjustment_audit
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">or document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">or document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">or data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">or add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">or update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">or delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">or sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">or data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">or mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">or bill_code = #{billCode}</if>
+            <if test="declareDate != null">or declare_date = #{declareDate}</if>
+            <if test="examineDate != null">or examine_date = #{examineDate}</if>
+            <if test="billmark != null and billmark != ''">or billmark = #{billmark}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">or one_project_type = #{oneProjectType}</if>
+            <if test="projectId != null and projectId != ''">or project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">or project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">or project_name = #{projectName}</if>
+            <if test="costtype != null and costtype != ''">or costtype = #{costtype}</if>
+            <if test="auditcost != null and auditcost != ''">or auditcost = #{auditcost}</if>
+            <if test="acceptancecost != null and acceptancecost != ''">or acceptancecost = #{acceptancecost}</if>
+            <if test="custname != null and custname != ''">or custname = #{custname}</if>
+            <if test="billstatus != null and billstatus != ''">or billstatus = #{billstatus}</if>
+            <if test="ts != null and ts != ''">or ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity"
+            keyProperty="id" useGeneratedKeys="true">
+        insert into gmoa_cost_adjustment_audit(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="documentRule != null and documentRule != ''">document_rule ,</if>
+            <if test="documentRuleNum != null">document_rule_num ,</if>
+            <if test="dataStatus != null and dataStatus != ''">data_status ,</if>
+            <if test="addStatus != null and addStatus != ''">add_status ,</if>
+            <if test="updateStatus != null and updateStatus != ''">update_status ,</if>
+            <if test="deleteStatus != null and deleteStatus != ''">delete_status ,</if>
+            <if test="sorts != null">sorts ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="org_id != null and org_id != ''">org_id ,</if>
+            <if test="companyId != null and companyId != ''">company_id ,</if>
+            <if test="dataId != null and dataId != ''">data_id ,</if>
+            <if test="mdmUpId != null and mdmUpId != ''">mdm_up_id ,</if>
+            <if test="billCode != null and billCode != ''">bill_code ,</if>
+            <if test="declareDate != null">declare_date ,</if>
+            <if test="examineDate != null">examine_date ,</if>
+            <if test="billmark != null and billmark != ''">billmark ,</if>
+            <if test="oneProjectType != null and oneProjectType != ''">one_project_type ,</if>
+            <if test="projectId != null and projectId != ''">project_id ,</if>
+            <if test="projectCode != null and projectCode != ''">project_code ,</if>
+            <if test="projectName != null and projectName != ''">project_name ,</if>
+            <if test="costtype != null and costtype != ''">costtype ,</if>
+            <if test="auditcost != null and auditcost != ''">auditcost ,</if>
+            <if test="acceptancecost != null and acceptancecost != ''">acceptancecost ,</if>
+            <if test="custname != null and custname != ''">custname ,</if>
+            <if test="billstatus != null and billstatus != ''">billstatus ,</if>
+            <if test="ts != null and ts != ''">ts ,</if>
+            <if test="sorts == null ">sorts,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="documentRule != null and documentRule != ''">#{documentRule} ,</if>
+            <if test="documentRuleNum != null">#{documentRuleNum} ,</if>
+            <if test="dataStatus != null and dataStatus != ''">#{dataStatus} ,</if>
+            <if test="addStatus != null and addStatus != ''">#{addStatus} ,</if>
+            <if test="updateStatus != null and updateStatus != ''">#{updateStatus} ,</if>
+            <if test="deleteStatus != null and deleteStatus != ''">#{deleteStatus} ,</if>
+            <if test="sorts != null">#{sorts} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="org_id != null and org_id != ''">#{org_id} ,</if>
+            <if test="companyId != null and companyId != ''">#{companyId} ,</if>
+            <if test="dataId != null and dataId != ''">#{dataId} ,</if>
+            <if test="mdmUpId != null and mdmUpId != ''">#{mdmUpId} ,</if>
+            <if test="billCode != null and billCode != ''">#{billCode} ,</if>
+            <if test="declareDate != null">#{declareDate} ,</if>
+            <if test="examineDate != null">#{examineDate} ,</if>
+            <if test="billmark != null and billmark != ''">#{billmark} ,</if>
+            <if test="oneProjectType != null and oneProjectType != ''">#{oneProjectType} ,</if>
+            <if test="projectId != null and projectId != ''">#{projectId} ,</if>
+            <if test="projectCode != null and projectCode != ''">#{projectCode} ,</if>
+            <if test="projectName != null and projectName != ''">#{projectName} ,</if>
+            <if test="costtype != null and costtype != ''">#{costtype} ,</if>
+            <if test="auditcost != null and auditcost != ''">#{auditcost} ,</if>
+            <if test="acceptancecost != null and acceptancecost != ''">#{acceptancecost} ,</if>
+            <if test="custname != null and custname != ''">#{custname} ,</if>
+            <if test="billstatus != null and billstatus != ''">#{billstatus} ,</if>
+            <if test="ts != null and ts != ''">#{ts} ,</if>
+            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from gmoa_cost_adjustment_audit a
+                WHERE a.sts = 'Y' ),
+            </if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        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
+        <foreach collection="entities" item="entity" separator=",">
+            (#{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')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        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
+        <foreach collection="entities" item="entity" separator=",">
+            (#{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})
+        </foreach>
+        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)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        update gmoa_cost_adjustment_audit set
+        <trim suffix="" suffixOverrides=",">
+            <if test="documentRule != null and documentRule != ''">document_rule = #{documentRule},</if>
+            <if test="documentRuleNum != null">document_rule_num = #{documentRuleNum},</if>
+            <if test="dataStatus != null and dataStatus != ''">data_status = #{dataStatus},</if>
+            <if test="addStatus != null and addStatus != ''">add_status = #{addStatus},</if>
+            <if test="updateStatus != null and updateStatus != ''">update_status = #{updateStatus},</if>
+            <if test="deleteStatus != null and deleteStatus != ''">delete_status = #{deleteStatus},</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
+            <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
+            <if test="dataId != null and dataId != ''">data_id = #{dataId},</if>
+            <if test="mdmUpId != null and mdmUpId != ''">mdm_up_id = #{mdmUpId},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="declareDate != null">declare_date = #{declareDate},</if>
+            <if test="examineDate != null">examine_date = #{examineDate},</if>
+            <if test="billmark != null and billmark != ''">billmark = #{billmark},</if>
+            <if test="oneProjectType != null and oneProjectType != ''">one_project_type = #{oneProjectType},</if>
+            <if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
+            <if test="projectCode != null and projectCode != ''">project_code = #{projectCode},</if>
+            <if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
+            <if test="costtype != null and costtype != ''">costtype = #{costtype},</if>
+            <if test="auditcost != null and auditcost != ''">auditcost = #{auditcost},</if>
+            <if test="acceptancecost != null and acceptancecost != ''">acceptancecost = #{acceptancecost},</if>
+            <if test="custname != null and custname != ''">custname = #{custname},</if>
+            <if test="billstatus != null and billstatus != ''">billstatus = #{billstatus},</if>
+            <if test="ts != null and ts != ''">ts = #{ts},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        update gmoa_cost_adjustment_audit
+        set sts= 'N',
+            modify_time = #{modify_time},
+            modify_user_id = #{modify_user_id}
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        update gmoa_cost_adjustment_audit set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
+            <if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
+            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
+            <if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
+            <if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="declareDate != null">and declare_date = #{declareDate}</if>
+            <if test="examineDate != null">and examine_date = #{examineDate}</if>
+            <if test="billmark != null and billmark != ''">and billmark = #{billmark}</if>
+            <if test="oneProjectType != null and oneProjectType != ''">and one_project_type = #{oneProjectType}</if>
+            <if test="projectId != null and projectId != ''">and project_id = #{projectId}</if>
+            <if test="projectCode != null and projectCode != ''">and project_code = #{projectCode}</if>
+            <if test="projectName != null and projectName != ''">and project_name = #{projectName}</if>
+            <if test="costtype != null and costtype != ''">and costtype = #{costtype}</if>
+            <if test="auditcost != null and auditcost != ''">and auditcost = #{auditcost}</if>
+            <if test="acceptancecost != null and acceptancecost != ''">and acceptancecost = #{acceptancecost}</if>
+            <if test="custname != null and custname != ''">and custname = #{custname}</if>
+            <if test="billstatus != null and billstatus != ''">and billstatus = #{billstatus}</if>
+            <if test="ts != null and ts != ''">and ts = #{ts}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from gmoa_cost_adjustment_audit
+        where id = #{id}
+    </delete>
+
+
+    <select id="queryOAAll" parameterType="com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity">
+        SELECT billno   AS bill_code,
+               declare_date,
+               examine_date,
+               billMark as billmark,
+               one_project_type,
+               project_id,
+               project_code,
+               project_name,
+               costtype,
+               auditcost,
+               acceptancecost,
+               custname,
+               GREATEST(
+                       COALESCE(aCreateTime, '1970-01-01 00:00:00'),
+                       COALESCE(bCreateTime, '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')
+                   )    AS ts
+        FROM u8c_cost_adjustment_audit
+        where
+            1 = 1
+            and GREATEST(
+                      COALESCE(aCreateTime, '1970-01-01 00:00:00'),
+                      COALESCE(bCreateTime, '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')
+                  ) &gt;= #{startTime}
+            and GREATEST(
+                        COALESCE(aCreateTime,'1970-01-01 00:00:00'),
+                        COALESCE(bCreateTime,'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')
+                ) &lt;=#{endTime}
+
+    </select>
+
+    <select id="saveList" parameterType="java.util.List">
+        insert into gmoa_cost_adjustment_audit(
+        id,
+        data_status,
+        create_time,
+        sts,
+        bill_code,
+        declare_date,
+        examine_date,
+        billmark,
+        one_project_type,
+        project_id,
+        project_code,
+        project_name,
+        costtype,
+        auditcost,
+        acceptancecost,
+        custname,
+        ts
+        )values
+        <foreach collection="list" item="item" separator=",">
+        (
+            #{item.id},
+            #{item.dataStatus},
+            now(),
+            #{item.sts},
+            #{item.billCode},
+            #{item.declareDate},
+            #{item.examineDate},
+            #{item.billmark},
+            #{item.oneProjectType},
+            #{item.projectId},
+            #{item.projectCode},
+            #{item.projectName},
+            #{item.costtype},
+            #{item.auditcost},
+            #{item.acceptancecost},
+            #{item.custname},
+            #{item.ts}
+        )
+        </foreach>
+    </select>
+
+</mapper>
+

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java

@@ -8,6 +8,9 @@ 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.entity.MdmGmSubjectBalanceEntity;
 import com.hzya.frame.voucher.ae.comf.bd.dao.*;
@@ -414,6 +417,46 @@ public class BdController extends DefaultController {
         }
     }
 
+    @Autowired
+    private OA_plugin_acceptance_income_declaration oaPluginAcceptanceIncomeDeclaration;
+    @RequestMapping(value = "/acceptance_income_declaration", method = RequestMethod.POST)
+    public JsonResultEntity acceptance_income_declaration (String start,String end) {
+        try {
+            oaPluginAcceptanceIncomeDeclaration.start(start,end);
+            return getSuccessMessageEntity("请求成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+    @Autowired
+    private OA_plugin_audit_declaration_form oaPluginAuditDeclarationForm;
+    @RequestMapping(value = "/audit_declaration_form", method = RequestMethod.POST)
+    public JsonResultEntity audit_declaration_form (String start,String end) {
+        try {
+            oaPluginAuditDeclarationForm.start(start,end);
+            return getSuccessMessageEntity("请求成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+
+    @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());
+        }
+    }
+
 
 //    /**
 //     *

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/BdCashflowVO.java

@@ -0,0 +1,24 @@
+package com.hzya.frame.voucher.ae.comf.bd.entity.vo;
+
+import com.hzya.frame.web.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * Created by zydd on 2025-08-24 15:16
+ */
+@Data
+public class BdCashflowVO extends BaseEntity {
+    private String pk_cashflow;
+    private String cfitemcode;
+    private String cfitemname;
+    private String cftype;
+    private String fathernode;
+    private String defaultdir;
+    private String isadjustable;
+    private String isseal;
+    private String itemflag;
+    private String pk_corp;
+    private String sealflag;
+    private String dr;
+    private String ts;
+}

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java

@@ -19,6 +19,7 @@ import com.hzya.frame.sysnew.person.dao.ISysPersonDao;
 import com.hzya.frame.sysnew.person.entity.SysPersonEntity;
 import com.hzya.frame.sysnew.user.dao.ISysUserDao;
 import com.hzya.frame.sysnew.user.entity.SysUserEntity;
+import com.hzya.frame.voucher.ae.comf.bd.entity.vo.*;
 import com.hzya.frame.voucher.ae.generate.core.vo.*;
 import com.hzya.frame.voucher.utils.Attribute;
 import com.hzya.frame.voucher.utils.PushU8CUtil;
@@ -27,11 +28,6 @@ import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao;
 import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO;
 import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO;
 import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity;
-import com.hzya.frame.voucher.ae.comf.bd.entity.vo.BdCurrtypeVO;
-import com.hzya.frame.voucher.ae.comf.bd.entity.vo.BdVoucherTypeVO;
-import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO;
-import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO;
-import com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO;
 import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorCorrelationDao;
 import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorDao;
 import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorCorrelationEntity;
@@ -556,7 +552,6 @@ public class ICoreServiceImpl implements ICoreService {
 
                                 if(b_jYb.compareTo(new BigDecimal(0))==0&&b_jBb.compareTo(new BigDecimal(0))==0&&b_dYb.compareTo(new BigDecimal(0))==0&&b_dBb.compareTo(new BigDecimal(0))==0){
                                     continue;
-
                                 }
                                 if ("0".equals(detail_jYb) && "0".equals(detail_jBb) && "0".equals(detail_dYb) && "0".equals(detail_dBb)) {
                                     continue;
@@ -597,6 +592,9 @@ public class ICoreServiceImpl implements ICoreService {
                                         String key = assByBdCodeEntry.getKey();
                                         String value = assByBdCodeEntry.getValue();
                                         AeConfVoucherTemplateAssistEntity templateAssistEntity = AssByMdmId.get(key);//去单据辅助核算
+                                        if(templateAssistEntity==null){
+                                            Assert.state(false,"辅助核算取表失败，分录模板id：{}，辅助核算id：{}，辅助核算名称：{}",templateId,key,value);
+                                        }
 
                                         //辅助核算取值
                                         Map<String, String> assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO);
@@ -616,18 +614,43 @@ public class ICoreServiceImpl implements ICoreService {
                                             }
                                             assList.add(assEntity);
                                         }
-
-
                                     }
                                     if (assList.size() != 0) {
                                         detail.setAss(assList);
                                     }
-
-
                                 }
+
+                                //现金流量映射
+                                String cashflowStr = template.getPkCashflow();
+                                if(cashflowStr!=null&&!"".equals(cashflowStr)){
+                                    List<VoucherData.Voucher.Detail.Cashflow> cashflows = new ArrayList<>();
+                                    VoucherData.Voucher.Detail.Cashflow cashflow = new VoucherData.Voucher.Detail.Cashflow();
+                                    cashflows.add(cashflow);
+                                    BdCashflowVO bdCashflowVO = formulaTransCashflow(cashflowStr);
+                                    System.out.println(bdCashflowVO);
+
+
+                                    System.out.println(b_jYb);
+                                    System.out.println(b_jBb);
+                                    System.out.println(b_dYb);
+                                    System.out.println(b_dBb);
+                                    if(b_jYb.compareTo(new BigDecimal(0))!=0){
+                                        cashflow.setMoney(detail_jYb);
+                                    }else if(b_jBb.compareTo(new BigDecimal(0))!=0){
+                                        cashflow.setMoney(detail_jBb);
+                                    }else if(b_dYb.compareTo(new BigDecimal(0))!=0){
+                                        cashflow.setMoney(detail_dYb);
+                                    }else if(b_dBb.compareTo(new BigDecimal(0))!=0){
+                                        cashflow.setMoney(detail_dBb);
+                                    }
+
+                                    cashflow.setPk_currtype(detail.getPk_currtype());
+                                    cashflow.setPk_cashflow(bdCashflowVO.getCfitemcode());
+
+                                    detail.setCashflow(cashflows);
+                                }
+
                                 details.add(detail);
-
-
                             }
 
                         }
@@ -636,7 +659,6 @@ public class ICoreServiceImpl implements ICoreService {
                         //分录生成失败
                         Assert.state(false, "分录生成失败，失败原因：{}", e.getMessage());
                     }
-
                 }
                 if(details.size()==0){
                     return;
@@ -953,6 +975,45 @@ public class ICoreServiceImpl implements ICoreService {
         }
     }
 
+    /**
+     * 现金流量映射
+     * @param cashflowStr
+     */
+    private BdCashflowVO formulaTransCashflow(String cashflowStr) {
+        String[] parts = cashflowStr.split("\\+");
+        if (parts.length > 1) {
+            Assert.state(false, "现金流量映射转换失败！,请检查现金流量映射公式。");
+        }
+        String fieldPath = cashflowStr.substring(3); // 去除 @@$
+        String[] split = fieldPath.split("=");
+        String remark = split[0].substring(0, split[0].length() - 3);//表名
+
+        MdmModuleDbEntity mdmModuleDbEntity = queryDb(remark);
+        if (mdmModuleDbEntity == null) {
+            Assert.state(false, "根据remark：{}，查询数据表失败", remark);
+        }
+
+        //查值
+        MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO();
+        mdmDBQueryVO.setTablename(mdmModuleDbEntity.getDbName());
+        mdmDBQueryVO.setProp1("id");
+        mdmDBQueryVO.setPropValue1(split[1]);
+        List<Map<String, Object>> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO);
+        if (objectList == null || objectList.size() == 0) {
+            Assert.state(false, "根据id：{}，查询现金流量失败", split[1]);
+        }
+        Map<String, Object> stringObjectMap = objectList.get(0);
+        BdCashflowVO bdCashflowVO = new BdCashflowVO();
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            bdCashflowVO = objectMapper.convertValue(stringObjectMap, BdCashflowVO.class);
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.state(false, "现金流量转换失败，失败原因：{}。", e.getMessage());
+        }
+        return bdCashflowVO;
+    }
 
 
     /**
@@ -1687,6 +1748,9 @@ public class ICoreServiceImpl implements ICoreService {
                             String value = (String) dataMap.get(field);
                             // 使用 NumberFormat 解析，自动处理千分位逗号和小数点
                             NumberFormat format = NumberFormat.getInstance(Locale.US);
+                            if(value==null||"".equals(value)){
+                                return bigDecimal;
+                            }
                             Number number = format.parse(value);
                             BigDecimal amount = new BigDecimal(number.toString());
                             bigDecimal = bigDecimal.add(amount);

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java

@@ -371,17 +371,17 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
         mdmDBQueryVO.setBillstatus(vo.getBillStatus());
         PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize());
         List<Map<String, Object>> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO);
-//        for (Map<String, Object> map : maps) {
+        for (Map<String, Object> map : maps) {
-//            String billstatus = map.get("billStatus").toString();
+            Object billstatus = map.get("billstatus");
-//            if("N".equals(billstatus)){
+            Object billStatus = map.get("billStatus");
-//                map.put("billStatus",null);
+            if(billstatus==null&&billStatus!=null){
-//                map.put("billstatus",null);
+                map.put("billstatus",billStatus.toString());
-//            }
+            }
-//            if("Y".equals(billstatus)){
+            if(billstatus!=null&&billStatus==null){
-//                map.put("billStatus","Y");
+                map.put("billStatus",billstatus.toString());
-//                map.put("billstatus","Y");
+            }
-//            }
+
-//        }
+        }
         PageInfo pageInfo = new PageInfo(maps);
         return pageInfo;
 

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可省略此配置

base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans default-autowire="byName">
     <bean name="mdmGmSubjectBalanceDao" class="com.hzya.frame.plugin.gm.dao.impl.MdmGmSubjectBalanceDaoImpl"/>
+
+
+    <bean name="gmoaAcceptanceIncomeDeclarationDao" class="com.hzya.frame.plugin.gm.dao.impl.GmoaAcceptanceIncomeDeclarationDaoImpl"/>
+    <bean name="gmoaAuditDeclarationFormDao" class="com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl"/>
+    <bean name="gmoaCostAdjustmentAuditDao" class="com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl"/>
 </beans>

base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans default-autowire="byName">
     <bean name="subjectAssBalancePlugin" class="com.hzya.frame.plugin.gm.SubjectAssBalancePlugin"/>
+
+    <!--验收收入申报单-->
+    <bean name="oa_plugin_acceptance_income_declaration" class="com.hzya.frame.plugin.gm.OA_plugin_acceptance_income_declaration"/>
+    <!--验收收入申报单-->
+    <bean name="oa_plugin_audit_declaration_form" class="com.hzya.frame.plugin.gm.OA_plugin_audit_declaration_form"/>
+    <!--成本调整单-->
+    <bean name="oa_plugin_cost_adjustment_audit" class="com.hzya.frame.plugin.gm.OA_plugin_cost_adjustment_audit"/>
 </beans>

pom.xml

@@ -335,10 +335,27 @@
     <build>
         <plugins>
             <!-- 添加flatten-maven-plugin：解决${revision}变量解析问题 -->
+<!--            <plugin>-->
+<!--                <groupId>org.codehaus.mojo</groupId>-->
+<!--                <artifactId>flatten-maven-plugin</artifactId>-->
+<!--                <version>1.2.7</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>flatten</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>flatten</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <flattenMode>resolveCiFriendliesOnly</flattenMode> &lt;!&ndash; 替换${revision}为实际版本 &ndash;&gt;-->
+<!--                </configuration>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.2.7</version>
+                <version>1.4.1</version> <!-- 建议指定插件版本 -->
                 <executions>
                     <execution>
                         <id>flatten</id>
@@ -346,13 +363,15 @@
                         <goals>
                             <goal>flatten</goal>
                         </goals>
+<!--                        <configuration>-->
+<!--                            <skip>true</skip> &lt;!&ndash; skip放在execution的configuration中 &ndash;&gt;-->
+<!--                        </configuration>-->
                     </execution>
                 </executions>
-                <configuration>
-                    <flattenMode>resolveCiFriendliesOnly</flattenMode> <!-- 替换${revision}为实际版本 -->
-                </configuration>
             </plugin>
 
+
+
             <!-- 资源文件拷贝插件 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>