Răsfoiți Sursa

质检-日志填报
1、创建按月封装实体类

LHB 1 lună în urmă
părinte
comite
81ab703225

+ 150 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ContractLogMonthPack.java

@@ -0,0 +1,150 @@
+package org.springblade.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 日志按月封装表
+ * @TableName u_contract_log_month_pack
+ */
+@TableName(value ="u_contract_log_month_pack")
+@Data
+public class ContractLogMonthPack {
+    /**
+     * 
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 合同段id
+     */
+    private Long contractId;
+
+    /**
+     * 私有WBS树p_key_id
+     */
+    private Long wbsNodeId;
+
+    /**
+     *  日志类型
+     */
+    private Integer wbsNodeType;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 上当月中最后一份文件的日期
+     */
+    private Date recordTime;
+
+    /**
+     * 合同段名称
+     */
+    private String contractName;
+
+    /**
+     *  页数
+     */
+    private Integer page;
+
+    /**
+     *  创建时间
+     */
+    private Date createTime;
+
+    /**
+     *  创建人
+     */
+    private Long createUser;
+
+    /**
+     *  修改时间
+     */
+    private Date updateTime;
+
+    /**
+     *  修改人
+     */
+    private Long updateUser;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        ContractLogMonthPack other = (ContractLogMonthPack) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getProjectId() == null ? other.getProjectId() == null : this.getProjectId().equals(other.getProjectId()))
+            && (this.getContractId() == null ? other.getContractId() == null : this.getContractId().equals(other.getContractId()))
+            && (this.getWbsNodeId() == null ? other.getWbsNodeId() == null : this.getWbsNodeId().equals(other.getWbsNodeId()))
+            && (this.getWbsNodeType() == null ? other.getWbsNodeType() == null : this.getWbsNodeType().equals(other.getWbsNodeType()))
+            && (this.getFileName() == null ? other.getFileName() == null : this.getFileName().equals(other.getFileName()))
+            && (this.getRecordTime() == null ? other.getRecordTime() == null : this.getRecordTime().equals(other.getRecordTime()))
+            && (this.getContractName() == null ? other.getContractName() == null : this.getContractName().equals(other.getContractName()))
+            && (this.getPage() == null ? other.getPage() == null : this.getPage().equals(other.getPage()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getUpdateUser() == null ? other.getUpdateUser() == null : this.getUpdateUser().equals(other.getUpdateUser()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getProjectId() == null) ? 0 : getProjectId().hashCode());
+        result = prime * result + ((getContractId() == null) ? 0 : getContractId().hashCode());
+        result = prime * result + ((getWbsNodeId() == null) ? 0 : getWbsNodeId().hashCode());
+        result = prime * result + ((getWbsNodeType() == null) ? 0 : getWbsNodeType().hashCode());
+        result = prime * result + ((getFileName() == null) ? 0 : getFileName().hashCode());
+        result = prime * result + ((getRecordTime() == null) ? 0 : getRecordTime().hashCode());
+        result = prime * result + ((getContractName() == null) ? 0 : getContractName().hashCode());
+        result = prime * result + ((getPage() == null) ? 0 : getPage().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getCreateUser() == null) ? 0 : getCreateUser().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getUpdateUser() == null) ? 0 : getUpdateUser().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", contractId=").append(contractId);
+        sb.append(", wbsNodeId=").append(wbsNodeId);
+        sb.append(", wbsNodeType=").append(wbsNodeType);
+        sb.append(", fileName=").append(fileName);
+        sb.append(", recordTime=").append(recordTime);
+        sb.append(", contractName=").append(contractName);
+        sb.append(", page=").append(page);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUser=").append(updateUser);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 14 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/ContractLogVO.java

@@ -49,6 +49,10 @@ public class ContractLogVO extends ContractLog {
     @ApiModelProperty(value = "签字人员集合")
     private List<Object> taskApproveUserNamesList;
 
+
+    @ApiModelProperty(value = "按月封装时间范围")
+    private List<StartTimeAndEndTime> startTimeAndEndTimes;
+
     public void setSelectNodeList(String primaryKeyId, String title) {
         if (this.selectNodeList == null) {
             this.selectNodeList = new ArrayList<>();
@@ -68,4 +72,14 @@ public class ContractLogVO extends ContractLog {
 
     }
 
+    /**
+     * 开始时间-结束时间
+     */
+    @Data
+    static class StartTimeAndEndTime{
+        @ApiModelProperty("开始时间")
+        private String startTime;
+        @ApiModelProperty("结束时间")
+        private String endTime;
+    }
 }

+ 13 - 0
blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractLogController.java

@@ -664,4 +664,17 @@ public class ContractLogController extends BladeController {
         return R.data(this.wbsTreeContractClient.queryCurrentContractLogList(contractId));
     }
 
+
+    /**
+     * 按月打包
+     *
+     * @param logVo 查询条件
+     * @return 结果
+     */
+    @PostMapping("/byMonthPack")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "按月打包")
+    public R<Boolean> byMonthPack(@RequestBody ContractLogVO logVo) {
+        return R.data(this.contractLogService.byMonthPack(logVo));
+    }
 }

