霍煤报表 ：

原铝铁含量台账统计；
原铝杂质台账统计；

src/main/java/com/patzn/cloud/service/lims/common/DateKit.java

 package com.patzn.cloud.service.lims.common;
 
+import com.patzn.cloud.commons.constant.CommonConstants;
+
 import java.time.LocalDate;
 import java.time.Period;
 import java.time.ZoneId;
@@ -72,4 +74,23 @@ public class DateKit {
         }
         return monthList;
     }
+
+    public static List<String> dateBetweenTwoDates(LocalDate start, LocalDate end) {
+        if (null == start || null == end) {
+            return null;
+        }
+        String pattern = CommonConstants.YEAR_MONTH_DAY;
+        List<String> dateList = new ArrayList<>();
+        LocalDate localDate = start;
+        while (localDate.isBefore(end)) {
+            dateList.add(localDate.format(DateTimeFormatter.ofPattern(pattern)));
+            localDate = localDate.plusDays(1);
+        }
+        return dateList;
+    }
+
+    public static List<String> dateInMonth(String yearMonth) {
+        LocalDate start = LocalDate.parse(yearMonth + "-01", DateTimeFormatter.ofPattern(CommonConstants.YEAR_MONTH_DAY));
+        return dateBetweenTwoDates(start, start.plusMonths(1));
+    }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleController.java

@@ -15,7 +15,7 @@ import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
-import com.patzn.cloud.service.hmhj.vo.AlTasteStatsVO;
+import com.patzn.cloud.service.hmhj.vo.AlGradeStatsVO;
 import com.patzn.cloud.service.hmhj.vo.ElectrolyteRatioStatsVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
@@ -588,9 +588,9 @@ public class EntrustSampleController extends ServiceController {
     }
 
     @ApiOperation("原铝品味统计查询")
