修改项目新增和列表接口

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ContractDTO.java

@@ -50,7 +50,7 @@ public class ContractDTO {
     /**
      * 合同金额
      */
-    @NotNull(message = "合同金额不能为空", groups = Create.class)
+//    @NotNull(message = "合同金额不能为空", groups = Create.class)
     private BigDecimal contractAmount;
     /**
      * 查询枚举 AuditStatusEnums , 最终以字典表中project_audit_status字典编码为准

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java

@@ -114,4 +114,30 @@ public class WrkProject extends BaseEntity {
     @TableField(exist = false)
     private List<WrkProjectContract> contracts;
 
+    /**
+     * 合同有效期开始时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime contractStartTime;
+
+    /**
+     * 合同有效期结束日期
+     */
+    @TableField(exist = false)
+    private LocalDateTime contractEndTime;
+
+    /**
+     * 合同审核状态 项目审核状态 待初审 待复审 初审驳回 复审驳回 初审通过=待复审 复审通过
+     */
+    @TableField(exist = false)
+    private Integer auditStatus;
+
+
+    /**
+     * 合同地址
+     */
+    @TableField(exist = false)
+    private String contractUrl;
+
+
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java

@@ -2,10 +2,15 @@ package com.chushang.inspection.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chushang.inspection.project.entity.po.WrkProjectContract;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
   * @auther: zhao
   * @date: 2024/6/15 10:51
   */
 public interface WrkProjectContractMapper extends BaseMapper<WrkProjectContract> {
+
+    WrkProjectContract  queryListByProjectIds(@Param("projectId") Long projectId);
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
   * @auther: zhao
@@ -54,6 +55,14 @@ public class WrkProjectContractService extends ServiceImpl<WrkProjectContractMap
         return new PageResult(page);
     }
 
+
+    public WrkProjectContract queryListByProjectIds(Long projectId) {
+        return baseMapper.queryListByProjectIds(projectId);
+    }
+
+
+
+
     /**
      * 修改 合同的 审核状态
      */
@@ -63,5 +72,4 @@ public class WrkProjectContractService extends ServiceImpl<WrkProjectContractMap
                 .auditStatus(auditStatus)
                 .build());
     }
-
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
   * @auther: zhao
@@ -38,6 +39,8 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
     @Resource
     WrkAuditService auditService;
 
+
+
     @DataScope
     public PageResult pageList(WrkProject project, CommonParam commonParam) {
         LambdaQueryWrapper<WrkProject> queryWrapper = WrapperUtils.builder(project, commonParam);
@@ -45,7 +48,18 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),
                 queryWrapper
         );
-        return new PageResult(page);
+
+        List<WrkProject> recordList = page.getRecords();
+        // 查询出全部项目id
+        recordList.forEach(item->{
+            WrkProjectContract wrkProjectContract = contractService.queryListByProjectIds(item.getProjectId());
+            if(null != wrkProjectContract){
+                item.setContractStartTime(wrkProjectContract.getContractStartTime());
+                item.setContractEndTime(wrkProjectContract.getContractEndTime());
+                item.setContractUrl(wrkProjectContract.getContractUrl());
+            }
+        });
+        return new PageResult(recordList,page.getTotal(),page.getSize(),page.getCurrent());
     }
 
     /**

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
       discovery:
         server-addr: ${spring.cloud.nacos.server-addr}
         namespace: ${nacos.namespace}
-        group: local
+        group: ${nacos.group}
         service: ${spring.application.name}
       config:
         server-addr: ${spring.cloud.nacos.server-addr}

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml

@@ -27,4 +27,10 @@
     contract_amount, audit_status, project_effect, payment_state, version, del_state,
     create_by, create_time, update_by, update_time
   </sql>
+
+
+  <select id="queryListByProjectIds" resultMap="BaseResultMap" parameterType="java.util.List">
+    select <include refid="Base_Column_List" />  from wrk_project_contract
+             where project_id = #{projectId} order by create_time desc limit 1
+  </select>
 </mapper>