Merge remote-tracking branch 'origin/master'

# Conflicts:
#	sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java

@@ -53,6 +53,8 @@ public class ScybReportHandle implements ICustomHandle{
 		dataFieldDict.put("time", "时间");
 		dataFieldDict.put("paramDepart", "参数机构");
 		dataFieldDict.put("depart_id", "厂站编码");
+		dataFieldDict.put("yddf", "电费");
+		dataFieldDict.put("wxfy", "设备维修费");
 		//获取填报数据
 		String dataViewName4411 = ReportViewUtil.buildViewLike(ReportConstant.view4411,"", departIds, month);
 		//结果集

@@ -837,10 +837,15 @@
 			v4.dhcmbzyy,
 			v4.bnyhmb,
 			v4.bnsjyh,
-			v4.yhcyqyy
+			v4.yhcyqyy,
+			c.cost AS yddf,
+			r.total_cost AS wxfy
 		FROM
 			sys_depart d
 		LEFT JOIN ( SELECT * FROM ${dataViewName4411} v WHERE v.time = #{month} ) v4 ON v4.depart_id = d.id
+		LEFT JOIN ( SELECT cost,depart_id FROM report_electric_cost WHERE month = #{month} ) c ON c.depart_id = d.id
+		LEFT JOIN ( SELECT ROUND(SUM(total_cost),2) AS total_cost,depart_id FROM equipment_repair
+					WHERE LEFT(repair_date,7) = #{month} GROUP BY LEFT(repair_date,7),depart_id ) r ON r.depart_id = d.id
 		WHERE
 			d.id IN
 			<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">

@@ -175,6 +175,13 @@ public class FReportHeaderConfigController {
 			list = fReportHeaderConfigService.list(queryWrapper);
 			if(list.size() == 0){
 				List<FReportItem> itemList = fReportItemService.getListByReportId(fReportHeaderConfig.getReportId());
+				FReportHeaderConfig timeHeader = new FReportHeaderConfig();
+				timeHeader.setReportId(fReportHeaderConfig.getReportId());
+				timeHeader.setDepartId(fReportHeaderConfig.getDepartId());
+				timeHeader.setItemCode("time");
+				timeHeader.setItemName("时间");
+				timeHeader.setSortNum(0);
+				list.add(timeHeader);
 				for (FReportItem reportItem : itemList) {
 					FReportHeaderConfig config = new FReportHeaderConfig();
 					config.setReportId(fReportHeaderConfig.getReportId());

@@ -3,17 +3,11 @@ package com.skua.modules.equipment.controller;
 import java.io.*;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.skua.core.context.BaseContextHandler;
-import com.skua.core.query.QueryGenerator;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -115,31 +109,6 @@ public class EquipmentController {
     @Autowired
     private Key2ValueService key2ValueService;
 
-
-    @AutoLog(value = "设备台账-所有设备")
-    @ApiOperation(value = "设备台账-所有设备", notes = "设备台账-所有设备")
-    @GetMapping(value = "/allList")
-    public Result<List<EquipmentInfo>> allList(EquipmentInfo equipmentInfo, @RequestParam(name="model", defaultValue="0") Integer model,HttpServletRequest req ) throws Exception {
-
-        Result<List<EquipmentInfo>> result = new Result<List<EquipmentInfo>>();
-        QueryWrapper<EquipmentInfo> queryWrapper = QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
-       // queryWrapper.eq("depart_id", BaseContextHandler.getRealDepartId());
-
-
-        if(equipmentInfo.getDepartId()==null){
-            equipmentInfo.setDepartId(BaseContextHandler.getDeparts());
-        }
-      /*  if(model==1){
-            queryWrapper.isNotNull("is_model");
-            queryWrapper.last(" and is_model != ''");
-        }*/
-        queryWrapper.orderByDesc("create_time");
-        List<EquipmentInfo> dataList = equipmentInfoService.list(queryWrapper);
-        result.setSuccess(true);
-        result.setResult(dataList);
-        return result;
-    }
-
     @CustomExceptionAnno(description = "设备台账-设备排序")
     @AutoLog(value = "设备台账-设备排序")
     @ApiOperation(value = "设备台账-设备排序", notes = "设备台账-设备排序")
@@ -296,7 +265,7 @@ public class EquipmentController {
     @AutoLog(value = "设备台账-设备使用状态统计")
     @ApiOperation(value = "设备台账-设备使用状态统计", notes = "设备台账-设备使用状态统计")
     @GetMapping(value = "/equipmentStatus")
-    public Result<Object> equipmentStatusCtrl(String isSpecial) throws Exception {
+    public Result<Object> equipmentStatusCtrl(String isSpecial,String departId) throws Exception {
         Result<Object> result = new Result<>();
         // equipmentStatus: 设备类型value:key的转换
         Map<String, String> equipmentStatusVal2KeyMap = EquipmentUtils.convertFunc("equipmentStatus", false);
@@ -312,10 +281,21 @@ public class EquipmentController {
             flag = true;
             equipmentInfo.setIsSpecial(isSpecial);
         }
+        if(ConvertUtils.isNotEmpty(departId)){
+            equipmentInfo.setDepartId(departId);
+        }else{
+
+        }
         equipment.setEquipmentInfo(equipmentInfo);
         String sql = JoinSqlUtils.multiJoinSqlQuery(equipment);
         sql = "select res.EquipmentInfo_equipmentStatus, count(*) as total from (" + sql + ") as res";
         QueryWrapper<?> queryWrapper = new QueryWrapper<>();
+        if(ConvertUtils.isNotEmpty(departId)){
+            queryWrapper.eq("EquipmentInfo_departId", departId);
+        }else{
+            String departs = BaseContextHandler.getDeparts();
+            queryWrapper.in("EquipmentInfo_departId", Arrays.asList(departs.split(",")));
+        }
         queryWrapper.eq(flag, "EquipmentInfo_isSpecial", isSpecial)
                 .groupBy("EquipmentInfo_equipmentStatus");//EquipmentInfo_isSpecial
         List<Map<String, Object>> countMapList = iCommonSqlService.queryWrapperForList(sql, queryWrapper);
@@ -387,6 +367,16 @@ public class EquipmentController {
         return result;
     }
 
+    @AutoLog(value = "设备台账-重建二维码")
+    @ApiOperation(value = "设备台账-重建二维码", notes = "设备台账-重建二维码")
+    @GetMapping(value = "/reCreateQrCode")
+    public Result<String> reCreateQrCode(String id) {
+        Result<String> result = new Result<>();
+        String qrCodePath = equipmentInfoService.reCreateQrCode(id);
+        result.setResult(qrCodePath);
+        result.setSuccess(true);
+        return result;
+    }
 
     @CustomExceptionAnno(description = "设备台账-批量添加运行点")
     @AutoLog(value = "设备台账-批量添加运行点")

@@ -82,4 +82,6 @@ public interface IEquipmentInfoService extends IService<EquipmentInfo> {
 	List<Map<String, Object>> getEquipmentLifeTree(String id, String eventType);
 
 	void importExcel(MultipartFile file, String departId) throws Exception;
+
+    String reCreateQrCode(String id);
 }

@@ -331,4 +331,13 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 		}
 	}
 
+	@Override
+	public String reCreateQrCode(String id) {
+		EquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id);
+		String qrCodePath = createQrCode(equipmentInfo.getId());
+		equipmentInfo.setQrCode(qrCodePath);
+		equipmentInfoMapper.updateById(equipmentInfo);
+		return qrCodePath;
+	}
+
 }