Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

4 天以前 936f4bd8b7837051ff63773be6d2d9c4b402b168

Merge remote-tracking branch 'origin/dev_New' into dev_New

 pom.xml

@@ -328,7 +328,10 @@
            <artifactId>hutool-all</artifactId>

            <version>5.8.43</version>

        </dependency>



        <dependency>

            <groupId>com.fasterxml.jackson.datatype</groupId>

            <artifactId>jackson-datatype-jsr310</artifactId>

        </dependency>



    </dependencies>




 src/main/java/com/ruoyi/account/pojo/AccountExpense.java

@@ -35,7 +35,7 @@
    private Long businessId;

    /**
     * ä¸šåŠ¡ç±»åž‹ 1-付款 2-还款
     * ä¸šåŠ¡ç±»åž‹ 1-付款 2-还款 3-薪资发放
     */
    private Integer businessType;


 src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java

@@ -11,6 +11,8 @@
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.common.vo.SimpleFileVo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import java.util.*;
@@ -31,7 +33,9 @@
@RequiredArgsConstructor
public class CustomerFollowUpFileServiceImpl extends ServiceImpl<CustomerFollowUpFileMapper, CustomerFollowUpFile> implements CustomerFollowUpFileService {

    private final CustomerFollowUpService customerFollowUpService;
    @Autowired
    @Lazy
    private CustomerFollowUpService customerFollowUpService;


    @Override
@@ -64,7 +68,8 @@
            if (StrUtil.isNotBlank(attachmentIds)) {
                List<SimpleFileVo> fileVos = Arrays.stream(attachmentIds.split(","))
                        .map(Long::valueOf)
                        .map(it->collectMap.getOrDefault(it, (SimpleFileVo) Collections.emptyList()))
                        .map(it->collectMap.getOrDefault(it, null))
                        .filter(Objects::nonNull)
                        .collect(Collectors.toList());
                setAttachmentList.accept(t, fileVos);
            }

 src/main/java/com/ruoyi/common/config/MybatisHandler.java

@@ -6,6 +6,7 @@
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;
import java.util.Optional;

@Component
public class MybatisHandler implements MetaObjectHandler {
@@ -22,6 +23,8 @@
        this.strictInsertFill(metaObject, "updateTime",  LocalDateTime.class, LocalDateTime.now());
        this.strictInsertFill(metaObject, "createUser", Integer.class, userId);
        this.strictInsertFill(metaObject, "updateUser", Integer.class, userId);
        this.strictInsertFill(metaObject, "createUser", Long.class, userId == null ? 0 : userId.longValue());
        this.strictInsertFill(metaObject, "updateUser", Long.class, userId == null ? 0 : userId.longValue());
        this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
    }


 src/main/java/com/ruoyi/common/enums/PlanStageEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.common.enums;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.Getter;

import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Getter
public enum PlanStageEnum implements BaseEnum<Integer>, Serializable {
    TO_BEGIN(1, "待开始"),
    ON_GOING(2, "进行中"),
    ENDED(3, "已结束");

    private final Integer code;
    private final String value;

    PlanStageEnum(Integer code, String value) {
        this.code = code;
        this.value = value;
    }
}

 src/main/java/com/ruoyi/common/enums/ReviewStatusEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
package com.ruoyi.common.enums;

import lombok.Getter;

import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Getter
public enum ReviewStatusEnum implements BaseEnum<Integer>, Serializable {
    PENDING_REVIEW(0, "待审核"),
    APPROVED(1, "已审核"),
    REJECTED(2, "审核未通过");

    private final Integer code;
    private final String value;

    ReviewStatusEnum(Integer code, String value) {
        this.code = code;
        this.value = value;
    }


}

 src/main/java/com/ruoyi/common/enums/SaleEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.common.enums;

import lombok.Getter;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Getter
public enum SaleEnum implements BaseEnum<Integer>{
    SALE(1, "销售"),
    PURCHASE(2, "采购"),
    MANAGEMENT(3, "项目");

    private final Integer code;
    private final String value;

    SaleEnum(Integer code, String value) {
        this.code = code;
        this.value = value;
    }
}

 src/main/java/com/ruoyi/projectManagement/controller/InfoController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ruoyi.projectManagement.controller;

import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.projectManagement.service.InfoService;
import com.ruoyi.projectManagement.vo.SaveInfoVo;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.Valid;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@RestController
@RequestMapping("/projectManagement/info")
@Api(value = "InfoController", tags = "项目管理信息表(项目管理类型)")
@RequiredArgsConstructor
public class InfoController {

    private final InfoService infoService;

