|
|
@@ -6496,7 +6496,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,lg.logoname\n" +
|
|
|
" ,sp.CreateTime\n" +
|
|
|
" ,sp.Remarks\n" +
|
|
|
- " ,sp.DISCOVERERSTAFF,COUNT(1) AS counts,JOB.JOBSNAME\n" +
|
|
|
+ " ,CASE WHEN sp.DISCOVERERSTAFF='NULL' THEN NULL ELSE sp.DISCOVERERSTAFF END AS DISCOVERERSTAFF," +
|
|
|
+ " COUNT(1) AS counts,JOB.JOBSNAME\n" +
|
|
|
" FROM tp_pm_scrapproduct sp\n" +
|
|
|
" LEFT JOIN TP_PM_ResponProcedure rp\n" +
|
|
|
" ON rp.scrapproductid = sp.scrapproductid\n" +
|
|
|
@@ -6533,7 +6534,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" LEFT JOIN tp_mst_goodstype gt2\n" +
|
|
|
" ON gt2.accountid = gt.accountid\n" +
|
|
|
" AND gt2.goodstypecode = substr(gt.goodstypecode, 1, 6)\n" +
|
|
|
- " LEFT JOIN TP_MST_USER userInfo ON sp.Auditor = userInfo.UserId " +
|
|
|
+
|
|
|
+ " LEFT JOIN TP_MST_USER userInfo ON sr.usercode = userInfo.usercode " +
|
|
|
" LEFT JOIN TP_MST_USERJOBS userjob on userjob.USERID=userInfo.USERID " +
|
|
|
" LEFT JOIN TP_MST_JOBS JOB ON JOB.JOBSID=userjob.JOBSID" +
|
|
|
" WHERE sp.valueflag = '1'\n" +
|