[使用情况] 添加一个模版

dev-file/src/main/java/com/tykj/dev/device/file/entity/WrodParameter.java

@@ -77,7 +77,10 @@ public class WrodParameter {
 
     @ApiModelProperty(value = "退役", example = "10")
     private Integer decommissioningStatisticsNum;
-
+    @ApiModelProperty(value = "向下级进行维修退回", example = "10")
+    private Integer toRepairBackNum;
+    @ApiModelProperty(value = "接收下级进行维修", example = "10")
+    private Integer toRepairNum;
 
     /**
      * 时间 2021年4月12日

dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/UseReportFIleServiceImpl.java

@@ -34,7 +34,7 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
     public String preview;
 
     @Override
-    public void findToFileService(WrodParameter wrodParameter, HttpServletResponse response, HttpServletRequest httpServletRequest) throws IOException {
+    public void findToFileService(WrodParameter wrodParameter, HttpServletResponse response, HttpServletRequest httpServletRequest,String docModel) throws IOException {
         Map<String, Object> params = new HashMap<>();
         // 渲染文本
 
@@ -67,14 +67,17 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
         params.put("retiredNum",wrodParameter.getRetiredNum());
         //退役
         params.put("decommissioningStatisticsNum",wrodParameter.getDecommissioningStatisticsNum());
-
+        //向下级进行维修退回
+        params.put("toRepairBackNum",wrodParameter.getToRepairBackNum());
+        //接收下级进行维修
+        params.put("toRepairNum",wrodParameter.getToRepairNum());
 
         params.put("TitleAnnual",wrodParameter.getTitleAnnual());
         params.put("TitleTimeEnd",wrodParameter.getTitleTimeEnd());
         params.put("TitleTimeStart",wrodParameter.getTitleTimeStart());
         params.put("TitleUnitName",wrodParameter.getTitleUnitName());
         String fileName = wrodParameter.getTitleTimeStart()+"至"+wrodParameter.getTitleTimeEnd()+"使用报告" + ".doc";
-        String templatePath = ResourceUtils.getURL(  "classpath:").getPath()+"docxModel.docx";
+        String templatePath = ResourceUtils.getURL(  "classpath:").getPath()+docModel;
         url=url+"report/";
         String uuidName=UUID.randomUUID().toString().replace("-", "") + ".doc";
         String fileUrl= WordUtil.createWord(templatePath,url,uuidName,params);

dev-file/src/main/java/com/tykj/dev/device/file/service/UseReportFIleService.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public interface UseReportFIleService {
-    void findToFileService(WrodParameter wrodParameter, HttpServletResponse response, HttpServletRequest httpServletRequest) throws IOException;
+    void findToFileService(WrodParameter wrodParameter, HttpServletResponse response, HttpServletRequest httpServletRequest,String docModel) throws IOException;
 
     void download(String url, String name, HttpServletResponse response, HttpServletRequest httpServletRequest);
 

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceModelSort.java

@@ -16,7 +16,7 @@ public class DeviceModelSort {
     public static Map<String,Integer> mapModelSort;
 
     public static Set<String> modelToSort(Set<String> modelList){
-                modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toSort).reversed());
+                modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toSort));
                 return modelList;
     }
 

dev-usereport/src/main/java/com/tykj/dev/device/usereport/controller/DeviceUseReportController.java

@@ -4,6 +4,8 @@ import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.file.entity.WrodParameter;
 import com.tykj.dev.device.file.service.UseReportFIleService;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
+import com.tykj.dev.device.user.subject.entity.Units;
+import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.usereport.service.DeviceUseReportService;
 import com.tykj.dev.device.usereport.subject.domin.DeviceUseReport;
 import com.tykj.dev.device.usereport.subject.vo.DeviceUseReportCreateVo;
@@ -44,6 +46,9 @@ public class DeviceUseReportController {
     @Autowired
     private DeviceUseReportService deviceUseReportService;
 
+    @Autowired
+    UnitsService unitsService;
+
     @Autowired
     private UseReportFIleService useReportFIleService;
     @ApiOperation(value = "模糊查询装备使用报告分页", notes = "可以通过这个接口模糊查询装备使用报告分页")
@@ -97,12 +102,13 @@ public class DeviceUseReportController {
         DeviceUseReportDetailVo deviceUseReportDetailVo = (DeviceUseReportDetailVo) resultObj.getData();
         //新建word模板
         WrodParameter wrodParameter = deviceUseReportDetailVo.toWrodParameter();
-
+        Units units= unitsService.findbyName(deviceUseReportDetailVo.getUnit());
         Instant instant = deviceUseReportDetailVo.getCreateTime().toInstant();
         ZoneId zone = ZoneId.systemDefault();
         LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
         wrodParameter.setTime(localDateTime.getYear()+"年"+localDateTime.getMonthValue()+"月"+localDateTime.getDayOfMonth()+"日");
         wrodParameter.setTitleUnitName(deviceUseReportDetailVo.getUnit());
+
         Instant instant1 = deviceUseReportDetailVo.getStartTime().toInstant();
         Instant instant2 = deviceUseReportDetailVo.getEndTime().toInstant();
         LocalDateTime localDateTime1 = LocalDateTime.ofInstant(instant1, zone);
@@ -112,7 +118,12 @@ public class DeviceUseReportController {
         wrodParameter.setTitleTimeStart(startTime);
         wrodParameter.setTitleTimeEnd(endTime);
         wrodParameter.setTitleAnnual(localDateTime.getYear());
-        useReportFIleService.findToFileService(wrodParameter, response, httpServletRequest);
+        if (units.getLevel()==1) {
+            useReportFIleService.findToFileService(wrodParameter, response, httpServletRequest,"docxModel.docx");
+        }else {
+            useReportFIleService.findToFileService(wrodParameter, response, httpServletRequest,"docxModel1.docx");
+
+        }
         return ResponseEntity.ok("下载成功");
     }
 }