-    @PostMapping("/al_taste_stats_query")
-    public RestResult<List<AlTasteStatsVO>> getAlTasteStatsQuery(StatsQueryDTO statsQueryDTO) {
-        return success(entrustSampleService.getAlTasteStatsQuery(statsQueryDTO));
+    @PostMapping("/al_grade_stats_query")
+    public RestResult<List<AlGradeStatsVO>> getAlGradeStatsQuery(StatsQueryDTO statsQueryDTO) {
+        return success(entrustSampleService.getAlGradeStatsQuery(statsQueryDTO));
     }
 
     @ApiOperation("电解质分子比统计查询")

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/StatisticsController.java

@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.commons.api.RestResult;
 import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.hmhj.dto.LedgerQueryDTO;
 import com.patzn.cloud.service.hmhj.dto.QueryDTO;
 import com.patzn.cloud.service.hmhj.dto.RangeStatsQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.Statistics;
@@ -38,7 +39,7 @@ public class StatisticsController extends ServiceController {
 
     @ApiOperation("报告发放量统计")
     @PostMapping("/report_send_quantity")
-    public RestResult<Map<String,Object>> getReportSendQuantity(RangeStatsQueryDTO queryDTO) {
+    public RestResult<Map<String, Object>> getReportSendQuantity(RangeStatsQueryDTO queryDTO) {
         return success(statsService.getReportSendQuantity(queryDTO));
     }
 
@@ -91,4 +92,41 @@ public class StatisticsController extends ServiceController {
         return success(statsService.getAlBrandsRate(queryDTO));
     }
 
+    @ApiOperation("原铝品味台账")
+    @PostMapping("/al_grade_ledger")
+    public RestResult<List<Map>> getAlGradeLedger(LedgerQueryDTO ledgerQueryDTO) {
+        return success(statsService.getAlGradeLedger(ledgerQueryDTO));
+    }
+
+    @ApiOperation("原铝品位台账统计表")
+    @PostMapping("/al_grade_ledger_stats")
+    public RestResult<List<Map>> getAlGradeLedgerStats(LedgerQueryDTO ledgerQueryDTO) {
+        return success(statsService.getAlGradeLedgerStats(ledgerQueryDTO));
+    }
+
+    @ApiOperation("原铝杂质含量台账")
+    @PostMapping("/al_impurity_ledger")
+    public RestResult<List<Map>> getAlImpurityLedger(LedgerQueryDTO ledgerQueryDTO) {
+        return success(statsService.getAlImpurityLedger(ledgerQueryDTO));
+    }
+
+    @ApiOperation("原铝杂质含量台账统计表")
+    @PostMapping("/al_impurity_ledger_stats")
+    public RestResult<List<Map>> getAlImpurityLedgerStats(LedgerQueryDTO ledgerQueryDTO) {
+        return success(statsService.getAlImpurityLedgerStats(ledgerQueryDTO));
+    }
+
+    @ApiOperation("原铝铁含量统计表")
+    @PostMapping("/al_fe_ledger_stats")
+    public RestResult<List<Map>> getAlFeLedgerStats(LedgerQueryDTO ledgerQueryDTO) {
+        return success(statsService.getAlFeLedgerStats(ledgerQueryDTO));
+    }
+
+
+    @ApiOperation("汇总统计表")
+    @PostMapping("/summary_ledger_stats")
+    public RestResult<List<Map>> getSummaryLedgerStats(LedgerQueryDTO ledgerQueryDTO) {
+        return success(statsService.getSummaryLedgerStats(ledgerQueryDTO));
+    }
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleMapper.java

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
 import com.baomidou.mybatisplus.annotations.SqlParser;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.mapper.BatchMapper;
 import com.patzn.cloud.service.hmhj.dto.QueryDTO;
 import com.patzn.cloud.service.hmhj.dto.StatsQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
-import com.patzn.cloud.commons.mapper.BatchMapper;
 import com.patzn.cloud.service.hmhj.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -32,7 +31,7 @@ public interface EntrustSampleMapper extends BatchMapper<EntrustSample> {
     List<EntrustSampleVO> selectTestResultQuery(RowBounds rowBounds, @Param("vo") EntrustSampleVO entrustSample);
 
     @SqlParser(filter = true)
-    List<AlTasteStatsVO> selectAlTasteStats(@Param("vo") StatsQueryDTO queryDTO);
+    List<AlGradeStatsVO> selectAlGradeStats(@Param("vo") StatsQueryDTO queryDTO);
 
     List<ElectrolyteRatioStatsVO> selectElectrolyteRatioStats(@Param("vo") QueryDTO queryDTO);
 

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/StatisticsMapper.java

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
+import com.baomidou.mybatisplus.annotations.SqlParser;
 import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.dto.LedgerQueryDTO;
 import com.patzn.cloud.service.hmhj.dto.QueryDTO;
 import com.patzn.cloud.service.hmhj.dto.RangeStatsQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.Statistics;
+import com.patzn.cloud.service.hmhj.vo.DailyStatsLedgerVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,4 +34,20 @@ public interface StatisticsMapper extends BatchMapper<Statistics> {
     Statistics selectReportSendQuantity(@Param("vo") RangeStatsQueryDTO queryDTO);
 
     List<Statistics> selectEntrustedQuantity(QueryDTO queryDTO);
+
+    @SqlParser(filter = true)
+    List<DailyStatsLedgerVO> selectAlGradeLedger(@Param("vo") LedgerQueryDTO ledgerQueryDTO);
+
+    @SqlParser(filter = true)
+    List<DailyStatsLedgerVO> selectAlGradeLedgerStats(@Param("vo") LedgerQueryDTO ledgerQueryDTO);
+
+    @SqlParser(filter = true)
+    List<DailyStatsLedgerVO> selectAlImpurityLedger(@Param("vo") LedgerQueryDTO ledgerQueryDTO);
+
+    @SqlParser(filter = true)
+    List<DailyStatsLedgerVO> selectAlFeLedgerStats(@Param("vo") LedgerQueryDTO ledgerQueryDTO);
+
+    @SqlParser(filter = true)
+    List<DailyStatsLedgerVO> selectAlImpurityLedgerStats(@Param("vo") LedgerQueryDTO ledgerQueryDTO);
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java

@@ -11,7 +11,7 @@ import com.patzn.cloud.service.hmhj.dto.StatsQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustFlowEnum;
-import com.patzn.cloud.service.hmhj.vo.AlTasteStatsVO;
+import com.patzn.cloud.service.hmhj.vo.AlGradeStatsVO;
 import com.patzn.cloud.service.hmhj.vo.ElectrolyteRatioStatsVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.hmhj.vo.ReportSampleVO;
@@ -65,7 +65,7 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
 
     int countByEntrustId(Long id);
 
-    List<AlTasteStatsVO> getAlTasteStatsQuery(StatsQueryDTO queryDTO);
+    List<AlGradeStatsVO> getAlGradeStatsQuery(StatsQueryDTO queryDTO);
 
     List<ElectrolyteRatioStatsVO> getElectrolyteRatioStatsQuery(QueryDTO queryDTO);
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IStatisticsService.java

 package com.patzn.cloud.service.lims.hmhj.service;
 
 import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.dto.LedgerQueryDTO;
 import com.patzn.cloud.service.hmhj.dto.QueryDTO;
 import com.patzn.cloud.service.hmhj.dto.RangeStatsQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.Statistics;
@@ -33,4 +34,17 @@ public interface IStatisticsService extends IBaseService<Statistics> {
     List<Statistics> getCurWeekAcceptanceQualified(QueryDTO queryDTO);
 
     List<Statistics> getCurWeekCarbonBlocks(QueryDTO queryDTO);
+
+    List<Map> getAlGradeLedger(LedgerQueryDTO ledgerQueryDTO);
+
+    List<Map> getAlGradeLedgerStats(LedgerQueryDTO ledgerQueryDTO);
+
+    List<Map> getAlImpurityLedger(LedgerQueryDTO ledgerQueryDTO);
+
+    List<Map> getAlImpurityLedgerStats(LedgerQueryDTO ledgerQueryDTO);
+
+    List<Map> getAlFeLedgerStats(LedgerQueryDTO ledgerQueryDTO);
+
+    List<Map> getSummaryLedgerStats(LedgerQueryDTO ledgerQueryDTO);
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -1117,7 +1117,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
 
                 // 样品判定合格
                 updateSampleList.add(sample.setOkJudge("合格").setJudger(account.getUserName()).setJudgerId(account.getUserId())
-                        .setJudgeCheckTime(new Date()).setJudgeStatus(0).setJudgeProgress(0)
+                        .setJudgeTime(new Date()).setJudgeStatus(0).setJudgeProgress(0)
                         .setSampleGrading(product.getProductGrade()));
                 break;
             }
@@ -1262,7 +1262,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
      */
     private void updateJudgeNoPass(EntrustSample sample, Account account, List<EntrustSample> sampleList) {
         sampleList.add(sample.setOkJudge("不合格").setJudger(account.getUserName()).setJudgerId(account.getUserId())
-                .setJudgeCheckTime(new Date()).setJudgeStatus(0).setJudgeProgress(0)
+                .setJudgeTime(new Date()).setJudgeStatus(0).setJudgeProgress(0)
                 .setSampleGrading("-"));
     }
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java

@@ -253,11 +253,11 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return new BigDecimal(d).setScale(2, RoundingMode.UP).doubleValue();
     }
 
-    private AlTasteStatsVO getTotalData(List<AlTasteStatsVO> voList) {
-        AlTasteStatsVO bpStatsVO = new AlTasteStatsVO();
+    private AlGradeStatsVO getTotalData(List<AlGradeStatsVO> voList) {
+        AlGradeStatsVO bpStatsVO = new AlGradeStatsVO();
         bpStatsVO.setPlant("合计");
         bpStatsVO.setBranch(voList.get(0).getBranch());
-        for (AlTasteStatsVO t : voList) {
+        for (AlGradeStatsVO t : voList) {
             bpStatsVO.setTotal(getValSum(bpStatsVO.getTotal(), t.getTotal()));
             bpStatsVO.setSlotsNum(getValSum(bpStatsVO.getSlotsNum(), t.getSlotsNum()));
             // ==
@@ -289,26 +289,26 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
     @Override
-    public List<AlTasteStatsVO> getAlTasteStatsQuery(StatsQueryDTO queryDTO) {
+    public List<AlGradeStatsVO> getAlGradeStatsQuery(StatsQueryDTO queryDTO) {
         RestAssert.fail(null == queryDTO.getTimeS() || null == queryDTO.getTimeE(), "开始或结束时间为空");
         long days = DateUtils.getDaysBetweenTwoDate(queryDTO.getTimeS(), queryDTO.getTimeE());
         queryDTO.setDays(days);
-        List<AlTasteStatsVO> list = baseMapper.selectAlTasteStats(queryDTO);
+        List<AlGradeStatsVO> list = baseMapper.selectAlGradeStats(queryDTO);
 
         if (CollectionUtils.isEmpty(list)) {
             return list;
         }
 
-        List<AlTasteStatsVO> resultList = new ArrayList<>();
-        Map<String, List<AlTasteStatsVO>> dataMap = new HashMap<>();
+        List<AlGradeStatsVO> resultList = new ArrayList<>();
+        Map<String, List<AlGradeStatsVO>> dataMap = new HashMap<>();
 
         for (int i = 0; i < list.size(); i++) {
-            AlTasteStatsVO curr = list.get(i);
+            AlGradeStatsVO curr = list.get(i);
             // 以【分厂】作为获取上一条记录的KEY
             String key = curr.getBranch();
             // 是否存在同KEY数据
             if (dataMap.containsKey(key)) {
-                List<AlTasteStatsVO> voList = dataMap.get(key);
+                List<AlGradeStatsVO> voList = dataMap.get(key);
                 voList.add(curr);
                 // 若当前的条数为最后一条，那么处理统计数据
                 if (i == list.size() - 1) {
@@ -322,15 +322,15 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
             else {
                 // 是否需要取出数据处理
                 if (i > 0) {
-                    AlTasteStatsVO prev = list.get(i - 1);
-                    List<AlTasteStatsVO> voList = dataMap.get(prev.getBranch());
+                    AlGradeStatsVO prev = list.get(i - 1);
+                    List<AlGradeStatsVO> voList = dataMap.get(prev.getBranch());
                     // 将列表数据加入集合中
                     resultList.addAll(voList);
                     // 将统计数据加入集合中
                     resultList.add(getTotalData(voList));
                 }
                 // 将当前数据加入mapData中
-                List<AlTasteStatsVO> voList = new ArrayList<>();
+                List<AlGradeStatsVO> voList = new ArrayList<>();
                 if (i == list.size() - 1) {
                     resultList.add(curr);
                     voList.add(curr);
@@ -342,9 +342,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
             }
         }
         // 汇总所有查询出的列表数据
-        AlTasteStatsVO alTasteStatsVO = getTotalData(list);
-        alTasteStatsVO.setBranch(null);
-        resultList.add(alTasteStatsVO);
+        AlGradeStatsVO alGradeStatsVO = getTotalData(list);
+        alGradeStatsVO.setBranch(null);
+        resultList.add(alGradeStatsVO);
         return resultList;
     }
 

src/main/resources/mapper/hmhj/EntrustSampleMapper.xml

@@ -180,7 +180,7 @@
     </select>
 
     <!--原铝品味统计查询-->
-    <select id="selectAlTasteStats" resultType="com.patzn.cloud.service.hmhj.vo.AlTasteStatsVO">
+    <select id="selectAlGradeStats" resultType="com.patzn.cloud.service.hmhj.vo.AlGradeStatsVO">
         with ix as (
             SELECT
                 s.id "sample_id",

src/test/java/com/patzn/cloud/service/lims/test/Test.java

 package com.patzn.cloud.service.lims.test;
 
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import com.patzn.cloud.service.lims.common.DateKit;
 
-import java.io.File;
-import java.io.IOException;
+import java.util.List;
 
 public class Test {
     public static void main(String[] args) {
-        File file = new File("D:\\pxj\\生铁中硅.xlsx");
-
-        try {
-            XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file);
-            XSSFSheet sheet= xssfWorkbook.getSheetAt(0);
-            String sheetName= sheet.getSheetName();
-            System.out.println(sheetName);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (InvalidFormatException e) {
-            e.printStackTrace();
-        }
+        List<String> dateList = DateKit.dateInMonth("2021-09");
+        dateList.stream().forEach(System.out::print);
     }
 }