Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -74,7 +74,7 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
             String leavingTime = oldSignIn.getLeavingTime();
             if (ObjectUtil.notEqual("--", approachTime) && ObjectUtil.notEqual("--", leavingTime)) {
                 //今日已签到
-                return RestResponse.success(null, MessageUtils.get("msg.sign.limit"));
+                return RestResponse.fail(MessageUtils.get("msg.sign.limit"));
             }
             oldSignIn.setLeavingTime(LocalTime.now().withNano(0).toString());
             saveOrUpdate(oldSignIn);

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -437,7 +437,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
     public void export(ExportRequest request, HttpServletResponse response) {
         List<String> ids = request.getIds();
         List<Map<String, String>> liftList = exportList(ids);
-        ExcelWriter writer = ExcelUtil.getWriter(true);
+        ExcelWriter writer = ExcelUtil.getWriterWithSheet("电梯");
         //设置列别名
         headsMap.forEach(writer::addHeaderAlias);
         String fileName = DateUtils.generateCode() + ".xlsx";

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -503,7 +503,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
     public void export(ExportRequest request, HttpServletResponse response) {
         List<String> ids = request.getIds();
         List<Map<String, String>> planList = exportList(ids);
-        ExcelWriter writer = ExcelUtil.getWriter(true);
+        ExcelWriter writer = ExcelUtil.getWriterWithSheet("维保计划");
         //设置列别名
         headsMap.forEach(writer::addHeaderAlias);
         String fileName = DateUtils.generateCode() + ".xlsx";

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectMapper.java

@@ -66,4 +66,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Map<String, String>> exportList(@Param("exportList") List<String> ids);
 
+    List<Map<String, String>> exportLiftList(@Param("exportLiftList") List<String> ids);
+
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -86,7 +86,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     @Resource
     private PushUserService pushUserService;
 
-    private Map<String, String> headsMap = new LinkedHashMap<String, String>() {{
+    private Map<String, String> projectHeadsMap = new LinkedHashMap<String, String>() {{
         put("projectCode", "项目编号");
         put("projectName", "项目名称");
         put("province", "省份");
@@ -99,6 +99,17 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         put("endDate", "结束时间");
     }};
 
+    private Map<String, String> liftHeadsMap = new LinkedHashMap<String, String>() {{
+        put("projectName", "项目名称");
+        put("registrationCode", "注册代码");
+        put("liftType", "电梯类型");
+        put("devicePosition", "电梯位置");
+        put("liftBrand", "电梯品牌");
+        put("workerName", "维保工");
+        put("annualInspectionDate", "年检日期");
+        put("liftStatus", "电梯状态");
+    }};
+
     /**
      * @return 项目列表
      * @description 查询项目列表
@@ -397,6 +408,10 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         return baseMapper.exportList(ids);
     }
 
+    public List<Map<String,String>> exportLiftList(List<String> ids){
+        return baseMapper.exportLiftList(ids);
+    }
+
     /**
      * @param request 导出项目数据列表
      * @return RestResponse 状态码和返回消息
@@ -406,15 +421,19 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     public void export(ExportRequest request, HttpServletResponse response) {
         List<String> ids = request.getIds();
         List<Map<String, String>> projectList = exportList(ids);
-        ExcelWriter writer = ExcelUtil.getWriter(true);
+        List<Map<String, String>> liftList = exportLiftList(ids);
+        ExcelWriter writer = ExcelUtil.getWriterWithSheet("项目");
         //设置列别名
-        headsMap.forEach(writer::addHeaderAlias);
-        String fileName = DateUtils.generateCode() + ".xlsx";
+        projectHeadsMap.forEach(writer::addHeaderAlias);
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-        response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+        response.setHeader("Content-Disposition", "attachment;filename=" + DateUtils.generateCode() + ".xlsx");
         try (ServletOutputStream out = response.getOutputStream()) {
             writer.write(projectList, true);
             writer.autoSizeColumnAll();
+            writer.setSheet("电梯");
+            liftHeadsMap.forEach(writer::addHeaderAlias);
+            writer.write(liftList, true);
+            writer.autoSizeColumnAll();
             writer.flush(out, true);
             writer.close();
         } catch (IOException e) {

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -262,4 +262,36 @@
 		</where>
 	</select>
 
+	<select id="exportLiftList" resultType="java.util.Map" parameterType="java.util.List">
+		SELECT  p.project_name           AS projectName,
+				l.registration_code      AS registrationCode,
+				if(l.lift_type = 1, '直梯', '扶梯') AS liftType,
+				l.device_position        AS devicePosition,
+				lb.name                  AS liftBrand,
+				l.annual_inspection_date AS annualInspectionDate,
+				CASE pclr.lift_company_status
+				WHEN '1' THEN '停保'
+				WHEN '2' THEN '正常'
+				WHEN '3' THEN '保养中'
+				WHEN '4' THEN '维修中'
+				WHEN '5' THEN '年检中'
+				WHEN '6' THEN '大修中'
+				END AS liftStatus,
+				ui.name                  AS workerName
+		FROM project_lift_relevance plr
+		LEFT JOIN project p ON plr.project_id = p.id
+		LEFT JOIN lift l ON plr.lift_id = l.id
+		LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
+		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
+		LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
+		<where>
+			<if test="exportLiftList != null and exportLiftList.size > 0">
+				plr.project_id IN
+				<foreach collection="exportLiftList" item="id" open="(" separator="," close=")">
+					#{id}
+				</foreach>
+			</if>
+		</where>
+	</select>
+
 </mapper>