fix(使用情况报告): 使用情况报告修改市级的模版没有退回数量

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

@@ -58,7 +58,7 @@ public class WrodParameter {
     private Integer receiveAllotNum;
 
     @ApiModelProperty(value = "发起退回数量", example = "10")
-    private Integer sensAllotBackNum;
+    private Integer sendAllotBackNum;
 
     @ApiModelProperty(value = "接收退回", example = "10")
     private Integer receiveAllotBackNum;

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

@@ -53,7 +53,7 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
         //接收配发数量
         params.put("receiveAllotNum",wrodParameter.getReceiveAllotNum());
         //发起退回数量
-        params.put("sensAllotBackNum",wrodParameter.getSensAllotBackNum());
+        params.put("sensAllotBackNum",wrodParameter.getSendAllotBackNum());
         //接收退回
         params.put("receiveAllotBackNum",wrodParameter.getReceiveAllotBackNum());
         //清退数量

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

@@ -125,11 +125,10 @@ public class DeviceUseReportController {
         wrodParameter.setTitleTimeStart(startTime);
         wrodParameter.setTitleTimeEnd(endTime);
         wrodParameter.setTitleAnnual(localDateTime.getYear());
-        if (units.getLevel()==1) {
+        if (units.getLevel()==1 && units.getType()==1) {
             useReportFIleService.findToFileService(wrodParameter, response, httpServletRequest,"docxModel.docx");
         }else if(units.getLevel()==2){
             useReportFIleService.findToFileService(wrodParameter, response, httpServletRequest,"docxModel1.docx");
-
         }else {
             useReportFIleService.findToFileService(wrodParameter, response, httpServletRequest,"docxModel2.docx");
         }