受控文件功能开发升级

op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java

@@ -651,4 +651,20 @@ public class QcStaticTableController extends BaseController {
             }
         }
     }
+    /**
+     * cpk分析--表头
+     **/
+    @GetMapping("/getTableCPKTitle")
+    @Log(title = "CPK分析报表-表头", businessType = BusinessType.QUERY)
+    public QcCPKInfo getTableCPKTitle(QcCPKInfo qcCPKInfo) {
+        return qcStaticTableService.getTableCPKTitle(qcCPKInfo);
+    }
+    /**
+     * cpk分析--表体
+     **/
+    @GetMapping("/getTableCPKList")
+    @Log(title = "CPK分析报表-表格数据", businessType = BusinessType.QUERY)
+    public List<HashMap> getTableCPKList(QcCPKInfo qcCPKInfo) {
+        return qcStaticTableService.getTableCPKList(qcCPKInfo);
+    }
 }

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCPKInfo.java

@@ -36,7 +36,33 @@ public class QcCPKInfo extends BaseEntity {
     private String ruleName;
     private String actualValue;
     List<HashMap> mxData;
+    private String tableType;//
+    private BigDecimal upperDiff;
+    private BigDecimal downDiff;
 
+    public BigDecimal getUpperDiff() {
+        return upperDiff;
+    }
+
+    public void setUpperDiff(BigDecimal upperDiff) {
+        this.upperDiff = upperDiff;
+    }
+
+    public BigDecimal getDownDiff() {
+        return downDiff;
+    }
+
+    public void setDownDiff(BigDecimal downDiff) {
+        this.downDiff = downDiff;
+    }
+
+    public String getTableType() {
+        return tableType;
+    }
+
+    public void setTableType(String tableType) {
+        this.tableType = tableType;
+    }
 
     public String getIncomeTime() {
         return incomeTime;

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java

@@ -188,11 +188,19 @@ public class QcCheckReportIncome extends BaseEntity {
     private String shiftId;
     private String orderType;
     private String standardNo;
-
+    private String fileNo;
     private String jgy;
     private String cxzz;
     private String pgy;
 
+    public String getFileNo() {
+        return fileNo;
+    }
+
+    public void setFileNo(String fileNo) {
+        this.fileNo = fileNo;
+    }
+
     public String getCxzz() {
         return cxzz;
     }

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java

@@ -24,6 +24,7 @@ public class QcCheckTaskProduce extends BaseEntity {
      */
     private String recordId;
     private String standardNo;
+    private String fileNo;
     /**
      * 检验任务编号
      */
@@ -216,6 +217,14 @@ public class QcCheckTaskProduce extends BaseEntity {
         this.standardNo = standardNo;
     }
 
+    public String getFileNo() {
+        return fileNo;
+    }
+
+    public void setFileNo(String fileNo) {
+        this.fileNo = fileNo;
+    }
+
     public String getBz() {
         return bz;
     }

op-modules/op-quality/src/main/java/com/op/quality/mapper/QMSFileMapper.java

@@ -19,4 +19,6 @@ public interface QMSFileMapper {
     int insertBaseFileBatch(@Param("baseFiles") List<BaseFileData> baseFiles);
 
     List<BaseFile> getBaseFileBatch(String recordId);
+
+    void clearBaseFileBatch(String recordId);
 }

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java

@@ -107,4 +107,7 @@ public interface QcStaticTableMapper {
     String getActualValues(QcCPKInfo qcCPKInfo);
 
     List<QcCPKInfo> getDlMxList(QcCPKInfo qcCPKInfo);
+    List<QcStaticTable> getDLData(QcStaticTable qcStaticTable);
+
+    List<QcCPKInfo> getCpkTypeList(QcCPKInfo qcCPKInfo);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java

@@ -72,4 +72,7 @@ public interface IQcStaticTableService {
 
     QcCPKInfo getDLTableMXTitle(QcCPKInfo qcCPKInfo);
     List<HashMap> getDLTableMXList(QcCPKInfo qcCPKInfo);
+
+    QcCPKInfo getTableCPKTitle(QcCPKInfo qcCPKInfo);
+    List<HashMap> getTableCPKList(QcCPKInfo qcCPKInfo);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java

@@ -53,10 +53,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
     @DS("#header.poolName")
     public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
         QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
-        //查找受控文件--standardNo
-        String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto);
-        if(StringUtils.isNotBlank(standardNo)){
-            dto.setStandardNo(standardNo);
+        //查找受控文件--fileNo
+        String fileNo = qcCheckReportIncomeMapper.getStandardNo(dto);
+        if(StringUtils.isNotBlank(fileNo)){
+            dto.setFileNo(fileNo);
         }
         return dto;
     }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportInventoryServiceImpl.java

@@ -53,10 +53,10 @@ public class QcCheckReportInventoryServiceImpl implements IQcCheckReportInventor
     @DS("#header.poolName")
     public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
         QcCheckReportIncome dto =  qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
-        //查找受控文件--standardNo
-        String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto);
-        if(StringUtils.isNotBlank(standardNo)){
-            dto.setStandardNo(standardNo);
+        //查找受控文件--fileNo
+        String fileNo = qcCheckReportIncomeMapper.getStandardNo(dto);
+        if(com.op.common.core.utils.StringUtils.isNotBlank(fileNo)){
+            dto.setFileNo(fileNo);
         }
         return dto;
     }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java

@@ -59,10 +59,10 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
     @DS("#header.poolName")
     public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
         QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
-        //查找受控文件--standardNo
-        String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto);
-        if(StringUtils.isNotBlank(standardNo)){
-            dto.setStandardNo(standardNo);
+        //查找受控文件--fileNo
+        String fileNo = qcCheckReportIncomeMapper.getStandardNo(dto);
+        if(com.op.common.core.utils.StringUtils.isNotBlank(fileNo)){
+            dto.setFileNo(fileNo);
         }
         return dto;
     }
@@ -215,7 +215,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
     public QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce) {
         QcCheckTaskProduce produce = qcCheckReportIncomeMapper.getTopInfo(qcCheckTaskProduce);
 
-        //查找受控文件--standardNo
+        //查找受控文件--fileNo
         QcCheckReportIncome dto0 = new QcCheckReportIncome();
         String dateFormat = "yyyy-MM-dd";
 
@@ -233,9 +233,9 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
         }
 
         dto0.setCheckType("checkTypeSCXJ");
-        String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto0);
-        if(StringUtils.isNotBlank(standardNo)){
-            produce.setStandardNo(standardNo);
+        String fileNo = qcCheckReportIncomeMapper.getStandardNo(dto0);
+        if(StringUtils.isNotBlank(fileNo)){
+            produce.setFileNo(fileNo);
         }
 
         //批次号去重

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java

@@ -52,10 +52,10 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer
     @DS("#header.poolName")
     public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
         QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
-        //查找受控文件--standardNo
-        String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto);
-        if(StringUtils.isNotBlank(standardNo)){
-            dto.setStandardNo(standardNo);
+        //查找受控文件--fileNo
+        String fileNo = qcCheckReportIncomeMapper.getStandardNo(dto);
+        if(com.op.common.core.utils.StringUtils.isNotBlank(fileNo)){
+            dto.setFileNo(fileNo);
         }
         //汇总批次号
         List<String> batchs = qcCheckReportIncomeMapper.getBatchsByTaskId(recordId);

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -929,6 +929,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality()));
 			//上传附件
 			if (StringUtils.isNotEmpty(detail.getFileListStr())) {
+				qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理
 				String[] ids = detail.getFileListStr().split(",");
 				List<BaseFileData> files = new ArrayList<>();
 				BaseFileData file = null;

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java

@@ -236,6 +236,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
         //List<QcCPKInfo> myObjectList = convertList(mapData);
         return mapData;
     }