+ 18 - 0
blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMonthPackMapper.java

@@ -0,0 +1,18 @@
+package org.springblade.business.mapper;
+
+import org.springblade.business.entity.ContractLogMonthPack;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author LHB
+* @description 针对表【u_contract_log_month_pack(日志按月封装表)】的数据库操作Mapper
+* @createDate 2025-08-20 14:35:00
+* @Entity generator.domain.UContractLogMonthPack
+*/
+public interface ContractLogMonthPackMapper extends BaseMapper<ContractLogMonthPack> {
+
+}
+
+
+
+

+ 28 - 0
blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMonthPackMapper.xml

@@ -0,0 +1,28 @@
+<?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.business.mapper.ContractLogMonthPackMapper">
+
+    <resultMap id="BaseResultMap" type="org.springblade.business.entity.ContractLogMonthPack">
+            <id property="id" column="id" />
+            <result property="projectId" column="project_id" />
+            <result property="contractId" column="contract_id" />
+            <result property="wbsNodeId" column="wbs_node_id" />
+            <result property="wbsNodeType" column="wbs_node_type" />
+            <result property="fileName" column="file_name" />
+            <result property="recordTime" column="record_time" />
+            <result property="contractName" column="contract_name" />
+            <result property="page" column="page" />
+            <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">
+        id,project_id,contract_id,wbs_node_id,wbs_node_type,file_name,
+        record_time,contract_name,page,create_time,create_user,
+        update_time,update_user
+    </sql>
+</mapper>

+ 13 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/ContractLogMonthPackService.java

@@ -0,0 +1,13 @@
+package org.springblade.business.service;
+
+import org.springblade.business.entity.ContractLogMonthPack;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author LHB
+* @description 针对表【u_contract_log_month_pack(日志按月封装表)】的数据库操作Service
+* @createDate 2025-08-20 14:35:00
+*/
+public interface ContractLogMonthPackService extends IService<ContractLogMonthPack> {
+
+}

+ 6 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/IContractLogService.java

@@ -46,4 +46,10 @@ public interface IContractLogService extends BaseService<ContractLog> {
      */
     IPage<ContractLogVO> constructionLogPage(ContractLogVO logVO);
 
+    /**
+     * 日志按月封装
+     * @param logVo
+     * @return
+     */
+    Boolean byMonthPack(ContractLogVO logVo);
 }

+ 22 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogMonthPackServiceImpl.java

@@ -0,0 +1,22 @@
+package org.springblade.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.business.entity.ContractLogMonthPack;
+import org.springblade.business.service.ContractLogMonthPackService;
+import org.springblade.business.mapper.ContractLogMonthPackMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author LHB
+* @description 针对表【u_contract_log_month_pack(日志按月封装表)】的数据库操作Service实现
+* @createDate 2025-08-20 14:35:00
+*/
+@Service
+public class ContractLogMonthPackServiceImpl extends ServiceImpl<ContractLogMonthPackMapper, ContractLogMonthPack>
+    implements ContractLogMonthPackService {
+
+}
+
+
+
+

+ 18 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogServiceImpl.java

@@ -22,9 +22,11 @@ import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.business.entity.ContractLog;
+import org.springblade.business.entity.ContractLogMonthPack;
 import org.springblade.business.entity.Task;
 import org.springblade.business.entity.TaskParallel;
 import org.springblade.business.mapper.ContractLogMapper;
+import org.springblade.business.service.ContractLogMonthPackService;
 import org.springblade.business.service.IContractLogService;
 import org.springblade.business.vo.ContractLogVO;
 import org.springblade.business.vo.FileUserVO;
@@ -55,6 +57,11 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
 
     @Autowired
     private  ExcelTabClient excelTabClient;
+    /**
+     * 按月封装对象
+     */
+    @Autowired
+    private ContractLogMonthPackService contractLogMonthPackService;
 
 
     public ContractLogServiceImpl(JdbcTemplate jdbcTemplate) {
@@ -207,4 +214,15 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
         return iPage.setRecords(deduplicatedList);
     }
 
+    @Override
+    public Boolean byMonthPack(ContractLogVO logVo) {
+
+
+
+        List<ContractLogMonthPack> contractLogMonthPacks = new ArrayList<>();
+
+
+
+        return contractLogMonthPackService.saveBatch(contractLogMonthPacks);
+    }
 }