代码提交

liusheng

2023-09-20 688fb1c93eabaea3facf4e7ace1b27b1bac53fbe

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -76,7 +76,7 @@
    private IServiceSystemmessageService ServiceSystemmessage;

    @Autowired
    private IServiceFundSharedService fundServiceShare;
    private IBaseOnlyvalueService baseOnlyvalueService;

    @Autowired
    private IServiceExternalpersonService externalpersonService;
@@ -545,6 +545,8 @@
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceFund.setOfficedirector(user.getNickName());
                String bh = baseOnlyvalueService.getOnlyCode("fund");
                serviceFund.setBh(bh);
            }
            serviceFundService.updateById(serviceFund);

@@ -1171,7 +1173,7 @@
            count++;
            map.put("XH", count);
            map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
            map.put("DW", f.getUnitname() == null ? "" : f.getUnitname());
            map.put("DW", f.getBeneficiaryname() == null ? "" : f.getBeneficiaryname());
            map.put("SL", f.getQuantity() == 0.00 ? "" : f.getQuantity());
            map.put("JG", f.getPrice() == 0.00 ? "" : f.getPrice());


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -75,6 +75,9 @@
    private IServiceFundService serviceFundService;

    @Autowired
    private IBaseOnlyvalueService baseOnlyvalueService;

    @Autowired
    private ISysPostService postService;

    @Autowired
@@ -632,6 +635,8 @@
            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceReimbursement.setOfficedirector(user.getNickName());
                String bh = baseOnlyvalueService.getOnlyCode("fund");
                serviceReimbursement.setBh(bh);
            }

            serviceReimbursementService.updateById(serviceReimbursement);

 ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseOnlyvalue.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼å¯¹è±¡ base_onlyvalue
 *
 * @author ruoyi
 * @date 2023-09-20
 */
@Data
@ApiModel("业务数据唯一值")
public class BaseOnlyvalue {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String businesstype;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String appentvalue;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private Long currentvalue;

}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseOnlyvalueMapper.java

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


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.BaseOnlyvalue;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼Mapper接口
 *
 * @author ruoyi
 * @date 2023-09-20
 */
@Mapper
public interface BaseOnlyvalueMapper extends BaseMapper<BaseOnlyvalue> {
    /**
     * æŸ¥è¯¢ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼åˆ—表
     *
     * @param baseOnlyvalue ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼
     * @return ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼é›†åˆ
     */
    public List<BaseOnlyvalue> selectBaseOnlyvalueList(BaseOnlyvalue baseOnlyvalue);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOnlyvalueService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.BaseOnlyvalue;

import java.util.List;

/**
 * ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼Service接口
 *
 * @author ruoyi
 * @date 2023-09-20
 */
public interface IBaseOnlyvalueService extends IService<BaseOnlyvalue> {

    /**
     * æŸ¥è¯¢ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼åˆ—表
     *
     * @param baseOnlyvalue ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼
     * @return ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼é›†åˆ
     */
    public List<BaseOnlyvalue> queryList(BaseOnlyvalue baseOnlyvalue);

    /**
     * èŽ·å–唯一编号
     *
     * @param businessType
     * @return
     */
    public String getOnlyCode(String businessType);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOnlyvalueServiceImpl.java

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.BaseOnlyvalue;
import com.ruoyi.project.mapper.BaseOnlyvalueMapper;
import com.ruoyi.project.service.IBaseOnlyvalueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.time.LocalDate;
import java.util.List;

/**
 * ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼Service业务层处理
 *
 * @author ruoyi
 * @date 2023-09-20
 */
@Service
public class BaseOnlyvalueServiceImpl extends ServiceImpl<BaseOnlyvalueMapper, BaseOnlyvalue> implements IBaseOnlyvalueService {

    @Autowired
    BaseOnlyvalueMapper baseOnlyvalueMapper;

    /**
     * æŸ¥è¯¢ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼åˆ—表
     *
     * @param baseOnlyvalue ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼
     * @return ä¸šåŠ¡æ•°æ®å”¯ä¸€å€¼
     */
    @Override
    public List<BaseOnlyvalue> queryList(BaseOnlyvalue baseOnlyvalue) {
        LambdaQueryWrapper<BaseOnlyvalue> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(baseOnlyvalue.getBusinesstype())) {
            wrappers.eq(BaseOnlyvalue::getBusinesstype, baseOnlyvalue.getBusinesstype());
        }
        if (StringUtils.isNotBlank(baseOnlyvalue.getAppentvalue())) {
            wrappers.eq(BaseOnlyvalue::getAppentvalue, baseOnlyvalue.getAppentvalue());
        }
        if (baseOnlyvalue.getCurrentvalue() != null) {
            wrappers.eq(BaseOnlyvalue::getCurrentvalue, baseOnlyvalue.getCurrentvalue());
        }
        return this.list(wrappers);
    }


    @Override
    public String getOnlyCode(String businessType) {
        LocalDate currentDate = LocalDate.now();
        int year = currentDate.getYear();
        int month = currentDate.getMonthValue();

        //通过年月日期去查询该月份是否存在
        String data = String.valueOf(year) + String.valueOf(month);
        BaseOnlyvalue baseOnlyvalue = new BaseOnlyvalue();
        baseOnlyvalue.setAppentvalue(data);


        List<BaseOnlyvalue> baseOnlyvalues = queryList(baseOnlyvalue);
        if (CollectionUtils.isEmpty(baseOnlyvalues)) {
            //如果为空的话，则往表中新增一条，将currentValue设置为1;
            //生成新的编号返回
            baseOnlyvalue.setCurrentvalue(1L);
            baseOnlyvalue.setBusinesstype(businessType);
            save(baseOnlyvalue);

            return "OPO-" + data + "1";
        } else {
            //则将currentValue+1,重新赋值
            BaseOnlyvalue baseOnlyvalue1 = baseOnlyvalues.get(0);
            long newCurrentvalue = baseOnlyvalue1.getCurrentvalue() + 1;
            baseOnlyvalue1.setCurrentvalue(newCurrentvalue);
            updateById(baseOnlyvalue1);

            return "OPO-" + data + "" + newCurrentvalue;
        }

    }

}

 ruoyi-project/src/main/resources/mapper/project/BaseOnlyvalueMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
<?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.system.mapper.BaseOnlyvalueMapper">

    <resultMap type="com.ruoyi.project.domain.BaseOnlyvalue" id="BaseOnlyvalueResult">
        <result property="id" column="id"/>
        <result property="businesstype" column="businessType"/>
        <result property="appentvalue" column="appentValue"/>
        <result property="currentvalue" column="currentValue"/>
    </resultMap>

    <sql id="selectBaseOnlyvalueVo">
        select id, businessType, appentValue, currentValue
        from base_onlyvalue
    </sql>

    <select id="selectBaseOnlyvalueList" parameterType="com.ruoyi.project.domain.BaseOnlyvalue"
            resultMap="BaseOnlyvalueResult">
        <include refid="selectBaseOnlyvalueVo"/>
        <where>
            <if test="businesstype != null  and businesstype != ''">and businessType = #{businesstype}</if>
            <if test="appentvalue != null  and appentvalue != ''">and appentValue = #{appentvalue}</if>
            <if test="currentvalue != null ">and currentValue = #{currentvalue}</if>
        </where>
    </select>

</mapper>