1.资产项目相关接口开发

2.表修改

biz-base/src/main/java/com/dayou/controller/AssetsCalculateController.java

@@ -0,0 +1,74 @@
+package com.dayou.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.dayou.result.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.AssetsCalculateService;
+import com.dayou.entity.AssetsCalculate;
+import org.springframework.web.bind.annotation.*;
+/**
+ * 资产项目测算信息表
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-13
+ */
+@RestController
+@RequestMapping("assetsCalculate")
+@Slf4j
+@CrossOrigin
+@SaCheckLogin
+public class AssetsCalculateController {
+    @Autowired
+    private AssetsCalculateService assetsCalculateService;
+
+    /**
+    * 资产项目测算信息表列表
+    */
+    @GetMapping("/page")
+    public Result<Page<AssetsCalculate>> page(AssetsCalculate assetsCalculate, Page page){
+        Page<AssetsCalculate> pages=assetsCalculateService.selectPage(page,assetsCalculate);
+        return Result.build(pages);
+    }
+
+    /**
+     * 资产项目测算信息表详情
+     */
+    @GetMapping("/detail/{id}")
+    public Result<AssetsCalculate> detail(@PathVariable Long id){
+        AssetsCalculate xAssetsCalculate =assetsCalculateService.detail(id);
+        return Result.build(xAssetsCalculate);
+     }
+
+    /**
+     * 资产项目测算信息表新增
+     */
+    @PostMapping("/save")
+    public Result<Boolean> save(@RequestBody AssetsCalculate assetsCalculate) {
+        Boolean ret = assetsCalculateService.add(assetsCalculate);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产项目测算信息表更新
+     */
+    @PutMapping("/update")
+    public Result<Boolean> update(@RequestBody AssetsCalculate assetsCalculate) {
+        Boolean ret = assetsCalculateService.update(assetsCalculate);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产项目测算信息表删除
+     */
+    @DeleteMapping("/delete/{id}")
+    public Result<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsCalculateService.delete(id);
+        return Result.build(ret);
+    }
+
+}
+

biz-base/src/main/java/com/dayou/controller/AssetsProjectController.java

@@ -1,7 +1,9 @@
 package com.dayou.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.stp.StpUtil;
 import com.dayou.result.Result;
+import com.dayou.vo.AssetsProjectVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,8 +31,8 @@ public class AssetsProjectController {
     * 资产项目基本信息表列表
     */
     @GetMapping("/page")
-    public Result<Page<AssetsProject>> page(AssetsProject assetsProject, Page page){
-        Page<AssetsProject> pages=assetsProjectService.selectPage(page,assetsProject);
+    public Result<Page<AssetsProjectVO>> page(Page page){
+        Page<AssetsProjectVO> pages=assetsProjectService.getAssetsProject(page, StpUtil.getLoginIdAsLong());
         return Result.build(pages);
     }
 

common/src/main/java/com/dayou/interceptor/DefaultPageInterceptor.java

@@ -34,7 +34,7 @@ public class DefaultPageInterceptor extends PaginationInterceptor {
      * @param page        page对象
      * @return ignore
      */
-    @Override
+/*    @Override
     public String concatOrderBy(String originalSql, IPage<?> page) {
         if (CollectionUtils.isEmpty(page.orders())) {
             String defaultOrder = DEFAULT_ORDER_CLOMUN;
@@ -48,7 +48,7 @@ public class DefaultPageInterceptor extends PaginationInterceptor {
             }
         }
         return super.concatOrderBy(originalSql, page);
-    }
+    }*/
 
 
 }

dao/src/main/java/com/dayou/mapper/AssetsCalculateMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.AssetsCalculate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 资产项目测算信息表 Mapper 接口
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-13
+ */
+public interface AssetsCalculateMapper extends BaseMapper<AssetsCalculate> {
+
+}

dao/src/main/java/com/dayou/mapper/AssetsProjectMapper.java

@@ -1,7 +1,10 @@
 package com.dayou.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.entity.AssetsProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.vo.AssetsProjectVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AssetsProjectMapper extends BaseMapper<AssetsProject> {
 
+    /**
+     * 获取资产项目列表
+     * @param page 分页
+     * @param createUserId 创建者id
+     * @return Page<AssetsProjectVO>
+     */
+    Page<AssetsProjectVO> getAssetsProject(@Param("page") Page page, @Param("createUserId") Long createUserId);
+
 }

dao/src/main/resources/mapper/AssetsCalculateMapper.xml

@@ -0,0 +1,26 @@
+<?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.dayou.mapper.AssetsCalculateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsCalculate">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="delete_status" property="deleteStatus" />
+        <result column="assets_id" property="assetsId" />
+        <result column="calculate_name" property="calculateName" />
+        <result column="valuation_basis_date" property="valuationBasisDate" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        update_time,
+        delete_status,
+        assets_id, calculate_name, valuation_basis_date, create_user_id
+    </sql>
+
+</mapper>

dao/src/main/resources/mapper/AssetsProjectMapper.xml

@@ -23,4 +23,22 @@
         project_name, principal, project_type_id, create_user_id
     </sql>
 
+    <!--获取资产项目列表-->
+    <select id="getAssetsProject" resultType="com.dayou.vo.AssetsProjectVO">
+        SELECT project.id AS id,
+               project.project_name AS projectName,
+               project.principal AS principal,
+               project.project_type_id AS projectTypeId,
+               dict_data.name AS projectTypeName,
+               project.create_user_id AS createUserId,
+               user.name AS createUserName,
+               project.create_time AS createTime
+        FROM assets_project AS project
+        LEFT JOIN user ON user.id = project.create_user_id
+        LEFT JOIN sys_dict_data AS dict_data ON dict_data.id = project.project_type_id
+        WHERE project.delete_status = 0
+        AND project.create_user_id = #{createUserId}
+        ORDER BY project.create_time DESC
+    </select>
+
 </mapper>

domain/src/main/java/com/dayou/dto/calculate/equipment/EquipmentBaseDTO.java

@@ -11,11 +11,6 @@ import java.time.LocalDate;
 public class EquipmentBaseDTO {
 
     /**
-     * 评估基准日
-     */
-    private LocalDate valuationBasisDate;
-
-    /**
      * 工期
      */
     private Double constructionPeriod;
@@ -35,14 +30,4 @@ public class EquipmentBaseDTO {
      */
     private Double managementExpenseRatio;
 
-    /**
-     * 是否有进口设备
-     */
-    private Boolean hasImportedEquipment;
-
-    /**
-     * 非标设备(非标准设备,如定制设备等)
-     */
-    private Boolean hasNonStandardEquipment;
-
 }

domain/src/main/java/com/dayou/entity/AssetsCalculate.java

@@ -0,0 +1,44 @@
+package com.dayou.entity;
+import com.dayou.common.BaseEntity;
+import java.time.LocalDate;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+ * <p>
+ * 资产项目测算信息表
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AssetsCalculate extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 资产项目id
+     */
+    private Long assetsId;
+
+    /**
+     * 测算名
+     */
+    private String calculateName;
+
+    /**
+     * 评估基准日
+     */
+    private LocalDate valuationBasisDate;
+
+    /**
+     * 测算表创建者user_id
+     */
+    private Long createUserId;
+
+
+}

domain/src/main/java/com/dayou/vo/AssetsProjectVO.java

@@ -0,0 +1,50 @@
+package com.dayou.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AssetsProjectVO {
+
+    /**
+     * 项目id
+     */
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 委托人
+     */
+    private String principal;
+
+    /**
+     * 项目类型id(字典表)
+     */
+    private Long projectTypeId;
+
+    /**
+     * 项目类型
+     */
+    private String projectTypeName;
+
+    /**
+     * 创建项目user_id
+     */
+    private Long createUserId;
+
+    /**
+     * 创建项目用户名
+     */
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

service/src/main/java/com/dayou/service/AssetsCalculateService.java

@@ -0,0 +1,26 @@
+package com.dayou.service;
+import com.dayou.entity.AssetsCalculate;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+/**
+ * <p>
+ * 资产项目测算信息表 服务类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-13
+ */
+public interface AssetsCalculateService extends IService<AssetsCalculate> {
+
+        Page<AssetsCalculate> selectPage(Page page,AssetsCalculate assetsCalculate);
+
+        AssetsCalculate detail(Long id);
+
+        Boolean add(AssetsCalculate assetsCalculate);
+
+        Boolean update(AssetsCalculate assetsCalculate);
+
+        Boolean delete(Long id);
+
+}

service/src/main/java/com/dayou/service/AssetsProjectService.java

@@ -3,6 +3,8 @@ import com.dayou.entity.AssetsProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayou.vo.AssetsProjectVO;
+
 /**
  * <p>
  * 资产项目基本信息表 服务类
@@ -13,7 +15,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface AssetsProjectService extends IService<AssetsProject> {
 
-        Page<AssetsProject> selectPage(Page page,AssetsProject assetsProject);
+        /**
+         * 获取资产项目列表
+         * @param page 分页
+         * @param createUserId 创建者id
+         * @return Page<AssetsProjectVO>
+         */
+        Page<AssetsProjectVO> getAssetsProject(Page page, Long createUserId);
 
         AssetsProject detail(Long id);
 

service/src/main/java/com/dayou/service/impl/AssetsCalculateServiceImpl.java

@@ -0,0 +1,58 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.AssetsCalculate;
+import com.dayou.mapper.AssetsCalculateMapper;
+import com.dayou.service.AssetsCalculateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import java.util.List;
+import java.util.ArrayList;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 资产项目测算信息表 服务实现类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-13
+ */
+@Service
+public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMapper, AssetsCalculate> implements AssetsCalculateService {
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<AssetsCalculate> selectPage(Page page,AssetsCalculate assetsCalculate){
+        return this.page(page, new QueryWrapper<AssetsCalculate>(assetsCalculate));
+    }
+
+
+    @Override
+    public AssetsCalculate detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsCalculate assetsCalculate){
+        return  this.save(assetsCalculate);
+    }
+
+    @Override
+    public Boolean update(AssetsCalculate assetsCalculate){
+        return  this.updateById(assetsCalculate);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

service/src/main/java/com/dayou/service/impl/AssetsProjectServiceImpl.java

@@ -5,6 +5,8 @@ import com.dayou.entity.AssetsProject;
 import com.dayou.mapper.AssetsProjectMapper;
 import com.dayou.service.AssetsProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.vo.AssetsProjectVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,14 +30,20 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class AssetsProjectServiceImpl extends ServiceImpl<AssetsProjectMapper, AssetsProject> implements AssetsProjectService {
 
+    @Autowired
+    private AssetsProjectMapper assetsProjectMapper;
 
+    /**
+     * 获取资产项目列表
+     * @param page 分页
+     * @param createUserId 创建者id
+     * @return Page<AssetsProjectVO>
+     */
     @Override
-    @SuppressWarnings("unchecked")
-    public Page<AssetsProject> selectPage(Page page,AssetsProject assetsProject){
-        return this.page(page, new QueryWrapper<AssetsProject>(assetsProject));
+    public Page<AssetsProjectVO> getAssetsProject(Page page, Long createUserId) {
+        return assetsProjectMapper.getAssetsProject(page, createUserId);
     }
 
-
     @Override
     public AssetsProject detail(Long id){
         return this.getById(id);
@@ -43,7 +51,7 @@ public class AssetsProjectServiceImpl extends ServiceImpl<AssetsProjectMapper, A
 
     @Override
     public Boolean add(AssetsProject assetsProject){
-        assetsProject.setCreateUserId(Long.valueOf((String) StpUtil.getLoginId()));
+        assetsProject.setCreateUserId(StpUtil.getLoginIdAsLong());
         return  this.save(assetsProject);
     }
 

sql/update_sql.sql

@@ -230,3 +230,9 @@ ALTER TABLE document_production ADD COLUMN business_cate VARCHAR(128)  COMMENT '
 RENAME TABLE assets TO assets_project;
 ALTER TABLE assets_project ADD COLUMN principal VARCHAR(128) NOT NULL COMMENT '委托人';
 
+/**
+  日期：2024-11-13
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE assets_calculate MODIFY COLUMN create_user_id bigint(20) DEFAULT NULL COMMENT '测算表创建者user_id'