Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-10-18 a5789be508f38ec2c591b618cd15ee998f79a17c

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/controller/PipeReportController.java

对比新文件
@@ -0,0 +1,31 @@
package com.thhy.secure.modules.biz.pipereport.controller;

import com.thhy.general.common.BasicResult;
import com.thhy.secure.modules.biz.pipereport.service.PipeReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-17 17:13:01
 * 管片报表控制层
 */
@RestController
@RequestMapping(value = "szpipereport")
public class PipeReportController {

    @Autowired
    private PipeReportService pipeReportService;

    @PostMapping(value = "pipeReport")
    public BasicResult pipeReport(@RequestBody Map<String,Object> map){
        return pipeReportService.getPipeReportList(map);
    }

    @PostMapping(value = "steelReport")
    public BasicResult steelReport(@RequestBody Map<String,Object> map){
        return pipeReportService.getSteelReportList(map);
    }
}

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/entity/PipeReportEntity.java

对比新文件
@@ -0,0 +1,51 @@
package com.thhy.secure.modules.biz.pipereport.entity;

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

import java.io.Serializable;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-17 17:19:23
 * 管片报表实体
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class PipeReportEntity implements Serializable {
    /**
     * 项目名称
     */
    private String proName;
    private String proId;

    /**
     * 生产总数
     */
    private Integer produceTotal;

    /**
     * 合格总数
     */
    private Integer qualifiedTotal;

    /**
     * 未入模数量
     */
    private Integer moldedNotNum;

    /**
     * 入模数量
     */
    private Integer moldedNum;

    /**
     * 发运数量
     */
    private Integer shippingNum;

}

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/mapper/PipeReportMapper.java

对比新文件
@@ -0,0 +1,28 @@
package com.thhy.secure.modules.biz.pipereport.mapper;

import com.thhy.secure.modules.biz.pipereport.entity.PipeReportEntity;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-18 8:46:07
 * 管片、钢筋笼报表mapper
 */
@Mapper
public interface PipeReportMapper {

    /**
     * 管片生产报表
     * @return
     */
    List<PipeReportEntity> getPipeReportList(Map<String,Object> map);

    /**
     * 钢筋笼生产报表
     * @return
     */
    List<PipeReportEntity> getSteelReportList(Map<String,Object> map);
}

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/PipeReportService.java

对比新文件
@@ -0,0 +1,17 @@
package com.thhy.secure.modules.biz.pipereport.service;

import com.thhy.general.common.BasicResult;

import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-18 9:18:18
 */
public interface PipeReportService {

    BasicResult getPipeReportList(Map<String,Object> map);

    BasicResult getSteelReportList(Map<String,Object> map);

}

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/impl/PipeReportServiceImpl.java

对比新文件
@@ -0,0 +1,48 @@
package com.thhy.secure.modules.biz.pipereport.service.impl;

import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.secure.modules.biz.pipereport.entity.PipeReportEntity;
import com.thhy.secure.modules.biz.pipereport.mapper.PipeReportMapper;
import com.thhy.secure.modules.biz.pipereport.service.PipeReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-18 9:22:33
 * 管片和钢筋笼报表实现
 */
@Service
public class PipeReportServiceImpl implements PipeReportService
{

    @Autowired
    private PipeReportMapper pipeReportMapper;

    @Override
    public BasicResult getPipeReportList(Map<String,Object> map) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        map.put("companyId",companyId);
        PageHelper.startPage((Integer) map.get("pageNum"),(Integer)map.get("pageSize"));
        List<PipeReportEntity> pipeReportList = pipeReportMapper.getPipeReportList(map);
        return BasicResult.success(new PageInfo<PipeReportEntity>(pipeReportList));
    }

    @Override
    public BasicResult getSteelReportList(Map<String, Object> map) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        map.put("companyId",companyId);
        PageHelper.startPage((Integer) map.get("pageNum"),(Integer)map.get("pageSize"));
        List<PipeReportEntity> steelReportList = pipeReportMapper.getSteelReportList(map);
        return BasicResult.success(new PageInfo<PipeReportEntity>(steelReportList));
    }
}