    @PostMapping("/save")
    public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
        infoService.save(saveInfoVo);
        return AjaxResult.success();
    }
}

 src/main/java/com/ruoyi/projectManagement/dto/ContractInfoDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.ruoyi.projectManagement.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ContractInfoDto implements Serializable {
    /**
     *
     */
    private Long id;

    /**
     * åç§°
     */
    private String name;

    /**
     * æ€§åˆ«
     */
    private String sex;

    /**
     * ç”Ÿæ—¥
     */
    private String birthday;

    /**
     * éƒ¨é—¨
     */
    private String department;

    /**
     * èŒåŠ¡
     */
    private String job;

    /**
     * æ‰‹æœºå·
     */
    private String phoneNumber;

    /**
     * é‚®ç®±
     */
    private String email;

    /**
     * QQ
     */
    private String qq;

    /**
     * å›ºå®šå·ç 
     */
    private String lineaFissa;

    /**
     * å¾®ä¿¡
     */
    private String wx;

    /**
     * ç±è´¯
     */
    private String origineEtnica;

    /**
     * æ³•äººä»£è¡¨
     */
    private String rappresentanteLegale;

    /**
     * å¯¹åº”项目管理信息id
     */
    private Long projectManagementInfoId;

}

 src/main/java/com/ruoyi/projectManagement/dto/PlanStageDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.ruoyi.projectManagement.dto;

import com.ruoyi.common.enums.PlanStageEnum;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PlanStageDto implements Serializable {
    private Long id;
    private String name;
    private PlanStageEnum planStageEnum;
}

 src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.ruoyi.projectManagement.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SaveInfoDto implements Serializable {
    private Long id;
    private String no;
    @NotBlank
    private String title;
    private Long clientId;
    private String clientName;
    // å¼•ç”¨çš„父id
    private Long projectManagementInfoParentId;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate establishTime;
    // é¡¹ç›®ç±»åž‹ id
    @NotNull
    private Long projectManagementPlanId;

    private String source;

    private Long managerId;
    private String managerName;
    private Long salesmanId;
        private String salesmanName;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate planStartTime;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate planEndTime;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate actualStartTime;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate actualEndTime;

    // é¡¹ç›®çŠ¶æ€
    private Integer status;

    private Long departmentId;
    private String departmentName;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate orderDate;


    private String orderAmount;

    private String remark;

    private List<String> attachmentIds; // é™„件ids

    private List<TeamDto> teamList;
}

 src/main/java/com/ruoyi/projectManagement/dto/ShippingAddressDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.ruoyi.projectManagement.dto;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ShippingAddressDto implements Serializable {

    private Long id;

    /**
     * æ”¶è´§äºº
     */
    private String consignee;

    /**
     * è”系方式
     */
    private String contract;

    /**
     * åœ°å€
     */
    private String address;


}

 src/main/java/com/ruoyi/projectManagement/dto/TeamDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.ruoyi.projectManagement.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class TeamDto implements Serializable {

    private Integer userId;
    private String userName;
    private String userRoleId;
    private String userRoleName;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date joinTime;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date departTime;
    private String contact;
    private String remark;
}

 src/main/java/com/ruoyi/projectManagement/mapper/ContractInfoMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.projectManagement.mapper;

import com.ruoyi.projectManagement.pojo.ContractInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author buhuazhen
* @description é’ˆå¯¹è¡¨ã€project_management_contract_info(项目联系信息)】的数据库操作Mapper
* @createDate 2026-03-09 16:38:09
* @Entity com.ruoyi.projectManagement.pojo.ContractInfo
*/
public interface ContractInfoMapper extends BaseMapper<ContractInfo> {

}





 src/main/java/com/ruoyi/projectManagement/mapper/InfoMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.projectManagement.mapper;

import com.ruoyi.projectManagement.pojo.Info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author buhuazhen
* @description é’ˆå¯¹è¡¨ã€project_management_info(项目管理信息)】的数据库操作Mapper
* @createDate 2026-03-09 13:57:50
* @Entity com.ruoyi.projectManagement.pojo.Info
*/
public interface InfoMapper extends BaseMapper<Info> {

}





 src/main/java/com/ruoyi/projectManagement/mapper/ShippingAddressMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.projectManagement.mapper;

import com.ruoyi.projectManagement.pojo.ShippingAddress;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author buhuazhen
* @description é’ˆå¯¹è¡¨ã€project_management_shipping_address(收货地址)】的数据库操作Mapper
* @createDate 2026-03-09 16:28:07
* @Entity com.ruoyi.projectManagement.pojo.ShippingAddress
*/
public interface ShippingAddressMapper extends BaseMapper<ShippingAddress> {

}





 src/main/java/com/ruoyi/projectManagement/pojo/ContractInfo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,132 @@
package com.ruoyi.projectManagement.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;

/**
 * é¡¹ç›®è”系信息
 * @TableName project_management_contract_info
 */
@TableName(value ="project_management_contract_info")
@Data
public class ContractInfo implements Serializable {
    /**
     * 
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * åç§°
     */
    @TableField(value = "name")
    private String name;

