kangwei: material_info 待审核只显示审核中的数据，取消驳回的数据

@@ -50,7 +50,6 @@ public class AlarmParamStandardConfigController {
     public Result<AlarmParamStandardConfig> addAlarmParamStandardInfo(@RequestBody AlarmParamStandardConfig alarmParamStandardConfig){
     public Result<AlarmParamStandardConfig> addAlarmParamStandardInfo(@RequestBody AlarmParamStandardConfig alarmParamStandardConfig){
 
 
         Result<AlarmParamStandardConfig> result = new Result<>();
         Result<AlarmParamStandardConfig> result = new Result<>();
-
         try{
         try{
             //设置isDelete的字段1，表示为有效数据
             //设置isDelete的字段1，表示为有效数据
             alarmParamStandardConfig.setDelFlag(1);
             alarmParamStandardConfig.setDelFlag(1);
@@ -209,4 +208,4 @@ public class AlarmParamStandardConfigController {
 
 
     }
     }
 
 
-}
\ No newline at end of file
+}

@@ -31,7 +31,7 @@ public class ErpReportController {
     @AutoLog(value = "赋能中心-药剂统购分销")
     @AutoLog(value = "赋能中心-药剂统购分销")
     @ApiOperation(value="赋能中心-药剂统购分销", notes="赋能中心-药剂统购分销")
     @ApiOperation(value="赋能中心-药剂统购分销", notes="赋能中心-药剂统购分销")
     @GetMapping(value = "/agentiaStatistics")
     @GetMapping(value = "/agentiaStatistics")
-    public Result<List<AgentiaStatisticsVO>> agentiaStatistics() {
+    public Result<List<AgentiaStatisticsVO>> agentiaStatistics(String year) {
         Result<List<AgentiaStatisticsVO>> result = new Result<List<AgentiaStatisticsVO>>();
         Result<List<AgentiaStatisticsVO>> result = new Result<List<AgentiaStatisticsVO>>();
 
 
         String sql ="select d.depart_name , mi.material_num ,sm.supp_name  'supplier_name' ,aaa.*  from (";
         String sql ="select d.depart_name , mi.material_num ,sm.supp_name  'supplier_name' ,aaa.*  from (";

@@ -117,7 +117,7 @@ public class MaterialInfoController {
             queryWrapper.eq("rules_type",materialInfo.getRulesType());
             queryWrapper.eq("rules_type",materialInfo.getRulesType());
         }
         }
         if(StringUtils.isNotEmpty(materialInfo.getLawsType())){
         if(StringUtils.isNotEmpty(materialInfo.getLawsType())){
-            queryWrapper.eq("laws_type",materialInfo.getLawsType());
+            queryWrapper.like("laws_type",materialInfo.getLawsType());
         }
         }
         if(StringUtils.isNotEmpty(materialInfo.getStandardsType())){
         if(StringUtils.isNotEmpty(materialInfo.getStandardsType())){
             queryWrapper.eq("standards_type",materialInfo.getStandardsType());
             queryWrapper.eq("standards_type",materialInfo.getStandardsType());
@@ -138,7 +138,9 @@ public class MaterialInfoController {
         Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>();
         Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>();
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         QueryWrapper<MaterialInfo> queryWrapper = getMaterialInfoQueryWrapper(materialInfo);
         QueryWrapper<MaterialInfo> queryWrapper = getMaterialInfoQueryWrapper(materialInfo);
-        queryWrapper.in("status","'1','2'");
+        //queryWrapper.in("status","'1','2'");
+        queryWrapper.eq("status","1");
+        //queryWrapper.le("status","2");
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setResult(pageList);
@@ -187,7 +189,7 @@ public class MaterialInfoController {
             queryWrapper.eq("rules_type",materialInfo.getRulesType());
             queryWrapper.eq("rules_type",materialInfo.getRulesType());
         }
         }
         if(StringUtils.isNotEmpty(materialInfo.getLawsType())){
         if(StringUtils.isNotEmpty(materialInfo.getLawsType())){
-            queryWrapper.eq("laws_type",materialInfo.getLawsType());
+            queryWrapper.like("laws_type",materialInfo.getLawsType());
         }
         }
         if(StringUtils.isNotEmpty(materialInfo.getStandardsType())){
         if(StringUtils.isNotEmpty(materialInfo.getStandardsType())){
             queryWrapper.eq("standards_type",materialInfo.getStandardsType());
             queryWrapper.eq("standards_type",materialInfo.getStandardsType());
@@ -216,6 +218,11 @@ public class MaterialInfoController {
                 //materialInfo.setDepartId(materialInfoService.queryFacByUserId(userCode));
                 //materialInfo.setDepartId(materialInfoService.queryFacByUserId(userCode));
                 materialInfo.setDepartId(BaseContextHandler.getRealDepartId());
                 materialInfo.setDepartId(BaseContextHandler.getRealDepartId());
             }
             }
+            materialInfo.setUserId(  BaseContextHandler.getUserId() );
+            if(StringUtils.isEmpty(materialInfo.getStatus())){
+                materialInfo.setStatus("0");
+            }
+
             materialInfoService.save(materialInfo);
             materialInfoService.save(materialInfo);
             result.success("添加成功！");
             result.success("添加成功！");
         } catch (Exception e) {
         } catch (Exception e) {

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.skua.modules.dataAnalysis.mapper.WaterAnalysisNewMapper">
 <mapper namespace="com.skua.modules.dataAnalysis.mapper.WaterAnalysisNewMapper">
+	<!-- 根据出水标准查询达标率-->
     <select id="queryFacListBySummary" resultType="java.util.Map">
     <select id="queryFacListBySummary" resultType="java.util.Map">
          SELECT
          SELECT
             sd.depart_name factoryName,
             sd.depart_name factoryName,
@@ -18,7 +19,7 @@
             LEFT JOIN (
             LEFT JOIN (
         SELECT
         SELECT
             t.factory_id,
             t.factory_id,
-            100- round( count( 1 ) / #{dayCount} * 100, 2 ) count
+            100 - round( count( 1 ) / #{dayCount} * 100, 2 ) count
         FROM
         FROM
             (
             (
 			SELECT
 			SELECT

@@ -301,6 +301,7 @@ public class WaterAnalysisNewServiceImpl implements WaterAnalysisNewService {
         }
         }
         return csbzCharData;
         return csbzCharData;
     }
     }
+    //根据出水标准查询达标率
     @Override
     @Override
     public List<Map<String, Object>> queryFacListBySummary(String time) {
     public List<Map<String, Object>> queryFacListBySummary(String time) {
         String departIds = BaseContextHandler.getDeparts();
         String departIds = BaseContextHandler.getDeparts();