1.项目管理下载功能

2.项目管理模块完成

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ProjectDTO.java

@@ -28,9 +28,9 @@ public class ProjectDTO {
     /**
      * 项目合同
      */
-    @NotNull(message = "项目合同不能为空", groups = Create.class)
+//    @NotNull(message = "项目合同不能为空", groups = Create.class)
-    @Null(message = "项目合同不能为空", groups = Update.class)
+//    @Null(message = "项目合同不能为空", groups = Update.class)
-    @Valid
+//    @Valid
     private ContractDTO contract;
 
     /**

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java

@@ -93,6 +93,7 @@ public class WrkProject extends BaseEntity {
      */
     @TableField(value = "project_effect")
     @DictFormat(dictType = "project_effect")
+    @Condition(name = "project_effect", type = Condition.ConditionType.eq)
     private Integer projectEffect;
 
     /**

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java

@@ -39,7 +39,7 @@ public class WrkProjectContract extends BaseEntity {
     private Long projectId;
 
     /**
-     * 备注
+     * 备注字段充当上传合同的fid字段
      */
     @TableField(value = "remark")
     private String remark;

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java

@@ -53,6 +53,7 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
         recordList.forEach(item->{
             WrkProjectContract wrkProjectContract = contractService.queryListByProjectIds(item.getProjectId());
             if(null != wrkProjectContract){
+                item.setRemark(wrkProjectContract.getRemark());
                 item.setContractStartTime(wrkProjectContract.getContractStartTime());
                 item.setContractEndTime(wrkProjectContract.getContractEndTime());
                 item.setContractUrl(wrkProjectContract.getContractUrl());

chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java

@@ -246,11 +246,23 @@ public class FileSourceService
         FileSourceInfo fileSourceInfo = new FileSourceInfo();
         fileSourceInfo.setUploadIp(ip);
         fileSourceInfo.setFid(fid);
+        fileSourceInfo.setMd5(md5);
+        Tika t = new Tika();
+        String mimetype = null;
+        try {
+            mimetype = t.detect(file.getBytes());
+            if (fName.indexOf(".") < 0) {//如果文件名字没有后缀
+                String ext = MimeTypes.getDefaultMimeTypes().forName(mimetype).getExtension();
+                fName += ext;
+            }
+        } catch (IOException ignore) {
+        } catch (MimeTypeException e) {
+            log.error("文件后缀识别失败");
+        }
         fileSourceInfo.setName(fName);
         fileSourceInfo.setSize(length);
         fileSourceInfo.setPath("contract/"+fName);
-        fileSourceInfo.setMd5(md5);
+        fileSourceInfo.setMimeType(mimetype);
-        fileSourceInfo.setMimeType("image/jpeg");
         String upload = ossService.upload(file.getInputStream(), fileSourceInfo);
         fileSourceInfo.setRealPath(upload);
         save(fileSourceInfo);