    /**
     * æ€§åˆ«
     */
    @TableField(value = "sex")
    private String sex;

    /**
     * ç”Ÿæ—¥
     */
    @TableField(value = "birthday")
    private String birthday;

    /**
     * éƒ¨é—¨
     */
    @TableField(value = "department")
    private String department;

    /**
     * èŒåŠ¡
     */
    @TableField(value = "job")
    private String job;

    /**
     * æ‰‹æœºå·
     */
    @TableField(value = "phone_number")
    private String phoneNumber;

    /**
     * é‚®ç®±
     */
    @TableField(value = "email")
    private String email;

    /**
     * QQ
     */
    @TableField(value = "qq")
    private String qq;

    /**
     * å›ºå®šå·ç 
     */
    @TableField(value = "linea_fissa")
    private String lineaFissa;

    /**
     * å¾®ä¿¡
     */
    @TableField(value = "wx")
    private String wx;

    /**
     * ç±è´¯
     */
    @TableField(value = "origine_etnica")
    private String origineEtnica;

    /**
     * æ³•äººä»£è¡¨
     */
    @TableField(value = "rappresentante_legale")
    private String rappresentanteLegale;

    /**
     * å¯¹åº”项目管理信息id
     */
    @TableField(value = "project_management_info_id")
    private Long projectManagementInfoId;

    /**
     * 
     */
    @TableField(value = "is_delete")
    private Integer isDelete;

    /**
     * 
     */
    @TableField(value = "create_user", fill = FieldFill.INSERT)
    private Long createUser;

