1.自定义报表,模板选择修改

2.自定义报告调度,更具部门绑定来选择监测点
3.技术监督附件代码更新

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvFileMapper.java

@@ -2,7 +2,11 @@ package com.njcn.process.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.process.pojo.param.SupvFileParam;
 import com.njcn.process.pojo.po.SupvFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +18,5 @@ import com.njcn.process.pojo.po.SupvFile;
  */
 public interface SupvFileMapper extends BaseMapper<SupvFile> {
 
-    SupvFile selectFile(String ids);
+    List<SupvFile> selectFile(@Param("param") SupvFileParam param);
 }

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvFileMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.process.mapper.SupvFileMapper">
 
+    <select id="selectFile" resultType="com.njcn.process.pojo.po.SupvFile">
+        select
+            sp.work_plan_name busiName,
+            sf.*
+        from
+            supv_file sf
+        INNER JOIN supv_plan sp on sp.plan_Id= sf.busi_Id
+        <where>
+            <if test="param!=null and param.ids != null and param.ids.size > 0">
+                AND busi_Id IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param!=null and param.type != null ">
+                AND sf.type = #{param.type}
+            </if>
+            <if test="param!=null and param.attachmentType != null and param.attachmentType != ''">
+                AND sf.attachment_Type &lt;= #{param.attachmentType}
+            </if>
+        </where>
+    </select>
 </mapper>