kangwei：水质水量和化验报表必填校验修改指标

康伟
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WorkAnalysisController.java
--- a/sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WorkAnalysisController.java
查看文件 @0b3f80f
+++ b/sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WorkAnalysisController.java
查看文件 @0b3f80f
@@ -345,11 +345,11 @@ public class WorkAnalysisController {
        sql += " left join (select aa.depart_id ,count(1) 'count' from  "+view3a24Sql+ " aa  where  aa.WNL is not null  and aa.WNL <> '' and aa.DLHJ is not null and aa.DLHJ <> ''  and aa.YSL is not null  and aa.YSL <> '' and  DATEDIFF(aa.create_time  , aa.time) < 2  group by aa.depart_id  )aaaHH on  aaaHH.depart_id  = d.id  ";
        //水质水量日报表：进水量、出水量、PH进水、PH出水、COD进水、COD出水，TP进水、TP出水、NH4-N进水、出水；  TN进水、出水
-        String view2119Sql = ReportViewUtil.buildView(ReportConstant.view2119,"JSL,CSL,JSAD,CSAD,JSZD,CSTN,JSZL,CSZL,JSCOD,CSCOD,JSPH,CSPH",departIds,startTime,endTime);
+        String view2119Sql = ReportViewUtil.buildView(ReportConstant.view2119,"JSL,CSL,CSAD,JSZD,CSTN,CSZL,JSCOD,CSCOD,CSPH",departIds,startTime,endTime);
-        String view2119Sql_where = "  where  bb.JSL is not null  and bb.JSL <> '' and bb.CSL is not null and bb.CSL <> ''  and bb.JSAD is not null  and bb.JSAD <> ''  and bb.CSAD is not null  and bb.CSAD <> ''  ";
+        String view2119Sql_where = "  where  bb.JSL is not null  and bb.JSL <> '' and bb.CSL is not null and bb.CSL <> ''   and bb.CSAD is not null  and bb.CSAD <> ''  ";
-        view2119Sql_where += "  and bb.JSZD is not null  and bb.JSZD <> ''  and bb.CSTN is not null  and bb.CSTN <> ''  and bb.JSZL is not null  and bb.JSZL <> ''  and bb.CSZL is not null  and bb.CSZL <> '' ";
+        view2119Sql_where += "   and bb.CSTN is not null  and bb.CSTN <> ''    and bb.CSZL is not null  and bb.CSZL <> '' ";
-        view2119Sql_where += "  and bb.JSCOD is not null  and bb.JSCOD <> ''  and bb.CSCOD is not null  and bb.CSCOD <> ''  and bb.JSPH is not null  and bb.JSPH <> ''  and bb.CSPH is not null  and bb.CSPH <> '' ";
+        view2119Sql_where += "  and bb.JSCOD is not null  and bb.JSCOD <> ''  and bb.CSCOD is not null  and bb.CSCOD <> ''   and bb.CSPH is not null  and bb.CSPH <> '' ";
        sql += " left join ( select bb.depart_id ,count(1) 'count' from   "+view2119Sql+ " bb    " +view2119Sql_where+ " group by bb.depart_id )bbb on  bbb.depart_id  = d.id";
        //水质水量日报  及时天数