diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckProjectController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckProjectController.java
index b6b352f1..4ef4c55a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckProjectController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckProjectController.java
@@ -41,7 +41,7 @@ public class QcCheckProjectController extends BaseController {
/**
* 查询检验项目维护列表
*/
- @RequiresPermissions("quality:project:list")
+ //@RequiresPermissions("quality:project:list")
@GetMapping("/list")
public TableDataInfo list(QcCheckProject qcCheckProject) {
startPage();
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
index 8688afba..28cd1eef 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
@@ -190,9 +190,17 @@ public class QcCheckReportIncome extends BaseEntity {
private String standardNo;
private String jgy;
-
+ private String cxzz;
private String pgy;
+ public String getCxzz() {
+ return cxzz;
+ }
+
+ public void setCxzz(String cxzz) {
+ this.cxzz = cxzz;
+ }
+
public String getJgy() {
return jgy;
}
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
index fca4281c..72c7e326 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
@@ -40,7 +40,9 @@
-
+
+
+
@@ -97,7 +99,7 @@
qct.check_status, qct.check_man_code, qct.check_man_name,
qct.check_time, qct.check_result, qct.status, qct.check_type, qct.attr1, qct.attr2, qct.attr3, qct.attr4,
qct.create_by, qct.create_time, qct.update_by, qct.update_time,
- qct.factory_code, qct.del_flag,qct.reason,qct.product_type,qct.order_type,qct.jgy,qct.pgy,
+ qct.factory_code, qct.del_flag,qct.reason,qct.product_type,qct.order_type,qct.jgy,qct.pgy,qct.cxzz,
bp.mvgr5 standardNo
from qc_check_task qct
left join base_product bp on bp.product_code = qct.material_code