فهرست منبع

同步-同步合同段
1、添加表单同步记录,记录同步时间

LHB 1 روز پیش
والد
کامیت
e8dc38136c

+ 55 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContractExtend.java

@@ -0,0 +1,55 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 合同段-扩展表
+ * @TableName m_wbs_tree_contract_extend
+ */
+@TableName(value ="m_wbs_tree_contract_extend")
+@Data
+public class WbsTreeContractExtend {
+    /**
+     * 
+     */
+    @TableId
+    private Long pKeyId;
+
+    /**
+     *  是否为同步数据(1-是,0-不是)
+     */
+    private Integer isSync;
+
+    /**
+     *  创建时间
+     */
+    private Date syncTime;
+
+    /**
+     *  是否删除(0-正常,1-已删除)
+     */
+    private Integer isDeleted;
+
+    /**
+     *  创建时间
+     */
+    private Date createTime;
+
+    /**
+     *  创建人
+     */
+    private Long createUser;
+
+    /**
+     *  修改时间
+     */
+    private Date updateTime;
+
+    /**
+     *  修改人
+     */
+    private Long updateUser;
+}

+ 18 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractExtendMapper.java

@@ -0,0 +1,18 @@
+package org.springblade.manager.mapper;
+
+import org.springblade.manager.entity.WbsTreeContractExtend;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author LHB
+* @description 针对表【m_wbs_tree_contract_extend(合同段-扩展表)】的数据库操作Mapper
+* @createDate 2025-08-13 14:50:18
+* @Entity generator.domain.MWbsTreeContractExtend
+*/
+public interface WbsTreeContractExtendMapper extends BaseMapper<WbsTreeContractExtend> {
+
+}
+
+
+
+

+ 22 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractExtendMapper.xml

@@ -0,0 +1,22 @@
+<?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="org.springblade.manager.mapper.WbsTreeContractExtendMapper">
+
+    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.WbsTreeContractExtend">
+            <id property="pKeyId" column="p_key_id" />
+            <result property="isSync" column="is_sync" />
+            <result property="syncTime" column="sync_time" />
+            <result property="isDeleted" column="is_deleted" />
+            <result property="createTime" column="create_time" />
+            <result property="createUser" column="create_user" />
+            <result property="updateTime" column="update_time" />
+            <result property="updateUser" column="update_user" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        p_key_id,is_sync,sync_time,is_deleted,create_time,create_user,
+        update_time,update_user
+    </sql>
+</mapper>

+ 13 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/WbsTreeContractExtendService.java

@@ -0,0 +1,13 @@
+package org.springblade.manager.service;
+
+import org.springblade.manager.entity.WbsTreeContractExtend;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author LHB
+* @description 针对表【m_wbs_tree_contract_extend(合同段-扩展表)】的数据库操作Service
+* @createDate 2025-08-13 14:50:18
+*/
+public interface WbsTreeContractExtendService extends IService<WbsTreeContractExtend> {
+
+}

+ 29 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousEViSaServiceImpl.java

@@ -16,12 +16,14 @@ import org.springblade.manager.mapper.TextdictInfoMapper;
 import org.springblade.manager.mapper.WbsTreeContractMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.mapper.WbsTreeSynchronousRecordMapper;
+import org.springblade.manager.service.WbsTreeContractExtendService;
 import org.springblade.manager.service.WbsTreeContractOldHtmlService;
 import org.springblade.manager.utils.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -57,6 +59,9 @@ public class WbsSynchronousEViSaServiceImpl {
     @Autowired
     private ExcelTabClient excelTabClient;
 
+    @Resource
+    private WbsTreeContractExtendService wbsTreeContractExtendService;
+
     @Transactional(rollbackFor = Exception.class)
     public void updateTextDictInfo(Long projectId, List<Long> editPrivateIds, List<TextdictInfo> addData) {
         //删除 需要新增的节点的电签和默认值
@@ -196,14 +201,24 @@ public class WbsSynchronousEViSaServiceImpl {
                 wbsTreeContractMapper.updateSortByPId(pId, wbsTreePrivate.getSort());
             }
         }
+        //添加合同段同步记录
+        List<WbsTreeContractExtend> wbsTreeContractExtends = new ArrayList<>();
 
         for (WbsTreeContract treeContract : list) {
             treeContract.setUpdateTime(DateTime.now());
             treeContract.setUpdateUser(createUserId);
-//            wbsTreeContractMapper.updateById(treeContract);
+
+            WbsTreeContractExtend wbsTreeContractExtend = new WbsTreeContractExtend();
+            wbsTreeContractExtend.setPKeyId(treeContract.getPKeyId());
+            wbsTreeContractExtend.setIsSync(1);
+            wbsTreeContractExtend.setSyncTime(DateTime.now());
+            wbsTreeContractExtends.add(wbsTreeContractExtend);
         }
         wbsTreeContractService.updateBatchById(list);
 
+        //添加合同段同步记录
+        wbsTreeContractExtendService.saveOrUpdateBatch(wbsTreeContractExtends);
+
         //排序调整
         if (type.contains("7")) {
             //获取节点下的当前表单
@@ -315,6 +330,19 @@ public class WbsSynchronousEViSaServiceImpl {
                 wbsTreeContractMapper.updateSortByPId(pId, wbsTreePrivate.getSort());
             }
         }
+        //添加合同段同步记录
+        List<Long> collect1 = list.stream().map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
+        List<WbsTreeContractExtend> wbsTreeContractExtends = new ArrayList<>();
+        for (Long pKeyId : collect1) {
+            WbsTreeContractExtend wbsTreeContractExtend = new WbsTreeContractExtend();
+            wbsTreeContractExtend.setPKeyId(pKeyId);
+            wbsTreeContractExtend.setIsSync(1);
+            wbsTreeContractExtend.setSyncTime(DateTime.now());
+            wbsTreeContractExtends.add(wbsTreeContractExtend);
+        }
+        wbsTreeContractExtendService.saveOrUpdateBatch(wbsTreeContractExtends);
+
+
 
         //单个批次一个事务,只会回滚当前批次数据
         Integer i = wbsTreeContractMapper.insertBatchSomeColumn(list);

+ 22 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractExtendServiceImpl.java

@@ -0,0 +1,22 @@
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.manager.entity.WbsTreeContractExtend;
+import org.springblade.manager.service.WbsTreeContractExtendService;
+import org.springblade.manager.mapper.WbsTreeContractExtendMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author LHB
+* @description 针对表【m_wbs_tree_contract_extend(合同段-扩展表)】的数据库操作Service实现
+* @createDate 2025-08-13 14:50:18
+*/
+@Service
+public class WbsTreeContractExtendServiceImpl extends ServiceImpl<WbsTreeContractExtendMapper, WbsTreeContractExtend>
+    implements WbsTreeContractExtendService {
+
+}
+
+
+
+