项目审核

fuliqi

2025-02-07 25d1cb5f63e95da7702ba2c02231cdb8583f11af

项目审核

 business/src/main/java/com/ycl/domain/entity/ProjectInfo.java

@@ -148,4 +148,7 @@
    @TableField("coding")
    /** 编码 */
    private String coding;
    @TableField("remark")
    /** 审核信息 */
    private String remark;
}

 business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java

@@ -127,6 +127,7 @@
    @ApiModelProperty("赋码")
    private String coding;

    private String remark;
    public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) {
        if(entity == null) {
          entity = new ProjectInfo();

 business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java

@@ -50,7 +50,10 @@
    //从有没有流程判断是存储还是早期
    private String reserveOrPrevious;
    private Integer role;// 业主：0，审核：1
    private Long createBy;
    //查询条件业主单位
    private Long projectOwnerUnit;
    private Integer usedStatus;
    //查询条件主管部门
    private Long competentDepartment;
}


 business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java

@@ -162,6 +162,8 @@

    @ApiModelProperty("文件")
    private List<File> fileList;
    private Integer usedStatus;
    private String remark;
    private Long processId;
    private ProjectInvestmentInfoVO projectInvestmentInfo;
    private ProjectInvestmentFundingVO projectInvestmentFunding;

 business/src/main/java/com/ycl/domain/vo/ProjectVO.java

@@ -14,6 +14,6 @@
    private String coding;
    private List<Long> competentDepartmentList;
    private List<String> managementCentralizationList;

    private String remark;
    private Long processId;
}

 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

@@ -49,6 +49,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.ServletOutputStream;
@@ -237,15 +238,17 @@
        Long userId = SecurityUtils.getUserId();
        String ancestors = sysDeptMapper.selectAncestors(userId);
        String[] ancestorArr = ancestors.split(",");
//        for (String ancestor : ancestorArr) {
//            if ("101".equals(ancestor)) { // 业主
//                query.setCreateBy(userId);
//                query.setRole(0);
//            } else if ("102".equals(ancestor)) { // 审批
//                query.setUsedStatus(1);
//                query.setRole(1);
//            }
//        }
        List<String> ancestorList = Arrays.stream(ancestorArr).collect(Collectors.toList());
        ancestorList.add(SecurityUtils.getDeptId()+"");
        if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")){
            query.setProjectOwnerUnit(SecurityUtils.getDeptId());
            //业主
            query.setRole(0);
        }else if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")){
            query.setCompetentDepartment(SecurityUtils.getDeptId());
            //审批 对应主管部门
            query.setRole(1);
        }

        IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
        baseMapper.getPage(query, page);
@@ -393,8 +396,6 @@
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "省"));
        indexCountVO.setImpTypeCountVO(impTypeCountVO);


        return indexCountVO;
    }


 business/src/main/resources/mapper/ProjectInfoMapper.xml

@@ -45,6 +45,7 @@
            TPI.gmt_update,
            TPI.update_by,
            TPI.create_by,
            TPI.remark,
            TPI.id
        FROM
            t_project_info TPI
@@ -103,7 +104,7 @@
        LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0
        LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0
        LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
        LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
--         LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
        <where>
            TPI.deleted = 0
            <if test="query.projectName !=null and query.projectName!=''">
@@ -151,21 +152,25 @@
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
                and TPP.process_ins_id is not null
            </if>
<!--            <if test="query.projectCategory == null">-->
<!--                and TPI.used_status = 2-->
<!--            </if>-->
            <if test="query.projectCategory != 6">
                and TPI.used_status = 2
            </if>
            <if test="query.projectCategory == 3">
                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
            </if>
            <!-- 业主数据权限 -->
            <if test="query.role == 0">
                and TPI.project_owner_unit = #{query.projectOwnerUnit}
            </if>
            <if test="query.projectCategory == 6">
                <if test="query.role == 0">
                    and TPI.create_by = #{query.createBy}
                    and TPI.used_status != 2
                </if>
                <if test="query.role == 1">
                    and TPI.used_status = #{query.usedStatus}
                    and TPI.used_status = 1 and TPI.competent_department like concat('%',#{query.competentDepartment},'%')
                </if>
            </if>
            ${query.params.dataScope}
            <!--${query.params.dataScope}-->
        </where>
        order by TPI.gmt_create
    </select>