    /**
     * 
     */
    @TableField(value = "update_user", fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;

    /**
     * 
     */
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    /**
     * 
     */
    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 src/main/java/com/ruoyi/projectManagement/pojo/Info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,210 @@
package com.ruoyi.projectManagement.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.ruoyi.projectManagement.dto.PlanStageDto;
import com.ruoyi.projectManagement.dto.TeamDto;
import lombok.Data;

/**
 * é¡¹ç›®ç®¡ç†ä¿¡æ¯
 * @TableName project_management_info
 */
@TableName(value ="project_management_info",autoResultMap = true)
@Data
public class Info implements Serializable {
    /**
     * 
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * é¡¹ç›®ç¼–号
     */
    @TableField(value = "no")
    private String no;

    /**
     * ä¸»é¢˜
     */
    @TableField(value = "title")
    private String title;

    /**
     * å®¢æˆ·id
     */
    @TableField(value = "client_id")
    private Long clientId;

    /**
     * å®¢æˆ·åç§°
     */
    @TableField(value = "client_name")
    private String clientName;

    /**
     * ç´¢å¼•çš„父项目id
     */
    @TableField(value = "project_management_info_parent_id")
    private Long projectManagementInfoParentId;

    /**
     * ç«‹é¡¹æ—¶é—´
     */
    @TableField(value = "establish_time")
    private LocalDate establishTime;

    /**
     * é¡¹ç›®é˜¶æ®µid
     */
    @TableField(value = "project_management_plan_id")
    private Long projectManagementPlanId;

    /**
     * æ¥æº
     */
    @TableField(value = "source")
    private String source;

    /**
     * é¡¹ç›®ç»ç†id
     */
    @TableField(value = "manager_id")
    private Long managerId;

    /**
     * é¡¹ç›®ç»ç†åå­—
     */
    @TableField(value = "manager_name")
    private String managerName;

    /**
     * ä¸šåŠ¡å‘˜id
     */
    @TableField(value = "salesman_id")
    private Long salesmanId;

    /**
     * ä¸šåŠ¡å‘˜åå­—
     */
    @TableField(value = "salesman_name")
    private String salesmanName;

    /**
     * 
     */
    @TableField(value = "is_delete")
    private Integer isDelete;

    /**
     * 
     */
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    /**
     * 
     */
    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    /**
     * 
     */
    @TableField(value = "create_user",fill = FieldFill.INSERT)
    private Integer createUser;

    /**
     * 
     */
    @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    /**
     * è®¡åˆ’开始时间
     */
    @TableField(value = "plan_start_time")
    private LocalDate planStartTime;

    /**
     * è®¡åˆ’结束时间
     */
    @TableField(value = "plan_end_time")
    private LocalDate planEndTime;

    /**
     * å®žé™…开始时间
     */
    @TableField(value = "actual_start_time")
    private LocalDate actualStartTime;

    /**
     * å®žé™…结束日期
     */
    @TableField(value = "actual_end_time")
    private LocalDate actualEndTime;

    /**
     * å®¡æ ¸çŠ¶æ€
     */
    @TableField(value = "review_status")
    private Integer reviewStatus;

    /**
     * é¡¹ç›®çŠ¶æ€
     */
    @TableField(value = "status")
    private Integer status;

    /**
     * éƒ¨é—¨id
     */
    @TableField(value = "department_id")
    private Long departmentId;

    /**
     * éƒ¨é—¨åå­—
     */
    @TableField(value = "department_name")
    private String departmentName;

    /**
     * è®¢å•æ—¥æœŸ
     */
    @TableField(value = "order_date")
    private LocalDate orderDate;

    /**
     * è®¢å•é‡‘额
     */
    @TableField(value = "order_amount")
    private String orderAmount;

    /**
     * å¤‡æ³¨
     */
    @TableField(value = "remark")
    private String remark;

    /**
     * é™„件
     */
    @TableField(value = "attachment")
    private String attachment;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

    @TableField(value = "plan_stage",typeHandler = JacksonTypeHandler.class)
    private List<PlanStageDto> planStage;

    @TableField(value = "team",typeHandler = JacksonTypeHandler.class)
    private List<TeamDto> team;
}

 src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
package com.ruoyi.projectManagement.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;

/**
 * æ”¶è´§åœ°å€
 * @TableName project_management_shipping_address
 */
@TableName(value ="project_management_shipping_address")
@Data
public class ShippingAddress implements Serializable {
    /**
     * 
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * æ”¶è´§äºº
     */
    @TableField(value = "consignee")
    private String consignee;

    /**
     * è”系方式
     */
    @TableField(value = "contract")
    private String contract;

    /**
     * åœ°å€
     */
    @TableField(value = "address")
    private String address;

    /**
     * 
     */
    @TableField(value = "is_delete")
    private Integer isDelete;

    /**
     * 
     */
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    /**
     * 
     */
    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    /**
     * 
     */
    @TableField(value = "create_user",fill = FieldFill.INSERT)
    private Long createUser;

    /**
     * 
     */
    @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;

    @TableField(value = "project_management_info_id")
    private Long projectManagementInfoId;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 src/main/java/com/ruoyi/projectManagement/service/InfoService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.projectManagement.service;

import com.ruoyi.projectManagement.vo.SaveInfoVo;

import javax.validation.constraints.NotNull;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
public interface InfoService {
    void save(@NotNull SaveInfoVo saveInfoVo);

}

 src/main/java/com/ruoyi/projectManagement/service/PlanService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.projectManagement.pojo.Plan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.projectManagement.pojo.PlanNode;
import com.ruoyi.projectManagement.vo.PlanVo;
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
@@ -33,6 +34,8 @@
     */
    void savePlanNode(@NotNull Long planId,@Nullable List<SavePlanNodeVo> savePlanNodeVos);

    List<PlanNode> getPlanNodeByPlanId(@NotNull Long planId);

    /**
     * åˆ é™¤é¡¹ç›®ç®¡ç†è®¡åˆ’
     * @param id

 src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.ruoyi.projectManagement.service.impl;

import com.ruoyi.common.enums.SaleEnum;
import com.ruoyi.projectManagement.service.InfoService;
import com.ruoyi.projectManagement.service.impl.handle.ContractInfoHandleService;
import com.ruoyi.projectManagement.service.impl.handle.InfoHandleService;
import com.ruoyi.projectManagement.service.impl.handle.ShippingAddressHandleService;
import com.ruoyi.projectManagement.vo.SaveInfoVo;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class InfoServiceImpl implements InfoService {
    private final InfoHandleService infoHandleService;
    private final ContractInfoHandleService contractInfoHandleService;
    private final ShippingAddressHandleService shippingAddressHandleService;
    private final ISalesLedgerService salesLedgerService;

    @Transactional(rollbackFor = Exception.class)
    @Override
    public void save(SaveInfoVo saveInfoVo) {
        // ä¿å­˜ä¸»ä¿¡æ¯
        Long infoId = infoHandleService.save(saveInfoVo.getInfo());
        shippingAddressHandleService.save(infoId, saveInfoVo.getShippingAddress());
        contractInfoHandleService.save(infoId, saveInfoVo.getContractInfo());
        salesLedgerService.handleSalesLedgerProducts(infoId, saveInfoVo.getSalesLedgerProductList(), SaleEnum.MANAGEMENT);
    }
}

 src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java

@@ -93,16 +93,17 @@
        });
    }

    private List<PlanNode> getPlanNodeByPlanId(Long planId) {
    @Override
    public List<PlanNode> getPlanNodeByPlanId(Long planId) {
        return planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
                .eq(PlanNode::getIsDelete, 0)
                .eq(PlanNode::getProjectManagementPlanId, planId));
                .eq(PlanNode::getProjectManagementPlanId, planId).orderByAsc(PlanNode::getSort));
    }

    private List<PlanNode> getPlanNodeByPlanIds(List<Long> planIds) {
        return planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
                .eq(PlanNode::getIsDelete, 0)
                .in(PlanNode::getProjectManagementPlanId, planIds));
                .in(PlanNode::getProjectManagementPlanId, planIds).orderByAsc(PlanNode::getSort));
    }



 src/main/java/com/ruoyi/projectManagement/service/impl/handle/ContractInfoHandleService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.ruoyi.projectManagement.service.impl.handle;

import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.projectManagement.dto.ContractInfoDto;
import com.ruoyi.projectManagement.mapper.ContractInfoMapper;
import com.ruoyi.projectManagement.pojo.ContractInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Component
@Transactional(rollbackFor = Exception.class,readOnly = true)
public class ContractInfoHandleService{

    @Autowired
    private ContractInfoMapper contractInfoMapper;

    @Transactional(rollbackFor = Exception.class)
    public void save(@Nullable Long id, @NotNull ContractInfoDto contractInfoDto) {
        ContractInfo contractInfo = BeanUtil.copyProperties(contractInfoDto, ContractInfo.class);
        contractInfo.setProjectManagementInfoId(id);
        if (contractInfoDto.getId() == null) {
            contractInfoMapper.insert(contractInfo);
        } else {
            contractInfoMapper.updateById(contractInfo);
        }
    }
}

 src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,99 @@
package com.ruoyi.projectManagement.service.impl.handle;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.enums.PlanStageEnum;
import com.ruoyi.common.enums.ReviewStatusEnum;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.projectManagement.dto.PlanStageDto;
import com.ruoyi.projectManagement.dto.SaveInfoDto;
import com.ruoyi.projectManagement.mapper.InfoMapper;
import com.ruoyi.projectManagement.pojo.Info;
import com.ruoyi.projectManagement.pojo.PlanNode;
import com.ruoyi.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.service.impl.PlanServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.validation.constraints.NotNull;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Component
@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class,readOnly = true)
public class InfoHandleService {

    private static final String GENERATE_SERIAL_NUMBER_PREFIX = "XM";

    private final InfoMapper infoMapper;

    private final PlanService planService;

    @Transactional(rollbackFor = Exception.class)
    public Long save(@NotNull SaveInfoDto saveInfoDto){
        Info info = BeanUtil.copyProperties(saveInfoDto, Info.class);

        // é™„件特殊处理
        String attachmentIds = StrUtil.join(",", Optional.ofNullable(saveInfoDto.getAttachmentIds()).orElse(Collections.emptyList()));
        info.setAttachment(attachmentIds);

        // ç”Ÿæˆåºå· (如果需要自动生成的话)
        if(StrUtil.isBlank(info.getNo())){
            info.setNo(generateSerialNumber());
        }
        info.setTeam(saveInfoDto.getTeamList());
        if(info.getId() == null){
            // ç”Ÿæˆå¯¹åº”的阶段关系数据
            info.setPlanStage(getPlanStageList(info.getProjectManagementPlanId()));
            // æ’入默认状态
            info.setStatus(PlanStageEnum.TO_BEGIN.getCode());
            info.setReviewStatus(ReviewStatusEnum.PENDING_REVIEW.getCode());
            infoMapper.insert(info);
        }else {
            infoMapper.updateById(info);
        }
        return info.getId();
    }


    private List<PlanStageDto> getPlanStageList(@NotNull Long planId) {
        List<PlanNode> planNodeByPlanId = planService.getPlanNodeByPlanId(planId);
        return planNodeByPlanId.stream().map(it-> new PlanStageDto(it.getId(), it.getName(), PlanStageEnum.TO_BEGIN)).collect(Collectors.toList());
    }


    /**
     * ç”Ÿæˆé¡¹ç›®ç¼–号
     * @return
     */
    private String generateSerialNumber() {
        // èŽ·å–当前日期
        String date = DateUtil.format(DateUtil.date(), "yyyyMMdd");

        // æŸ¥è¯¢ä»Šå¤©å·²ç»ç”Ÿæˆçš„数量
        LambdaQueryWrapper<Info> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.likeRight(Info::getNo, GENERATE_SERIAL_NUMBER_PREFIX + date);

        Long count = infoMapper.selectCount(queryWrapper);

        // åºå· +1
        Long serial = count + 1;

        // 3位补0
        String serialStr = String.format("%03d", serial);

        return GENERATE_SERIAL_NUMBER_PREFIX + date + serialStr;
    }

}

 src/main/java/com/ruoyi/projectManagement/service/impl/handle/ShippingAddressHandleService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.ruoyi.projectManagement.service.impl.handle;

import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.projectManagement.dto.ShippingAddressDto;
import com.ruoyi.projectManagement.mapper.ShippingAddressMapper;
import com.ruoyi.projectManagement.pojo.ShippingAddress;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Component
@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class,readOnly = true)
public class ShippingAddressHandleService {

