Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/controller/OssFileController.java

@@ -3,14 +3,14 @@ package com.jeeplus.test.oss.controller;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.oss.service.dto.FileDetailDTO;
-import com.jeeplus.test.oss.service.dto.OssServiceDto;
+import com.jeeplus.test.user.service.dto.FileUrlDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -97,4 +97,17 @@ public class OssFileController {
         FileDetailDTO fileDetailDTO = ossService.getFileSizeByUrl(url);
         return ResponseEntity.ok(fileDetailDTO);
     }
+
+    /**
+     * 上传文件
+     * @return
+     * @throws IOException
+     */
+    @ApiOperation("上传文件")
+    @PostMapping("webUpload/upload")
+    public ResponseEntity<FileUrlDto> webUpload(MultipartFile file) throws IOException {
+        String dir = "note";
+        FileUrlDto dto = ossService.webUpload(file,dir);
+        return ResponseEntity.ok(dto);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -1044,7 +1044,11 @@ public class ProjectListService {
         //签发人
         if(null != issuedById){
             //校对负责人
-            data.put("signer","");
+            if(StringUtils.isNotBlank(issuedById.getAgreeUserId())){
+                data.put("signer",UserUtils.get(issuedById.getAgreeUserId()).getName());
+            }else{
+                data.put("signer","");
+            }
             //校对时间
             Date issuedAgreeTime=issuedById.getAgreeTime();
             if(null == issuedAgreeTime){
@@ -1064,6 +1068,11 @@ public class ProjectListService {
         if(null != programArchiveDto){
             //校对负责人
             data.put("archiveMaster","");
+            if(StringUtils.isNotBlank(programArchiveDto.getAuditUserId())){
+                data.put("archiveMaster",UserUtils.get(programArchiveDto.getAuditUserId()).getName());
+            }else{
+                data.put("archiveMaster","");
+            }
             //校对时间
             Date auditDate=programArchiveDto.getAuditDateDate();
             if(null == auditDate){

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -97,10 +97,10 @@ public class ReimbursementInfoService {
         // 报销金额
         if (dto.getAmounts() != null) {
             if (StringUtils.isNotEmpty(dto.getAmounts()[0])) {
-                queryWrapper.ge("b.number", dto.getAmounts()[0]);
+                queryWrapper.ge("b.number", Double.parseDouble(dto.getAmounts()[0]));
             }
             if (StringUtils.isNotEmpty(dto.getAmounts()[1])) {
-                queryWrapper.le("b.number", dto.getAmounts()[1]);
+                queryWrapper.le("b.number", Double.parseDouble(dto.getAmounts()[1]));
             }
         }
         // 报告号