1、新增项目管理档案插件。

2、优化凭证生成逻辑。

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

@@ -111,6 +111,8 @@ public class OA_plugin_acceptance_income_declaration extends PluginBaseEntity {
 
 
     public void start(){
+        OA_LIST_SAVE.clear();
+        OA_LIST_UPDATE.clear();
         // 获取当前日期和时间,时间偏移10分钟
         LocalDateTime now = LocalDateTime.now();
         String end = now.format(formatter);

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

@@ -105,6 +105,9 @@ public class OA_plugin_audit_declaration_form extends PluginBaseEntity {
 
 
     public void start() {
+
+        OA_LIST_SAVE.clear();
+        OA_LIST_UPDATE.clear();
         try {
 
             // 获取当前日期和时间,时间偏移10分钟

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

@@ -105,6 +105,8 @@ public class OA_plugin_contract_payment_receipt extends PluginBaseEntity {
 
 
     public void start() {
+        OA_LIST_SAVE.clear();
+        OA_LIST_UPDATE.clear();
         try {
 
             // 获取当前日期和时间,时间偏移10分钟

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

@@ -106,6 +106,8 @@ public class OA_plugin_cost_adjustment_audit extends PluginBaseEntity {
 
 
     public void start() {
+        OA_LIST_SAVE.clear();
+        OA_LIST_UPDATE.clear();
         try {
 
             // 获取当前日期和时间,时间偏移10分钟

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

@@ -0,0 +1,12 @@
+//package com.hzya.frame.plugin.gm;
+//
+//import com.hzya.frame.base.PluginBaseEntity;
+//
+///**
+// * Created by zydd on 2025-09-06 16:58
+// */
+//public class OA_plugin_transfer_declaration_form extends PluginBaseEntity {
+//
+//
+//
+//}

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

@@ -101,7 +101,13 @@ public class SubjectAssBalancePlugin extends PluginBaseEntity {
     @Autowired
     private IMdmGmSubjectBalanceDao mdmGmSubjectBalanceDao;
 
+    public static void main(String[] args) {
+        LocalDate now = LocalDate.now();
+        LocalTime time = LocalTime.now();
+        String year = now.toString().substring(0, 4);
+        System.out.println(year);
 
+    }
     /**
      * 科目：
      * 54010501
@@ -120,8 +126,11 @@ public class SubjectAssBalancePlugin extends PluginBaseEntity {
         try {
             logger.info("调用：" + getPluginName() + "-插件");
 
+            String year = now.toString().substring(0, 4);
+
             MdmGmSubjectBalanceEntity mdmGmSubjectBalanceEntity = new MdmGmSubjectBalanceEntity();
             mdmGmSubjectBalanceEntity.setPkCorp("1001");
+            mdmGmSubjectBalanceEntity.setYearv(year);
             mdmGmSubjectBalanceEntity.setSubjcodes(subjCodes);
             List<MdmGmSubjectBalanceEntity> mdmGmSubjectBalanceEntities = mdmGmSubjectBalanceDao.queryBalanceBySubjectCodesAndPkCorp(mdmGmSubjectBalanceEntity);
             if (mdmGmSubjectBalanceEntities != null && mdmGmSubjectBalanceEntities.size() != 0) {

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

@@ -0,0 +1,213 @@
+package com.hzya.frame.plugin.gm;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.dao.IGmoaCostAdjustmentAuditDao;
+import com.hzya.frame.plugin.gm.dao.IMdmBfJobmngfilDao;
+import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity;
+import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity;
+import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
+import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Created by zydd on 2025-09-05 13:53
+ * 1、抓取U8C数据数据。
+ * 2、同步中台
+ */
+public class U8C_plugin_bd_jobmngfil extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(U8C_plugin_bd_jobmngfil.class);
+    private static final ReentrantLock LOCK = new ReentrantLock(true);
+    // 创建格式化器
+    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    List<MdmBfJobmngfilEntity> U8C_LIST_SAVE = new ArrayList<>();
+    List<MdmBfJobmngfilEntity> U8C_LIST_UPDATE = new ArrayList<>();
+
+
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "执行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "执行销毁方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "gm.U8C_plugin_bd_jobmngfil";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "广脉：U8C项目管理档案同步";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "广脉：U8C项目管理档案同步";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        try {
+            logger.info("调用：" + getPluginName() + "-插件");
+            String prod = "prod";
+            String param = String.valueOf(requestJson.get("param"));
+            if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) {
+                //按日期
+                if (param != null && !"".equals(param)) {
+                    String[] split = param.split("/");
+                    if (!(split.length == 2)) {
+                        Assert.state(false, "时间格式传递不正确");
+                    }
+                    Assert.notNull(split[0], "开始时间不能为空");
+                    Assert.notNull(split[1], "结束时间不能为空");
+                    start(split[0], split[1]);
+                }
+            } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) {
+                //默认
+                start();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("executeBusiness方法抛出异常", e);
+        }
+        return BaseResult.getSuccessMessageEntity("插件执行成功");
+    }
+
+    @Autowired
+    private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao;
+    @Autowired
+    private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil;
+    @Autowired
+    private IMdmBfJobmngfilDao mdmBfJobmngfilDao;
+
+
+    public void start() {
+        U8C_LIST_SAVE.clear();
+        U8C_LIST_UPDATE.clear();
+        try {
+
+            // 获取当前日期和时间,时间偏移6分钟
+            LocalDateTime now = LocalDateTime.now();
+            String end = now.format(formatter);
+            String start = now.minusMinutes(6L).format(formatter);
+            logger.info("自动同步==> U8C项目管理档案同步 时间区间：[{}]-[{}]", start, end);
+
+            //查询数据
+            List<MdmBfJobmngfilEntity> allOAList = queryData(start, end);
+
+            //过滤，生成凭证的报错
+            filterData(allOAList);
+            //保存
+            saveData(U8C_LIST_SAVE);
+            //更新
+            updateData(U8C_LIST_UPDATE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+    public void start(String startTime, String endTime) {
+        U8C_LIST_SAVE.clear();
+        U8C_LIST_UPDATE.clear();
+        startTime += " 00:00:00";
+        endTime += " 23:59:59";
+        try {
+            //查询数据
+            List<MdmBfJobmngfilEntity> allU8CList = queryData(startTime, endTime);
+
+            //过滤
+            filterData(allU8CList);
+            //保存
+            saveData(U8C_LIST_SAVE);
+            //更新
+            updateData(U8C_LIST_UPDATE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void updateData(List<MdmBfJobmngfilEntity> u8CListUpdate) {
+        List<MdmBfJobmngfilEntity> list = new ArrayList<>();
+        for (MdmBfJobmngfilEntity mdmBfJobmngfilEntity : u8CListUpdate) {
+            String pkJobmngfil = mdmBfJobmngfilEntity.getPkJobmngfil();
+
+            MdmBfJobmngfilEntity mdmBfJobmngfil = new MdmBfJobmngfilEntity();
+            mdmBfJobmngfil.setPkJobmngfil(pkJobmngfil);
+            mdmBfJobmngfilDao.delete("com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl.entity_delete",mdmBfJobmngfil);
+            list.add(mdmBfJobmngfilEntity);
+        }
+        saveData(list);
+    }
+
+    private void saveData(List<MdmBfJobmngfilEntity> u8CListSave) {
+        u8CListSave.forEach(index -> {
+            index.setSts("Y");
+            index.setDataStatus("Y");
+            index.setId(index.getPkJobmngfil());
+        });
+        List<List<MdmBfJobmngfilEntity>> partition = Lists.partition(u8CListSave, 500);
+        for (List<MdmBfJobmngfilEntity> mdmBfJobmngfilEntities : partition) {
+            mdmBfJobmngfilDao.saveList(mdmBfJobmngfilEntities);
+        }
+
+    }
+
+    /**
+     * pkJobmngfil 主键唯一
+     * 新增的保存，存在的修改
+     *
+     * @param allOAList
+     */
+    private void filterData(List<MdmBfJobmngfilEntity> allOAList) {
+        for (MdmBfJobmngfilEntity mdmBfJobmngfilEntity : allOAList) {
+            String pkJobmngfil = mdmBfJobmngfilEntity.getPkJobmngfil();
+            MdmBfJobmngfilEntity mdmBfJobmngfil = new MdmBfJobmngfilEntity();
+            mdmBfJobmngfil.setPkJobmngfil(pkJobmngfil);
+            List<MdmBfJobmngfilEntity> query = mdmBfJobmngfilDao.query(mdmBfJobmngfil);
+            if (query.size() == 0) {
+                U8C_LIST_SAVE.add(mdmBfJobmngfilEntity);
+            } else {
+                U8C_LIST_UPDATE.add(mdmBfJobmngfilEntity);
+            }
+        }
+    }
+
+
+    private List<MdmBfJobmngfilEntity> queryData(String start, String end) {
+        MdmBfJobmngfilEntity entity = new MdmBfJobmngfilEntity();
+        entity.setStartTime(start);
+        entity.setEndTime(end);
+        List<MdmBfJobmngfilEntity> list = mdmBfJobmngfilDao.queryU8CAll(entity);
+        return list;
+    }
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.hzya.frame.plugin.gm.dao;
+
+import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+
+/**
+ * 基础档案：项目管理档案(mdm_bf_jobmngfil: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-09-05 17:10:41
+ */
+public interface IMdmBfJobmngfilDao extends IBaseDao<MdmBfJobmngfilEntity, String> {
+
+    List<MdmBfJobmngfilEntity> queryU8CAll(MdmBfJobmngfilEntity entity);
+
+    void saveList(List<MdmBfJobmngfilEntity> list);
+}
+

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

@@ -0,0 +1,36 @@
+package com.hzya.frame.plugin.gm.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
+import com.hzya.frame.plugin.gm.entity.GmoaCostAdjustmentAuditEntity;
+import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity;
+import com.hzya.frame.plugin.gm.dao.IMdmBfJobmngfilDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 基础档案：项目管理档案(MdmBfJobmngfil)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-09-05 17:10:41
+ */
+public class MdmBfJobmngfilDaoImpl extends MybatisGenericDao<MdmBfJobmngfilEntity, String> implements IMdmBfJobmngfilDao {
+
+
+    @DS(ProfilesActiveConstant.GM_U8C_DATE_SOURCE)
+    @Override
+    public List<MdmBfJobmngfilEntity> queryU8CAll(MdmBfJobmngfilEntity entity) {
+        List<MdmBfJobmngfilEntity> all = (List<MdmBfJobmngfilEntity>)
+                selectList("com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl.queryU8CAll", entity);
+        return all;
+    }
+
+
+    @Override
+    public void saveList(List<MdmBfJobmngfilEntity> list) {
+        insert("com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl.saveList", list);
+    }
+}
+

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

@@ -753,40 +753,49 @@
                servicecost       as servicecost,
                materialcost      as materialcost,
                GREATEST(
-                       COALESCE(aCreateTime, '1970-01-01 00:00:00'),
-                       COALESCE(aUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(cUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(dUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(eUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(fUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(gUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(hUpdateTime, '1970-01-01 00:00:00'),
-                       COALESCE(iUpdateTime, '1970-01-01 00:00:00')
+                       COALESCE(aCreateTime,'1970-01-01 00:00:00'),
+                       COALESCE(bCreateTime,'1970-01-01 00:00:00'),
+                       COALESCE(cCreateTime,'1970-01-01 00:00:00'),
+                       COALESCE(aUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(bUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(cUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(dUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(eUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(fUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(gUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(hUpdateTime,'1970-01-01 00:00:00'),
+                       COALESCE(iUpdateTime,'1970-01-01 00:00:00')
                    )             AS ts
         from u8c_acceptance_income_declaration
         where
             GREATEST(
-                    COALESCE(aCreateTime, '1970-01-01 00:00:00'),
-                    COALESCE(aUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(cUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(dUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(eUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(fUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(gUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(hUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(iUpdateTime, '1970-01-01 00:00:00')
+                    COALESCE(aCreateTime,'1970-01-01 00:00:00'),
+                    COALESCE(bCreateTime,'1970-01-01 00:00:00'),
+                    COALESCE(cCreateTime,'1970-01-01 00:00:00'),
+                    COALESCE(aUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(bUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(cUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(dUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(eUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(fUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(gUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(hUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(iUpdateTime,'1970-01-01 00:00:00')
                 )>=#{startTime}
         and
             GREATEST(
-                    COALESCE(aCreateTime, '1970-01-01 00:00:00'),
-                    COALESCE(aUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(cUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(dUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(eUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(fUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(gUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(hUpdateTime, '1970-01-01 00:00:00'),
-                    COALESCE(iUpdateTime, '1970-01-01 00:00:00')
+                    COALESCE(aCreateTime,'1970-01-01 00:00:00'),
+                    COALESCE(bCreateTime,'1970-01-01 00:00:00'),
+                    COALESCE(cCreateTime,'1970-01-01 00:00:00'),
+                    COALESCE(aUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(bUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(cUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(dUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(eUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(fUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(gUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(hUpdateTime,'1970-01-01 00:00:00'),
+                    COALESCE(iUpdateTime,'1970-01-01 00:00:00')
                 )<=#{endTime}
     </select>
 

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

@@ -1027,7 +1027,7 @@
 
 
     <insert id="saveList" parameterType="java.util.List">
-        INSERT INTO gmoa_acceptance_income_declaration (
+        INSERT INTO gmoa_audit_declaration_form (
         id,
         data_status,
         create_time,

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

@@ -281,5 +281,15 @@ public class GmoaContractPaymentReceiptEntity extends BaseEntity {
         this.skrhm = skrhm;
     }
 
+
+    private String xmxztzftz;
+
+    public String getXmxztzftz() {
+        return xmxztzftz;
+    }
+
+    public void setXmxztzftz(String xmxztzftz) {
+        this.xmxztzftz = xmxztzftz;
+    }
 }
 

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

@@ -37,6 +37,7 @@
         <result property="khyh" column="khyh" jdbcType="VARCHAR"/>
         <result property="yhzh" column="yhzh" jdbcType="VARCHAR"/>
         <result property="skrhm" column="skrhm" jdbcType="VARCHAR"/>
+        <result property="xmxztzftz" column="xmxztzftz" jdbcType="VARCHAR"/>
     </resultMap>
     <!-- 查询的字段-->
     <sql id="GmoaContractPaymentReceiptEntity_Base_Column_List">
@@ -73,6 +74,7 @@
         ,khyh 
         ,yhzh 
         ,skrhm
+        ,xmxztzftz
     </sql>
     <!-- 查询 采用==查询 -->
     <select id="entity_list_base" resultMap="get-GmoaContractPaymentReceiptEntity-result"
@@ -114,6 +116,7 @@
             <if test="khyh != null and khyh != ''">and khyh = #{khyh}</if>
             <if test="yhzh != null and yhzh != ''">and yhzh = #{yhzh}</if>
             <if test="skrhm != null and skrhm != ''">and skrhm = #{skrhm}</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">and xmxztzftz = #{xmxztzftz}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -158,6 +161,7 @@
             <if test="khyh != null and khyh != ''">and khyh = #{khyh}</if>
             <if test="yhzh != null and yhzh != ''">and yhzh = #{yhzh}</if>
             <if test="skrhm != null and skrhm != ''">and skrhm = #{skrhm}</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">and xmxztzftz = #{xmxztzftz}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -226,6 +230,7 @@
             <if test="khyh != null and khyh != ''">and khyh like concat('%',#{khyh},'%')</if>
             <if test="yhzh != null and yhzh != ''">and yhzh like concat('%',#{yhzh},'%')</if>
             <if test="skrhm != null and skrhm != ''">and skrhm like concat('%',#{skrhm},'%')</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">and xmxztzftz like concat('%',#{xmxztzftz},'%')</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -272,6 +277,7 @@
             <if test="khyh != null and khyh != ''">or khyh = #{khyh}</if>
             <if test="yhzh != null and yhzh != ''">or yhzh = #{yhzh}</if>
             <if test="skrhm != null and skrhm != ''">or skrhm = #{skrhm}</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">or xmxztzftz = #{xmxztzftz}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
@@ -316,6 +322,7 @@
             <if test="khyh != null and khyh != ''">khyh ,</if>
             <if test="yhzh != null and yhzh != ''">yhzh ,</if>
             <if test="skrhm != null and skrhm != ''">skrhm ,</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">xmxztzftz ,</if>
             <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
@@ -354,6 +361,7 @@
             <if test="khyh != null and khyh != ''">#{khyh} ,</if>
             <if test="yhzh != null and yhzh != ''">#{yhzh} ,</if>
             <if test="skrhm != null and skrhm != ''">#{skrhm} ,</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">#{xmxztzftz} ,</if>
             <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from gmoa_contract_payment_receipt
                 a WHERE a.sts = 'Y' ),
             </if>
@@ -451,6 +459,7 @@
             <if test="khyh != null and khyh != ''">khyh = #{khyh},</if>
             <if test="yhzh != null and yhzh != ''">yhzh = #{yhzh},</if>
             <if test="skrhm != null and skrhm != ''">skrhm = #{skrhm},</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">xmxztzftz = #{xmxztzftz},</if>
         </trim>
         where id = #{id}
     </update>
@@ -496,6 +505,7 @@
             <if test="khyh != null and khyh != ''">and khyh = #{khyh}</if>
             <if test="yhzh != null and yhzh != ''">and yhzh = #{yhzh}</if>
             <if test="skrhm != null and skrhm != ''">and skrhm = #{skrhm}</if>
+            <if test="xmxztzftz != null and xmxztzftz != ''">and xmxztzftz = #{xmxztzftz}</if>
             and sts='Y'
         </trim>
     </update>
@@ -525,6 +535,7 @@
             khyh,
             yhzh,
             skrhm,
+            xmxztzftz,
             GREATEST(
                     COALESCE(aCreateTime,'1970-01-01 00:00:00'),
                     COALESCE(aUpdateTime,'1970-01-01 00:00:00'),
@@ -573,6 +584,7 @@
         khyh,
         yhzh,
         skrhm,
+        xmxztzftz,
         ts
         )values
         <foreach collection="list" item="item" separator=",">
@@ -596,6 +608,7 @@
             #{item.khyh},
             #{item.yhzh},
             #{item.skrhm},
+            #{item.xmxztzftz},
             #{item.ts}
             )
         </foreach>

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

@@ -0,0 +1,315 @@
+package com.hzya.frame.plugin.gm.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 基础档案：项目管理档案(MdmBfJobmngfil)实体类
+ *
+ * @author zydd
+ * @since 2025-09-05 17:10:41
+ */
+public class MdmBfJobmngfilEntity 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 pkJobmngfil;
+  /**  项目基本档案主键 */
+   private String pkJobbasfil;
+  /**  项目编码 */
+   private String code;
+  /**  项目名称 */
+   private String name;
+  /**  助记码 */
+   private String remcode;
+  /**  公司主键 */
+   private String pkCorp;
+  /**  封存标志 */
+   private String sealflag;
+  /**  更新时间 */
+   private Date ts;
+  /**  删除标识 */
+   private String dr;
+  /**  自定义1-业务细分 */
+   private String def1;
+  /**  自定义2 */
+   private String def2;
+  /**  自定义3-区域 */
+   private String def3;
+  /**  自定义4-业务大类 */
+   private String def4;
+  /**  自定义5 */
+   private String def5;
+  /**  自定义6 */
+   private String def6;
+  /**  自定义7 */
+   private String def7;
+  /**  自定义8 */
+   private String def8;
+  /**  自定义9 */
+   private String def9;
+  /**  自定义10 */
+   private String def10;
+
+
+    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 getPkJobmngfil() {
+        return pkJobmngfil;
+    }
+
+    public void setPkJobmngfil(String pkJobmngfil) {
+        this.pkJobmngfil = pkJobmngfil;
+    }
+
+    public String getPkJobbasfil() {
+        return pkJobbasfil;
+    }
+
+    public void setPkJobbasfil(String pkJobbasfil) {
+        this.pkJobbasfil = pkJobbasfil;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemcode() {
+        return remcode;
+    }
+
+    public void setRemcode(String remcode) {
+        this.remcode = remcode;
+    }
+
+    public String getPkCorp() {
+        return pkCorp;
+    }
+
+    public void setPkCorp(String pkCorp) {
+        this.pkCorp = pkCorp;
+    }
+
+    public String getSealflag() {
+        return sealflag;
+    }
+
+    public void setSealflag(String sealflag) {
+        this.sealflag = sealflag;
+    }
+
+    public Date getTs() {
+        return ts;
+    }
+
+    public void setTs(Date ts) {
+        this.ts = ts;
+    }
+
+    public String getDr() {
+        return dr;
+    }
+
+    public void setDr(String dr) {
+        this.dr = dr;
+    }
+
+    public String getDef1() {
+        return def1;
+    }
+
+    public void setDef1(String def1) {
+        this.def1 = def1;
+    }
+
+    public String getDef2() {
+        return def2;
+    }
+
+    public void setDef2(String def2) {
+        this.def2 = def2;
+    }
+
+    public String getDef3() {
+        return def3;
+    }
+
+    public void setDef3(String def3) {
+        this.def3 = def3;
+    }
+
+    public String getDef4() {
+        return def4;
+    }
+
+    public void setDef4(String def4) {
+        this.def4 = def4;
+    }
+
+    public String getDef5() {
+        return def5;
+    }
+
+    public void setDef5(String def5) {
+        this.def5 = def5;
+    }
+
+    public String getDef6() {
+        return def6;
+    }
+
+    public void setDef6(String def6) {
+        this.def6 = def6;
+    }
+
+    public String getDef7() {
+        return def7;
+    }
+
+    public void setDef7(String def7) {
+        this.def7 = def7;
+    }
+
+    public String getDef8() {
+        return def8;
+    }
+
+    public void setDef8(String def8) {
+        this.def8 = def8;
+    }
+
+    public String getDef9() {
+        return def9;
+    }
+
+    public void setDef9(String def9) {
+        this.def9 = def9;
+    }
+
+    public String getDef10() {
+        return def10;
+    }
+
+    public void setDef10(String def10) {
+        this.def10 = def10;
+    }
+
+    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;
+    }
+
+}
+

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

@@ -0,0 +1,624 @@
+<?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.MdmBfJobmngfilDaoImpl">
+
+    <resultMap id="get-MdmBfJobmngfilEntity-result" type="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        <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="pkJobmngfil" column="pk_jobmngfil" jdbcType="VARCHAR"/>
+        <result property="pkJobbasfil" column="pk_jobbasfil" jdbcType="VARCHAR"/>
+        <result property="code" column="code" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="remcode" column="remcode" jdbcType="VARCHAR"/>
+        <result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
+        <result property="sealflag" column="sealflag" jdbcType="VARCHAR"/>
+        <result property="ts" column="ts" jdbcType="TIMESTAMP"/>
+        <result property="dr" column="dr" jdbcType="VARCHAR"/>
+        <result property="def1" column="def1" jdbcType="VARCHAR"/>
+        <result property="def2" column="def2" jdbcType="VARCHAR"/>
+        <result property="def3" column="def3" jdbcType="VARCHAR"/>
+        <result property="def4" column="def4" jdbcType="VARCHAR"/>
+        <result property="def5" column="def5" jdbcType="VARCHAR"/>
+        <result property="def6" column="def6" jdbcType="VARCHAR"/>
+        <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
+        <result property="def9" column="def9" jdbcType="VARCHAR"/>
+        <result property="def10" column="def10" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="MdmBfJobmngfilEntity_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 
+        ,pk_jobmngfil 
+        ,pk_jobbasfil 
+        ,code 
+        ,name 
+        ,remcode 
+        ,pk_corp 
+        ,sealflag 
+        ,ts 
+        ,dr 
+        ,def1 
+        ,def2 
+        ,def3 
+        ,def4 
+        ,def5 
+        ,def6 
+        ,def7 
+        ,def8 
+        ,def9 
+        ,def10
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-MdmBfJobmngfilEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        select
+        <include refid="MdmBfJobmngfilEntity_Base_Column_List"/>
+        from mdm_bf_jobmngfil
+        <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="pkJobmngfil != null and pkJobmngfil != ''">and pk_jobmngfil = #{pkJobmngfil}</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">and pk_jobbasfil = #{pkJobbasfil}</if>
+            <if test="code != null and code != ''">and code = #{code}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="remcode != null and remcode != ''">and remcode = #{remcode}</if>
+            <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
+            <if test="sealflag != null and sealflag != ''">and sealflag = #{sealflag}</if>
+            <if test="ts != null">and ts = #{ts}</if>
+            <if test="dr != null and dr != ''">and dr = #{dr}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</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.MdmBfJobmngfilEntity">
+        select count(1) from mdm_bf_jobmngfil
+        <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="pkJobmngfil != null and pkJobmngfil != ''">and pk_jobmngfil = #{pkJobmngfil}</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">and pk_jobbasfil = #{pkJobbasfil}</if>
+            <if test="code != null and code != ''">and code = #{code}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="remcode != null and remcode != ''">and remcode = #{remcode}</if>
+            <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
+            <if test="sealflag != null and sealflag != ''">and sealflag = #{sealflag}</if>
+            <if test="ts != null">and ts = #{ts}</if>
+            <if test="dr != null and dr != ''">and dr = #{dr}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</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-MdmBfJobmngfilEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        select
+        <include refid="MdmBfJobmngfilEntity_Base_Column_List"/>
+        from mdm_bf_jobmngfil
+        <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="pkJobmngfil != null and pkJobmngfil != ''">and pk_jobmngfil like concat('%',#{pkJobmngfil},'%')
+            </if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">and pk_jobbasfil like concat('%',#{pkJobbasfil},'%')
+            </if>
+            <if test="code != null and code != ''">and code like concat('%',#{code},'%')</if>
+            <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+            <if test="remcode != null and remcode != ''">and remcode like concat('%',#{remcode},'%')</if>
+            <if test="pkCorp != null and pkCorp != ''">and pk_corp like concat('%',#{pkCorp},'%')</if>
+            <if test="sealflag != null and sealflag != ''">and sealflag like concat('%',#{sealflag},'%')</if>
+            <if test="ts != null">and ts like concat('%',#{ts},'%')</if>
+            <if test="dr != null and dr != ''">and dr like concat('%',#{dr},'%')</if>
+            <if test="def1 != null and def1 != ''">and def1 like concat('%',#{def1},'%')</if>
+            <if test="def2 != null and def2 != ''">and def2 like concat('%',#{def2},'%')</if>
+            <if test="def3 != null and def3 != ''">and def3 like concat('%',#{def3},'%')</if>
+            <if test="def4 != null and def4 != ''">and def4 like concat('%',#{def4},'%')</if>
+            <if test="def5 != null and def5 != ''">and def5 like concat('%',#{def5},'%')</if>
+            <if test="def6 != null and def6 != ''">and def6 like concat('%',#{def6},'%')</if>
+            <if test="def7 != null and def7 != ''">and def7 like concat('%',#{def7},'%')</if>
+            <if test="def8 != null and def8 != ''">and def8 like concat('%',#{def8},'%')</if>
+            <if test="def9 != null and def9 != ''">and def9 like concat('%',#{def9},'%')</if>
+            <if test="def10 != null and def10 != ''">and def10 like concat('%',#{def10},'%')</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="MdmBfJobmngfilentity_list_or" resultMap="get-MdmBfJobmngfilEntity-result"
+            parameterType="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        select
+        <include refid="MdmBfJobmngfilEntity_Base_Column_List"/>
+        from mdm_bf_jobmngfil
+        <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="pkJobmngfil != null and pkJobmngfil != ''">or pk_jobmngfil = #{pkJobmngfil}</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">or pk_jobbasfil = #{pkJobbasfil}</if>
+            <if test="code != null and code != ''">or code = #{code}</if>
+            <if test="name != null and name != ''">or name = #{name}</if>
+            <if test="remcode != null and remcode != ''">or remcode = #{remcode}</if>
+            <if test="pkCorp != null and pkCorp != ''">or pk_corp = #{pkCorp}</if>
+            <if test="sealflag != null and sealflag != ''">or sealflag = #{sealflag}</if>
+            <if test="ts != null">or ts = #{ts}</if>
+            <if test="dr != null and dr != ''">or dr = #{dr}</if>
+            <if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">or def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">or def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">or def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">or def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">or def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">or def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">or def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">or def10 = #{def10}</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.MdmBfJobmngfilEntity" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into mdm_bf_jobmngfil(
+        <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="pkJobmngfil != null and pkJobmngfil != ''">pk_jobmngfil ,</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">pk_jobbasfil ,</if>
+            <if test="code != null and code != ''">code ,</if>
+            <if test="name != null and name != ''">name ,</if>
+            <if test="remcode != null and remcode != ''">remcode ,</if>
+            <if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
+            <if test="sealflag != null and sealflag != ''">sealflag ,</if>
+            <if test="ts != null">ts ,</if>
+            <if test="dr != null and dr != ''">dr ,</if>
+            <if test="def1 != null and def1 != ''">def1 ,</if>
+            <if test="def2 != null and def2 != ''">def2 ,</if>
+            <if test="def3 != null and def3 != ''">def3 ,</if>
+            <if test="def4 != null and def4 != ''">def4 ,</if>
+            <if test="def5 != null and def5 != ''">def5 ,</if>
+            <if test="def6 != null and def6 != ''">def6 ,</if>
+            <if test="def7 != null and def7 != ''">def7 ,</if>
+            <if test="def8 != null and def8 != ''">def8 ,</if>
+            <if test="def9 != null and def9 != ''">def9 ,</if>
+            <if test="def10 != null and def10 != ''">def10 ,</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="pkJobmngfil != null and pkJobmngfil != ''">#{pkJobmngfil} ,</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">#{pkJobbasfil} ,</if>
+            <if test="code != null and code != ''">#{code} ,</if>
+            <if test="name != null and name != ''">#{name} ,</if>
+            <if test="remcode != null and remcode != ''">#{remcode} ,</if>
+            <if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
+            <if test="sealflag != null and sealflag != ''">#{sealflag} ,</if>
+            <if test="ts != null">#{ts} ,</if>
+            <if test="dr != null and dr != ''">#{dr} ,</if>
+            <if test="def1 != null and def1 != ''">#{def1} ,</if>
+            <if test="def2 != null and def2 != ''">#{def2} ,</if>
+            <if test="def3 != null and def3 != ''">#{def3} ,</if>
+            <if test="def4 != null and def4 != ''">#{def4} ,</if>
+            <if test="def5 != null and def5 != ''">#{def5} ,</if>
+            <if test="def6 != null and def6 != ''">#{def6} ,</if>
+            <if test="def7 != null and def7 != ''">#{def7} ,</if>
+            <if test="def8 != null and def8 != ''">#{def8} ,</if>
+            <if test="def9 != null and def9 != ''">#{def9} ,</if>
+            <if test="def10 != null and def10 != ''">#{def10} ,</if>
+            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_bf_jobmngfil a WHERE
+                a.sts = 'Y' ),
+            </if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into mdm_bf_jobmngfil(document_rule, document_rule_num, data_status, add_status, update_status,
+        delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, data_id,
+        mdm_up_id, pk_jobmngfil, pk_jobbasfil, code, name, remcode, pk_corp, sealflag, ts, dr, def1, def2, def3, def4,
+        def5, def6, def7, def8, def9, def10, sts)
+        values
+        <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.pkJobmngfil},#{entity.pkJobbasfil},#{entity.code},#{entity.name},#{entity.remcode},#{entity.pkCorp},#{entity.sealflag},#{entity.ts},#{entity.dr},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into mdm_bf_jobmngfil(document_rule, document_rule_num, data_status, add_status, update_status,
+        delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, data_id,
+        mdm_up_id, pk_jobmngfil, pk_jobbasfil, code, name, remcode, pk_corp, sealflag, ts, dr, def1, def2, def3, def4,
+        def5, def6, def7, def8, def9, def10)
+        values
+        <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.pkJobmngfil},#{entity.pkJobbasfil},#{entity.code},#{entity.name},#{entity.remcode},#{entity.pkCorp},#{entity.sealflag},#{entity.ts},#{entity.dr},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10})
+        </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),
+        pk_jobmngfil = values(pk_jobmngfil),
+        pk_jobbasfil = values(pk_jobbasfil),
+        code = values(code),
+        name = values(name),
+        remcode = values(remcode),
+        pk_corp = values(pk_corp),
+        sealflag = values(sealflag),
+        ts = values(ts),
+        dr = values(dr),
+        def1 = values(def1),
+        def2 = values(def2),
+        def3 = values(def3),
+        def4 = values(def4),
+        def5 = values(def5),
+        def6 = values(def6),
+        def7 = values(def7),
+        def8 = values(def8),
+        def9 = values(def9),
+        def10 = values(def10)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        update mdm_bf_jobmngfil 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="pkJobmngfil != null and pkJobmngfil != ''">pk_jobmngfil = #{pkJobmngfil},</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">pk_jobbasfil = #{pkJobbasfil},</if>
+            <if test="code != null and code != ''">code = #{code},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="remcode != null and remcode != ''">remcode = #{remcode},</if>
+            <if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>
+            <if test="sealflag != null and sealflag != ''">sealflag = #{sealflag},</if>
+            <if test="ts != null">ts = #{ts},</if>
+            <if test="dr != null and dr != ''">dr = #{dr},</if>
+            <if test="def1 != null and def1 != ''">def1 = #{def1},</if>
+            <if test="def2 != null and def2 != ''">def2 = #{def2},</if>
+            <if test="def3 != null and def3 != ''">def3 = #{def3},</if>
+            <if test="def4 != null and def4 != ''">def4 = #{def4},</if>
+            <if test="def5 != null and def5 != ''">def5 = #{def5},</if>
+            <if test="def6 != null and def6 != ''">def6 = #{def6},</if>
+            <if test="def7 != null and def7 != ''">def7 = #{def7},</if>
+            <if test="def8 != null and def8 != ''">def8 = #{def8},</if>
+            <if test="def9 != null and def9 != ''">def9 = #{def9},</if>
+            <if test="def10 != null and def10 != ''">def10 = #{def10},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        update mdm_bf_jobmngfil
+        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.MdmBfJobmngfilEntity">
+        update mdm_bf_jobmngfil 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="pkJobmngfil != null and pkJobmngfil != ''">and pk_jobmngfil = #{pkJobmngfil}</if>
+            <if test="pkJobbasfil != null and pkJobbasfil != ''">and pk_jobbasfil = #{pkJobbasfil}</if>
+            <if test="code != null and code != ''">and code = #{code}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="remcode != null and remcode != ''">and remcode = #{remcode}</if>
+            <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
+            <if test="sealflag != null and sealflag != ''">and sealflag = #{sealflag}</if>
+            <if test="ts != null">and ts = #{ts}</if>
+            <if test="dr != null and dr != ''">and dr = #{dr}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from mdm_bf_jobmngfil
+        where
+            1=1
+        <if test="id != null and id != ''">and id = #{id}</if>
+        <if test="pkJobmngfil != null and pkJobmngfil != ''">and pk_jobmngfil = #{pkJobmngfil}</if>
+    </delete>
+
+
+    <select id="queryU8CAll" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity">
+        SELECT
+            mngfil.pk_jobmngfil,
+            mngfil.pk_jobbasfil,
+            basfil.jobcode as code,
+            basfil.jobname as name,
+            mngfil.remcode,
+            mngfil.pk_corp,
+            mngfil.sealflag,
+            mngfil.ts,
+            mngfil.dr,
+            mngfil.def1,
+            mngfil.def2,
+            mngfil.def3,
+            mngfil.def4,
+            mngfil.def5,
+            mngfil.def6,
+            mngfil.def7,
+            mngfil.def8,
+            mngfil.def9,
+            mngfil.def10
+        FROM
+            bd_jobmngfil mngfil
+            LEFT JOIN bd_jobbasfil basfil ON basfil.pk_jobbasfil=mngfil.pk_jobbasfil
+        where
+            1=1
+            and mngfil.ts &gt;= #{startTime}
+            and mngfil.ts &lt;= #{endTime}
+            and basfil.jobcode IS not null
+    </select>
+
+
+    <insert id="saveList" parameterType="java.util.List">
+        insert into mdm_bf_jobmngfil(
+        id,
+        data_status,
+        create_time,
+        sts,
+
+        pk_jobmngfil,
+        pk_jobbasfil,
+        code,
+        name,
+        remcode,
+        pk_corp,
+        sealflag,
+        ts,
+        dr,
+        def1,
+        def2,
+        def3,
+        def4,
+        def5,
+        def6,
+        def7,
+        def8,
+        def9,
+        def10
+        )values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.dataStatus},
+            now(),
+            #{item.sts},
+            #{item.pkJobmngfil},
+            #{item.pkJobbasfil},
+            #{item.code},
+            #{item.name},
+            #{item.remcode},
+            #{item.pkCorp},
+            #{item.sealflag},
+            #{item.ts},
+            #{item.dr},
+            #{item.def1},
+            #{item.def2},
+            #{item.def3},
+            #{item.def4},
+            #{item.def5},
+            #{item.def6},
+            #{item.def7},
+            #{item.def8},
+            #{item.def9},
+            #{item.def10}
+            )
+        </foreach>
+
+    </insert>
+
+
+</mapper>
+

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

@@ -77,6 +77,15 @@ public class MdmGmSubjectBalanceEntity extends BaseEntity {
    private String def10;
   /**  余额 */
    private String balance;
+   private String yearv;
+
+    public String getYearv() {
+        return yearv;
+    }
+
+    public void setYearv(String yearv) {
+        this.yearv = yearv;
+    }
 
     public String getSubjcodes() {
         return subjcodes;

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

@@ -653,11 +653,12 @@
                 INNER JOIN gl_voucher voucher ON voucher.pk_voucher = gl_detail.pk_voucher
         WHERE
             1=1
-          AND bd_accsubj.subjcode  IN (${subjcodes})
-          AND gl_detail.dr = 0
-          AND gl_detail.discardflagv  = 'N'
-          AND pk_managerv != 'N/A'
+            AND bd_accsubj.subjcode  IN (${subjcodes})
+            AND gl_detail.dr = 0
+            AND gl_detail.discardflagv  = 'N'
+            AND pk_managerv != 'N/A'
 	        AND gl_detail.pk_corp = #{pkCorp}
+	        AND gl_detail.yearv = #{yearv}
         GROUP BY
             gl_detail.pk_corp,
             bd_accsubj.subjcode,

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

@@ -467,6 +467,19 @@ public class BdController extends DefaultController {
         }
     }
 
+    @Autowired
+    private U8C_plugin_bd_jobmngfil u8CPluginBdJobmngfil;
+    @RequestMapping(value = "/u8CPluginBdJobmngfil", method = RequestMethod.POST)
+    public JsonResultEntity u8CPluginBdJobmngfil (String start,String end) {
+        try {
+            u8CPluginBdJobmngfil.start(start,end);
+            return getSuccessMessageEntity("请求成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
 
 //    /**
 //     *

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

@@ -1843,7 +1843,14 @@ public class ICoreServiceImpl implements ICoreService {
             //计算
             for (int i = 0; i <valueList.size(); i++) {
                 NumberFormat format = NumberFormat.getInstance(Locale.US);
-                Number number = format.parse(valueList.get(i));
+                System.out.println(valueList.get(i));
+                String s = null;
+                if(valueList.get(i)==null||"".equals(valueList.get(i))){
+                    s="0";
+                }else {
+                    s=valueList.get(i);
+                }
+                Number number = format.parse(s);
                 BigDecimal amount = new BigDecimal(number.toString());
                 //判断符号
                 if(i>=1){
@@ -2460,13 +2467,19 @@ public class ICoreServiceImpl implements ICoreService {
             if("gmoa_acceptance_income_declaration".equals(dbName)){
                 String one_project_type = dataValue.get(0).get("one_project_type").toString();
                 MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO();
+                mdmDBQueryVO.setPkentityorg(vouche.getPk_corp());
                 mdmDBQueryVO.setTablename("mdm_bf_defdoc_quyu");
                 mdmDBQueryVO.setProp7("docname");
                 mdmDBQueryVO.setPropValue7(one_project_type);
+//                mdmDBQueryVO.setProp8("sealflag");
+//                mdmDBQueryVO.setPropValue8("N");
                 List<Map<String, Object>> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO);
                 if(maps.size()>1){
                     Assert.state(false,"one_project_type：{}，查询mdm_bf_defdoc_quyu，根据区域查询不唯一",one_project_type);
                 }
+                if(maps.size()==0){
+                    Assert.state(false,"one_project_type：{}，查询mdm_bf_defdoc_quyu，根据区域查询为空",one_project_type);
+                }
                 String doccode = maps.get(0).get("doccode").toString();
                 code3=doccode;
             }

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

@@ -8,4 +8,8 @@
     <bean name="gmoaAuditDeclarationFormDao" class="com.hzya.frame.plugin.gm.dao.impl.GmoaAuditDeclarationFormDaoImpl"/>
     <bean name="gmoaCostAdjustmentAuditDao" class="com.hzya.frame.plugin.gm.dao.impl.GmoaCostAdjustmentAuditDaoImpl"/>
     <bean name="gmoaContractPaymentReceiptDao" class="com.hzya.frame.plugin.gm.dao.impl.GmoaContractPaymentReceiptDaoImpl"/>
+
+
+
+    <bean name="mdmBfJobmngfilDao" class="com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl"/>
 </beans>

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

@@ -11,4 +11,10 @@
     <bean name="oa_plugin_cost_adjustment_audit" class="com.hzya.frame.plugin.gm.OA_plugin_cost_adjustment_audit"/>
     <!--合同收款单-->
     <bean name="oa_plugin_contract_payment_receipt" class="com.hzya.frame.plugin.gm.OA_plugin_contract_payment_receipt"/>
+
+
+
+
+    <!--U8C-项目管理档案-->
+    <bean name="u8c_plugin_bd_jobmngfil" class="com.hzya.frame.plugin.gm.U8C_plugin_bd_jobmngfil"/>
 </beans>