    private final ShippingAddressMapper shippingAddressMapper;

    @Transactional(rollbackFor = Exception.class)
    public void save(@Nullable Long infoId,@NotNull ShippingAddressDto shippingAddressDto){
        ShippingAddress shippingAddress = BeanUtil.copyProperties(shippingAddressDto, ShippingAddress.class);
        shippingAddress.setProjectManagementInfoId(infoId);
        if (shippingAddressDto.getId() == null) {
            shippingAddressMapper.insert(shippingAddress);
        }else {
            shippingAddressMapper.updateById(shippingAddress);
        }
    }
}

 src/main/java/com/ruoyi/projectManagement/vo/SaveInfoVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.ruoyi.projectManagement.vo;

import com.ruoyi.projectManagement.dto.ContractInfoDto;
import com.ruoyi.projectManagement.dto.SaveInfoDto;
import com.ruoyi.projectManagement.dto.ShippingAddressDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.Valid;
import java.io.Serializable;
import java.util.List;

/**
 * @author buhuazhen
 * @date 2026/3/9
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SaveInfoVo implements Serializable {

    @Valid
    private SaveInfoDto info;

    @Valid
    private ShippingAddressDto shippingAddress;

    @Valid
    private ContractInfoDto contractInfo;

    private List<SalesLedgerProduct> salesLedgerProductList;
}

 src/main/java/com/ruoyi/projectManagement/vo/SavePlanVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.projectManagement.vo;


import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -22,7 +24,7 @@
    private Long id;
    @NotBlank
    private String name;
    @NotBlank
//    @NotBlank
    private String description;

    private List<String> attachmentIds;
@@ -30,4 +32,5 @@
    @Valid
    private List<SavePlanNodeVo> savePlanNodeList;


}

 src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java

@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.common.enums.SaleEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.LossProductModelDto;
import com.ruoyi.sales.dto.MonthlyAmountDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
@@ -28,6 +30,8 @@

    int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto);

    void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type);

    SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto);

    List getSalesNo();

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -15,8 +15,10 @@
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.SaleEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -636,7 +638,7 @@
            // 4. å¤„理子表数据
            List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
            if (productList != null && !productList.isEmpty()) {
                handleSalesLedgerProducts(salesLedger.getId(), productList, salesLedgerDto.getType());
                handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class,salesLedgerDto.getType()));
                updateMainContractAmount(
                        salesLedger.getId(),
                        productList,
@@ -734,7 +736,8 @@
    }


    private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
    @Override
    public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {
        // æŒ‰ID分组，区分新增和更新的记录
        Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
                .peek(p -> p.setSalesLedgerId(salesLedgerId))
@@ -746,14 +749,14 @@
        // æ‰§è¡Œæ›´æ–°æ“ä½œ
        if (!updateList.isEmpty()) {
            for (SalesLedgerProduct product : updateList) {
                product.setType(type);
                product.setType(type.getCode());
                salesLedgerProductMapper.updateById(product);
            }
        }
        // æ‰§è¡Œæ’入操作
        if (!insertList.isEmpty()) {
            for (SalesLedgerProduct salesLedgerProduct : insertList) {
                salesLedgerProduct.setType(type);
                salesLedgerProduct.setType(type.getCode());
                salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
                salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());

 src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java

@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
import io.swagger.annotations.Api;
@@ -39,8 +40,8 @@

    @ApiOperation("通过部门ids获取用户信息计算每个员工的工资")
    @PostMapping("/calculateSalary")
    public AjaxResult calculateSalary(@RequestBody List<Long> ids) {
        return staffSalaryMainService.calculateSalary(ids);
    public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
        return staffSalaryMainService.calculateSalary(calculateSalaryDto);
    }

    @PostMapping("/add")

 src/main/java/com/ruoyi/staff/dto/CalculateSalaryDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.dto;

import lombok.Data;

import java.util.List;

/**
 * @author :yys
 * @date : 2026/3/9 11:53
 */
@Data
public class CalculateSalaryDto {

