监督检查管理开发,测试环境信息变更

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/dao/THazardWorkPlanCheckDao.java

@@ -49,7 +49,7 @@ public interface THazardWorkPlanCheckDao extends SuperDao<THazardWorkPlanCheck>
      * @param tHazardWorkPlanCheckParam 危险作业计划监督检查主键
      * @return 危险作业计划监督检查
      */
-    Page<THazardWorkPlanCheck> selectTHazardWorkPlanCheckManageExportList(@Param("param") THazardWorkPlanCheckParam tHazardWorkPlanCheckParam);
+    List<THazardWorkPlanCheck> selectTHazardWorkPlanCheckManageExportList(@Param("param") THazardWorkPlanCheckParam tHazardWorkPlanCheckParam);
 
     /**
      * 查询危险作业计划监督检查详情

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java

@@ -101,11 +101,10 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
     public void exportEntity(THazardWorkPlanCheckParam param, HttpServletResponse response) {
         try{
             List<HazardWorkPlanCheckVO> hazardWorkPlanCheckVOList = new ArrayList<>();
-            Page<THazardWorkPlanCheck> tHazardWorkPlanCheckPage = this.baseMapper.selectTHazardWorkPlanCheckManageExportList(param);
-            List<THazardWorkPlanCheck> records = tHazardWorkPlanCheckPage.getRecords();
+            List<THazardWorkPlanCheck> tHazardWorkPlanCheckPage = this.baseMapper.selectTHazardWorkPlanCheckManageExportList(param);
 
             int i = 1;
-            for (THazardWorkPlanCheck entity : records) {
+            for (THazardWorkPlanCheck entity : tHazardWorkPlanCheckPage) {
                 HazardWorkPlanCheckVO vo = new HazardWorkPlanCheckVO();
                 BeanUtils.copyProperties(entity, vo);  // 复制属性
                 vo.setNumber(i);
@@ -114,14 +113,8 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
             }
 
             logger.info("**************************************写入模板*****************************");
-//            response.setContentType("application/vnd.ms-excel");
-//            response.setCharacterEncoding("utf-8");
-//            String fileName = URLEncoder.encode("隐患台账", "utf-8");
-//            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
-//            response.addHeader("Pargam", "no-cache");
-//            response.addHeader("Cache-Control", "no-cache");
-
-            String fileName = "隐患台账";
+
+            String fileName = "监督检查导出明细";
             response.setContentType("application/vnd.ms-excel;charset=utf-8");
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
 

zlmy-modules/zlmy-boot/src/main/resources/application-db-kingbase-dev.yml

@@ -53,5 +53,5 @@ spring:
         kingbase:
           driver-class-name: com.kingbase8.Driver
           url: jdbc:kingbase8://101.126.159.207:54322/public?currentSchema=public&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
-          username: root
+          username: system
           password: ZLmy654321
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/THazardWorkPlanCheck.xml

@@ -20,6 +20,8 @@
         <id column="stakeholderWork" property="stakeholderWork"/>
         <id column="check_signature_time" property="checkSignatureTime"/>
         <id column="check_name" property="checkName"/>
+        <id column="check_id" property="checkId"/>
+        <id column="basic_id" property="basicId"/>
     </resultMap>
 
     <select id="selectTHazardWorkPlanCheckList" resultMap="BaseResultMap">