修改workservice

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

@@ -50,6 +50,11 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
         XWPFRun title2 = p.createRun();
         title2.setText(wrodParameter.getTitle2());
 
+        p = doc.createParagraph();
+        p.setIndentationFirstLine(100);
+        p.setSpacingBeforeLines(50);
+        XWPFRun z = p.createRun();
+        z.setText("根据相关规定要求，我省/本单位辖区范围内本年度装备使用情况统计如下：");
 
         //总的统计内容
         p = doc.createParagraph();
@@ -69,20 +74,29 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
         p = doc.createParagraph();
         p.setIndentationFirstLine(100);
         p.setSpacingBeforeLines(50);
-        p.setSpacingAfterLines(150);
+//        p.setSpacingAfterLines(150);
         XWPFRun title5 = p.createRun();
         title5.setText(wrodParameter.getSelfCheck());
 
+        p = doc.createParagraph();
+        p.setIndentationFirstLine(100);
+        p.setSpacingBeforeLines(50);
+//        p.setSpacingAfterLines(150);
+        XWPFRun c = p.createRun();
+        c.setText("装备使用过程中未发现装备丢失、报废、泄密等事件，装备运行情况良好，符合实际业务需求。");
+
         //单位
         p = doc.createParagraph();
         XWPFRun title6 = p.createRun();
-        title6.setText("专管员签字：                                                                                                  xx单位");
+        title6.setText("专管员签字：                                                                                                   "+wrodParameter.getUnitsName());
 
         //时间
         p = doc.createParagraph();
         p.setAlignment(ParagraphAlignment.RIGHT);
         XWPFRun title7 = p.createRun();
-        title7.setText("2020年12月1日");
+        title7.setText(wrodParameter.getTime());
+
+
         String fileName=wrodParameter.getTitle1() +".doc";
         url=url+UUID.randomUUID().toString()+".doc";
         FileOutputStream out = new FileOutputStream(url);

dev-union/src/main/resources/application-test.properties

@@ -2,4 +2,6 @@ spring.datasource.driver-class-name=com.oscar.Driver
 spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
 spring.datasource.username=SYSDBA
 spring.datasource.password=szoscar55
-spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
+spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
\ No newline at end of file
+file.path=/opt/zb/
+preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file

dev-union/src/main/resources/application.properties

@@ -12,5 +12,5 @@ spring.main.allow-bean-definition-overriding=true
 server.servlet.session.timeout=PT1H
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-file.path=/opt/zb/
-preview.path=http://192.168.0.80:8088/equip/file/
+file.path=/Users/zjm/code/
+preview.path=http://192.168.102.26:8088/file/
\ No newline at end of file

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

@@ -8,6 +8,7 @@ import com.tykj.dev.device.usereport.subject.domin.DeviceUseReport;
 import com.tykj.dev.device.usereport.subject.vo.DeviceUseReportCreateVo;
 import com.tykj.dev.device.usereport.subject.vo.DeviceUseReportDetailVo;
 import com.tykj.dev.device.usereport.subject.vo.DeviceUseReportSelectVo;
+import com.tykj.dev.misc.base.ResultObj;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import io.swagger.annotations.Api;
@@ -77,7 +78,8 @@ public class DeviceUseReportController {
     @ApiOperation(value = "装备使用报告下载", notes = "装备使用报告下载")
     @GetMapping("/download/{id}")
     public ResponseEntity getDownloadUrl(@PathVariable("id") int id, HttpServletResponse response, HttpServletRequest httpServletRequest) throws IOException {
-        DeviceUseReportDetailVo deviceUseReportDetailVo = (DeviceUseReportDetailVo)selectDetail(id).getBody();
+        ResultObj resultObj = (ResultObj)selectDetail(id).getBody();
+        DeviceUseReportDetailVo deviceUseReportDetailVo= (DeviceUseReportDetailVo) resultObj.getData();
         WrodParameter wrodParameter = new WrodParameter();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(Objects.requireNonNull(deviceUseReportDetailVo).getCreateTime());