    private List<Long> ids;

    private String date;

}

 src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -25,5 +26,5 @@

    AjaxResult delete(List<Long> ids);

    AjaxResult calculateSalary(List<Long> ids);
    AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto);
}

 src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.UserAccountDto;
import com.ruoyi.production.dto.UserProductionAccountingDto;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.SysUserDept;
@@ -58,6 +61,9 @@

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    @Autowired
    private SalesLedgerProductionAccountingService salesLedgerProductionAccountingService;


    @Override
@@ -160,7 +166,7 @@
     * é€šè¿‡å‘˜å·¥id计算社保方案
     * @param id
     */
    public void calculateByEmployeeId(Integer id,Map<String, Object> map) {
    public void calculateByEmployeeId(Integer id,Map<String, Object> map,String date) {
        // 1. å…¥å‚校验
        if (id == null) {
            return; // æˆ–返回空列表，根据业务需求调整
@@ -211,6 +217,20 @@
        // ä¸ªç¨Žé‡‘额（无社保版）
        BigDecimal bigDecimal = TaxCalculator.calculateMonthlyTax(basicSalary, schemeAmount, gjj);
        map.put("salaryTax", bigDecimal);
        // è®¡æ—¶å·¥èµ„ è®¡ä»¶å·¥èµ„
        UserProductionAccountingDto userProductionAccountingDto = new UserProductionAccountingDto();
        userProductionAccountingDto.setUserId(getUidByStaffId(staffId));
        userProductionAccountingDto.setDate(date);
        UserAccountDto byUserId = salesLedgerProductionAccountingService.getByUserId(userProductionAccountingDto);
        if(byUserId != null){
            map.put("pieceSalary", byUserId.getAccountBalance());
            map.put("hourlySalary", byUserId.getAccount());
            // åº”发 å®žå‘增加
            grossSalary = grossSalary.add(byUserId.getAccountBalance()).add(byUserId.getAccount());
            map.put("grossSalary", grossSalary);
            netSalary = netSalary.add(byUserId.getAccountBalance()).add(byUserId.getAccount());
            map.put("netSalary", netSalary);
        }
        // 2. æŸ¥è¯¢è¯¥äººå‘˜å¯¹åº”的社保方案
        List<SchemeApplicableStaff> schemeList = schemeApplicableStaffMapper.selectSchemeByStaffId(staffId);
        if (CollectionUtils.isEmpty(schemeList)) {
@@ -244,6 +264,26 @@
    }

    /**
     * é€šè¿‡å‘˜å·¥Id获取用户id
     * @param staffId
     * @return
     */
    public Long getUidByStaffId(Long staffId){
        StaffOnJob staffOnJob = staffOnJobMapper.selectById(staffId);
        if(staffOnJob == null){
            return -1L; // è¿”回不存在Id
        }
        SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
                .eq(SysUser::getUserName, staffOnJob.getStaffNo())
                .eq(SysUser::getDelFlag, "0")
                .last("limit 1"));
        if(sysUser == null){
            return -1L; // è¿”回不存在Id
        }
        return sysUser.getUserId();
    }

    /**
     * è®¡ç®—
     * @param type
     * @param bigDecimal

 src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java

@@ -2,14 +2,20 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.pojo.StaffSalaryDetail;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
@@ -52,6 +58,12 @@

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    @Autowired
    private AccountExpenseMapper accountExpenseMapper;

    @Override
    public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -104,6 +116,21 @@
            detail.setMainId(staffSalaryMain.getId());
        });
        staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
        // å’Œè´¢åŠ¡è”动，新增支出
        if(staffSalaryMain.getStatus().equals(5)){
            AccountExpense accountExpense = new AccountExpense();
            accountExpense.setBusinessType(3);
            accountExpense.setExpenseMoney(staffSalaryMain.getTotalSalary());
            accountExpense.setBusinessId(staffSalaryMain.getId());
            accountExpense.setExpenseDate(new Date());
            accountExpense.setExpenseMethod("2");
            accountExpense.setExpenseType("1");
            accountExpense.setExpenseDescribed(staffSalaryMain.getSalaryTitle());
            accountExpense.setNote(staffSalaryMain.getRemark());
            accountExpense.setInputUser(SecurityUtils.getLoginUser().getNickName());
            accountExpense.setInputTime(new Date());
            accountExpenseMapper.insert(accountExpense);
        }
        return AjaxResult.success("修改成功");
    }

@@ -118,16 +145,16 @@
    }

    @Override
    public AjaxResult calculateSalary(List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)){
    public AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto) {
        if(CollectionUtils.isEmpty(calculateSalaryDto.getIds())){
            return AjaxResult.error("参数错误");
        }
        List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(ids); // é€šè¿‡éƒ¨é—¨ids获取用户信息
        List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(calculateSalaryDto.getIds()); // é€šè¿‡éƒ¨é—¨ids获取用户信息
        if(CollectionUtils.isEmpty(longs)){
            return AjaxResult.error("无员工");
        }
        for (Map<String, Object> id : longs) {
            schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id);
            schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id,calculateSalaryDto.getDate());
        }
        return AjaxResult.success(longs);
    }
@@ -139,4 +166,5 @@
        // é€šè¿‡éƒ¨é—¨èŽ·å–人员id
        return sysUserDeptMapper.setSchemeApplicableStaffUserInfo(ids);
    }

}

 src/main/resources/application-newTest.yml

@@ -15,6 +15,14 @@
  captchaType: math
  # ååŒå®¡æ‰¹ç¼–号前缀(配置文件后缀命名)
  approvalNumberPrefix: NEWTEST
  # ä¸ªæŽ¨ Unipush é…ç½®
  getui:
    appId: PfjyAAE0FK64FaO1w2CMb1
    appKey: zTMb831OEL6J4GK1uE3Ob4
    masterSecret: K1GFtsv42v61tXGnF7SGE5
    domain: https://restapi.getui.cn/v2/
    # ç¦»çº¿æŽ¨é€ä½¿ç”¨çš„包名/组件名
    intentComponent: uni.app.UNI099A590/io.dcloud.PandoraEntry
# å¼€å‘环境配置
server:
  # æœåŠ¡å™¨çš„HTTP端口，默认为8080

 src/main/resources/mapper/projectManagement/ContractInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
<?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.ruoyi.projectManagement.mapper.ContractInfoMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.ContractInfo">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="sex" column="sex" jdbcType="VARCHAR"/>
            <result property="birthday" column="birthday" jdbcType="VARCHAR"/>
            <result property="department" column="department" jdbcType="VARCHAR"/>
            <result property="job" column="job" jdbcType="VARCHAR"/>
            <result property="phoneNumber" column="phone_number" jdbcType="VARCHAR"/>
            <result property="email" column="email" jdbcType="VARCHAR"/>
            <result property="qq" column="qq" jdbcType="VARCHAR"/>
            <result property="lineaFissa" column="linea_fissa" jdbcType="VARCHAR"/>
            <result property="wx" column="wx" jdbcType="VARCHAR"/>
            <result property="origineEtnica" column="origine_etnica" jdbcType="VARCHAR"/>
            <result property="rappresentanteLegale" column="rappresentante_legale" jdbcType="VARCHAR"/>
            <result property="projectManagementInfoId" column="project_management_info_id" jdbcType="BIGINT"/>
            <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
            <result property="createUser" column="create_user" jdbcType="BIGINT"/>
            <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,name,sex,
        birthday,department,job,
        phone_number,email,qq,
        linea_fissa,wx,origine_etnica,
        rappresentante_legale,project_management_info_id,is_delete,
        create_user,update_user,create_time,
        update_time
    </sql>
</mapper>

 src/main/resources/mapper/projectManagement/InfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
<?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.ruoyi.projectManagement.mapper.InfoMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.Info">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="no" column="no" jdbcType="VARCHAR"/>
            <result property="title" column="title" jdbcType="VARCHAR"/>
            <result property="clientId" column="client_id" jdbcType="BIGINT"/>
            <result property="clientName" column="client_name" jdbcType="VARCHAR"/>
            <result property="projectManagementInfoParentId" column="project_management_info_parent_id" jdbcType="BIGINT"/>
            <result property="establishTime" column="establish_time" jdbcType="TIMESTAMP"/>
            <result property="projectManagementPlanId" column="project_management_plan_id" jdbcType="BIGINT"/>
            <result property="source" column="source" jdbcType="VARCHAR"/>
            <result property="managerId" column="manager_id" jdbcType="BIGINT"/>
            <result property="managerName" column="manager_name" jdbcType="VARCHAR"/>
            <result property="salesmanId" column="salesman_id" jdbcType="BIGINT"/>
            <result property="salesmanName" column="salesman_name" jdbcType="VARCHAR"/>
            <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="planStartTime" column="plan_start_time" jdbcType="TIMESTAMP"/>
            <result property="planEndTime" column="plan_end_time" jdbcType="TIMESTAMP"/>
            <result property="actualStartTime" column="actual_start_time" jdbcType="TIMESTAMP"/>
            <result property="actualEndTime" column="actual_end_time" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="INTEGER"/>
            <result property="departmentId" column="department_id" jdbcType="BIGINT"/>
            <result property="departmentName" column="department_name" jdbcType="VARCHAR"/>
            <result property="orderDate" column="order_date" jdbcType="TIMESTAMP"/>
            <result property="orderAmount" column="order_amount" jdbcType="VARCHAR"/>
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
            <result property="attachment" column="attachment" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,no,title,
        client_id,client_name,project_management_info_parent_id,
        establish_time,project_management_plan_id,source,
        manager_id,manager_name,salesman_id,
        salesman_name,is_delete,create_time,
        update_time,create_user,update_user,
        plan_start_time,plan_end_time,actual_start_time,
        actual_end_time,status,department_id,
        department_name,order_date,order_amount,
        remark,attachment
    </sql>
</mapper>

 src/main/resources/mapper/projectManagement/ShippingAddressMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
<?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.ruoyi.projectManagement.mapper.ShippingAddressMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.ShippingAddress">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="consignee" column="consignee" jdbcType="VARCHAR"/>
            <result property="contract" column="contract" jdbcType="VARCHAR"/>
            <result property="address" column="address" jdbcType="VARCHAR"/>
            <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="createUser" column="create_user" jdbcType="BIGINT"/>
            <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,consignee,contract,
        address,is_delete,create_time,
        update_time,create_user,update_user
    </sql>
</mapper>