tjiao

whepi-doc/creatYeWeiHui.sql

@@ -0,0 +1,38 @@
+-- 新建临时表,用来记录用户信息,减少步骤
+DROP TABLE IF EXISTS tp_user;
+CREATE TABLE tp_user  (
+  user_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '用户ID',
+  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
+  linkman           varchar(10)  NOT NULL DEFAULT '' COMMENT '联系人名称',
+  phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
+  time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
+  time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  PRIMARY KEY (user_id) USING BTREE
+) ENGINE = InnoDB default charset=utf8 comment = '用户ID临时表';
+
+-- 在临时表插入user_id,之后直接使用插入的user_id
+insert into tp_user
+(select ur.user_id,u.uptown_id,aa.linkman,aa.phone,now(),now() from sys_user_role ur
+left join sys_uptown_house up on up.house_id = ur.property_id
+left join sys_uptown_unit uu on uu.unit_id = up.unit_id
+left join sys_uptown u on u.uptown_id = uu.uptown_id
+left join (
+select ur.user_id,up.linkman,up.phone from sys_user_role ur
+left join sys_uptown_home up on up.house_id = ur.property_id
+where ur.role_id = 1 and up.phone = '17771809480') aa on aa.user_id = ur.user_id
+where ur.role_id = 1 and ur.user_id = (select user_id from sys_user_role where property_id = (select house_id from sys_uptown_home where phone = '17771809480') and role_id = 1))
+
+-- 插入业委会表,根据已有的最大ID加1生成新的ID
+insert into sys_owner
+select (select owner_id from (
+(select ifnull(max(owner_id+0)+1,1) as owner_id from sys_owner)
+) as tmp),uptown_id,linkman,phone,user_id,now(),user_id,now() from tp_user order by time_create desc limit 1;
+
+
+-- 插入权限表(不需要任何修改),根据已有的最大ID加1生成新的ID
+insert into sys_user_role
+select (select ur_id from (
+(select ifnull(max(ur_id+0)+1,1) as ur_id from sys_user_role)
+) as tmp),user_id, 2,
+(select owner_id from sys_owner where user_create = (select user_id from tp_user order by time_create desc limit 1))
+,user_id,now(),user_id,now() from tp_user order by time_create desc limit 1;

whepi-web/src/main/java/com/bofeng/dao/RbMapper.java

@@ -78,7 +78,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
             "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
             "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
             "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+
-            "left join sys_uptown_home suho on suho.house_id = suh.house_id"
+            "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
     )
     List<ExcelRiBao> selectExcelRiBao(@Param("uptownId") Long uptownId, @Param("date") String date);
 

whepi-web/src/main/java/com/bofeng/excel/ExcelBuilder.java

@@ -40,9 +40,9 @@ public class ExcelBuilder {
     }
 
     @SneakyThrows
-    public void export(HttpServletResponse response) {
+    public void export(HttpServletResponse response, String fileName) {
         response.setContentType("application/vnd.ms-excel;charset=utf-8");
-        response.setHeader("Content-Disposition", "attachment;filename=" + new String(("file.xlsx").getBytes(), "iso-8859-1"));
+        response.setHeader("Content-Disposition", "attachment;filename=" + new String(( fileName + ".xlsx").getBytes(), "iso-8859-1"));
         try (OutputStream outputStream = response.getOutputStream()) {
 
             ExcelWriter writer = new ExcelWriter(outputStream, ExcelTypeEnum.XLSX);

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -156,6 +156,6 @@ public class UserOpenController {
     @SneakyThrows
     public void errorCustInfo(HttpServletResponse resp) {
         List<UserOpen> list = userOpenMapper.getAllUser();
-        ExcelUtils.writeSheet(UserOpen.class, list).export(resp);
+        ExcelUtils.writeSheet(UserOpen.class, list).export(resp, "errorCust");
     }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -205,8 +205,11 @@ public class YeWeiHuiController {
 
         if (uptowns!=null && uptowns.size()>0) {
             Long upId = uptowns.get(0).getUptownId();
+            String fileName = uptowns.get(0).getUptownName();
+            fileName += "上报信息-";
+            fileName += date;
             List<ExcelRiBao> list = rbMapper.selectExcelRiBao(upId,date);
-            ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp);
+            ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp, fileName);
         }
     }
 }