+
     @Override
     @DS("#header.poolName")
     public QcCPKInfo getDLTableMXTitle(QcCPKInfo qcCPKInfo) {
@@ -1246,7 +1247,70 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
 //
 //        return myObjectList;
 //    }
+    /***********CPK分析报表**********/
+    @Override
+    @DS("#header.poolName")
+    public QcCPKInfo getTableCPKTitle(QcCPKInfo qcCPKInfo) {
+        QcCPKInfo dto = new QcCPKInfo();
+        List<String> colName1 = null;
+        if("week".equals(qcCPKInfo.getTableType())){//周报
+
+        }else{//月报
+            colName1 = this.getMonthByMonth(qcCPKInfo.getYmArrayStart(),qcCPKInfo.getYmArrayEnd());
+        }
+
+        dto.setTitleCol1(colName1);
+        return dto;
+    }
+    @Override
+    @DS("#header.poolName")
+    public List<HashMap> getTableCPKList(QcCPKInfo qcCPKInfo) {
+        List<String> colNameArray = null;
+        if("week".equals(qcCPKInfo.getTableType())){//周报
 
+        }else{//月报
+            colNameArray = this.getMonthByMonth(qcCPKInfo.getYmArrayStart(),qcCPKInfo.getYmArrayEnd());
+        }
+        List<HashMap> mapData = new ArrayList<HashMap>();
+        //列表数据
+        //主列
+        List<QcCPKInfo> cpkTypeList = qcStaticTableMapper.getCpkTypeList(qcCPKInfo);
+        //数据列
+        List<QcCPKInfo> dxData = qcStaticTableMapper.getDlMxList(qcCPKInfo);
+
+        HashMap dmap = null;
+        for(QcCPKInfo cpkInfo:dxData){
+//            dmap = new HashMap();
+//            double USL =  dto.getUpperDiff().doubleValue();
+//            double LSL = dto.getDownDiff().doubleValue();
+//            double cpk = calculateCpk(data,USL,LSL);
+//            BigDecimal cpkVal = new BigDecimal(Double.toString(cpk)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//            for(int m=0;m<colNameArray.size();m++){
+//                String index = (m+1)+"";
+//                    dmap.put("date"+index,cpkVal);
+//            }
+
+            mapData.add(dmap);
+        }
+        //List<QcCPKInfo> myObjectList = convertList(mapData);
+        return mapData;
+    }
+
+    //获取指定范围内得月份输出格式yyyy-mm
+    private List<String> getMonthByMonth(String startM,String endM){
+        YearMonth start = YearMonth.of(Integer.parseInt(startM.split("-")[0]), Integer.parseInt(startM.split("-")[1]));
+        YearMonth end = YearMonth.of(Integer.parseInt(endM.split("-")[0]), Integer.parseInt(endM.split("-")[1]));
+
+        List<String> months = new ArrayList<>();
+        YearMonth current = start;
+
+        while (!current.isAfter(end)) {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+            months.add(current.format(formatter));
+            current = current.plusMonths(1);
+        }
+        return months;
+    }
     public static void main(String args[]){
         String ymd = "1、0.4016";
         System.out.println(ymd.substring(2));

op-modules/op-quality/src/main/resources/mapper/quality/QMSFileMapper.xml

@@ -39,6 +39,9 @@
             )
         </foreach>
     </insert>
+    <delete id="clearBaseFileBatch">
+        delete from base_file where source_id = #{sourceId}
+    </delete>
     <select id="getBaseFileBatch" resultMap="BaseFileResult">
         <include refid="selectBaseFileVo"/>
         where source_id = #{recordId}

op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml

@@ -461,6 +461,48 @@
         ) t0 left join base_product bp on bp.product_code = t0.materialCode
         where t0.quality is not null
     </select>
