Merge remote-tracking branch 'origin/master'

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolRewardsPunishments/SchoolScAwardsController.java

 package yangtz.cs.liu.campus.controller.schoolRewardsPunishments;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -20,6 +26,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScAwards;
 import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScAwardsService;
 import yangtz.cs.liu.campus.vo.schoolRewardsPunishments.SchoolScAwardsVo;
@@ -187,4 +194,73 @@ public class SchoolScAwardsController extends BaseController
     {
         return toAjax(schoolScAwardsService.submit(schoolScAwards));
     }
+
+
+    /** 批量导出附件图片 */
+    @GetMapping("/pldcfjtp")
+    public void pldcfjtp(SchoolScAwardsVo schoolScAwardsVo, HttpServletResponse response)
+    {
+        schoolScAwardsVo.setAuditState("0");
+        startPage();
+        List<SchoolScAwardsVo> list = schoolScAwardsService.selectSchoolScAwardsList(schoolScAwardsVo);
+        List<SchoolAccessory> dcfjs = new ArrayList<>();//导出附件列表
+        for (SchoolScAwardsVo entity : list) {
+            List<SchoolAccessory> fjs = entity.getSchoolAccessoryList();
+            for (SchoolAccessory fj : fjs) {
+                SchoolAccessory dc = new SchoolAccessory();
+                dc.setAccessoryName(entity.getCompetitionName() + entity.getAwardsName() + fj.getId());
+                dc.setAccessoryUrl(fj.getAccessoryUrl());
+            }
+        }
+
+
+        String fileName = "学校获奖附件" + ".zip";
+        response.setContentType("application/zip");
+        response.setHeader("content-disposition", "attachment;filename=" + fileName);
+
+        ZipOutputStream zos = null;
+        BufferedInputStream bis = null;
+        try{
+            zos = new ZipOutputStream(response.getOutputStream());
+            byte[] buf = new byte[8192];
+            int len;
+            for (int i = 0; i < dcfjs.size(); i++) {
+                SchoolAccessory dcfj = dcfjs.get(i);
+                String dcfjurl = dcfj.getAccessoryUrl();
+                String dcfjname = dcfj.getAccessoryName();
+
+                File file = new File(dcfjurl);
+                if (!file.isFile()) {
+                    continue;
+                }
+                ZipEntry ze = new ZipEntry(dcfjname);
+                zos.putNextEntry(ze);
+                bis = new BufferedInputStream(new FileInputStream(file));
+                while ((len = bis.read(buf)) > 0) {
+                    zos.write(buf, 0, len);
+                }
+                zos.closeEntry();
+            }
+            zos.closeEntry();
+        } catch (Exception ex){
+            ex.printStackTrace();
+        } finally {
+            if(bis != null){
+                try{
+                    bis.close();
+                }catch(Exception e){
+                    e.printStackTrace();
+                }
+            }
+            if(zos != null){
+                try{
+                    zos.close();
+                }catch(Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentVo.java

@@ -60,5 +60,8 @@ public class SchoolAclassTeacherAssessmentVo extends BaseEntity
     /** 删除状态 */
     private String delFlag;
 
+    /** 家长满意度评价 */
+    private String jzmydpj;
+
 
 }

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.xml

@@ -25,10 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="jzmydpj"    column="jzmydpj"    />
     </resultMap>
 
     <sql id="selectSchoolAclassTeacherAssessmentVo">
-        select id, semester, year, school_year, grade, class_name, teacher_name, id_card, moral_edu_check_achievement, intell_edu_check_achievement, total_check_achievement, class_type, sub, assessment_results, remark, create_by, create_time, update_by, update_time, del_flag from school_aclass_teacher_assessment
+        select id, semester, year, school_year, grade, class_name, teacher_name, id_card, moral_edu_check_achievement,
+            intell_edu_check_achievement, total_check_achievement, class_type, sub, assessment_results, remark,
+            create_by, create_time, update_by, update_time, del_flag , jzmydpj
+        from school_aclass_teacher_assessment
     </sql>
 
     <select id="selectSchoolAclassTeacherAssessmentList" parameterType="SchoolAclassTeacherAssessmentReq" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo">
@@ -130,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="jzmydpj != null and jzmydpj != ''">jzmydpj,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="semester != null">#{semester},</if>
@@ -151,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="jzmydpj != null and jzmydpj != ''">#{jzmydpj},</if>
          </trim>
     </insert>
 
@@ -176,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="jzmydpj != null and jzmydpj != ''">jzmydpj = #{jzmydpj},</if>
         </trim>
         where id = #{id}
     </update>