+
+    <select id="getDLData" resultType="com.op.quality.domain.QcStaticTable">
+        SELECT
+        concat(q.material_code,'-',q.project_no,'-',CONVERT(varchar(10),q.ymdms, 120)) yearMonth,
+        material_code materialCode,
+        ymdms,rule_name ruleName,
+        project_no projectNo,
+        STUFF(
+            (SELECT ',' + t.actual_value
+            FROM (select
+            bpa.cpk_type cpkType,
+            CONVERT(varchar(7),qct.income_time, 120) ymdms,
+            qctd.rule_name, qctd.project_no,qctd.actual_value
+            from qc_check_task qct
+            left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to
+            left join base_product_attached bpa on concat('0000000',bpa.product_code) = qct.material_code
+            where qct.check_type = #{checkType} and qctd.property_code = '1' and qct.check_time is not null
+            <if test="ymArrayStart != null ">and CONVERT(varchar(7),qct.income_time, 120) >= #{ymArrayStart}</if>
+            <if test="ymArrayEnd != null ">and #{ymArrayEnd} >=CONVERT(varchar(7),qct.income_time,120) </if>
+            and qctd.project_id = #{projectId} and bpa.cpk_type = #{cpkType}
+            ) t
+            WHERE t.cpkType = q.cpkType and t.project_no = q.project_no and t.ymdms=q.ymdms
+            FOR xml path('')
+            ),1,1,''
+        ) quality
+        FROM (
+            select
+            bpa.cpk_type cpkType,
+            CONVERT(varchar(7),qct.income_time, 120) ymdms,
+            qctd.rule_name,qctd.project_no,qctd.actual_value
+            from qc_check_task qct
+            left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to
+            left join base_product_attached bpa on concat('0000000',bpa.product_code) = qct.material_code
+            where qct.check_type = #{checkType} and qctd.property_code = '1' and qct.check_time is not null
+                <if test="ymArrayStart != null ">and CONVERT(varchar(7),qct.income_time, 120) >= #{ymArrayStart}</if>
+                <if test="ymArrayEnd != null ">and #{ymArrayEnd}>=CONVERT(varchar(7),qct.income_time,120) </if>
+            and qctd.project_id = #{projectId} and bpa.cpk_type = #{cpkType}
+        ) q
+        GROUP BY q.cpkType, q.ymdms,q.rule_name,q.project_no
+
+    </select>
+
     <select id="getProjectList" resultType="com.op.quality.domain.QcStaticTable">
 		select qcp.id recordId,
 			   qcp.rule_name ruleName
@@ -885,4 +927,10 @@
         <if test="ymArrayEnd != null ">and  #{ymArrayEnd} >= CONVERT(varchar(10),qct.income_time, 120)</if>
         order by qct.income_time
     </select>
+    <select id="getCpkTypeList" resultType="com.op.quality.domain.QcCPKInfo">
+        select material_code cpkType,sdd.dict_label
+        from qc_product_cpk_upDown qpcu
+                 left join lanju_op_cloud.dbo.sys_dict_data sdd on sdd.dict_type = 'qms_category' and sdd.dict_value = qpcu.material_code
+        where qpcu.del_flag = '0'
+    </select>
 </mapper>