chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
likewei 2024-08-20 11:44:11 +08:00
parent 2e5c9fd80a d429148a20
commit 3592c071a5
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,10 @@ public class WrkProject extends BaseEntity {
@DictFormat(dictType = "project_effect")
@Condition(name = "project_effect", type = Condition.ConditionType.eq)
private Integer projectEffect;
@TableField(value = "project_effect")
@DictFormat(dictType = "project_effect")
@Condition(name = "project_effect", type = Condition.ConditionType.eq)
private Integer status;
/**
* 查询条件 所属部门id

2
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java
View File

@ -1,6 +1,7 @@
package com.chushang.inspection.work.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.chushang.common.dict.annotation.DictFormat;
import lombok.Data;
import java.io.Serial;
@ -61,6 +62,7 @@ public class WrkInfoTerminalInsVO implements Serializable {
/**
* 巡检状态 1 已巡检 2 未巡检
*/
@DictFormat(dictType = "inspectionStatus_status")
private Integer inspectionStatus;
/**

17
chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java
View File

@ -53,12 +53,25 @@ public class FileController {
/**
* 合同上传
*/
// @SysLog(value = "合同", businessType = BusinessType.UPLOAD)
// @PostMapping(value = "/uploadContract")
//// @RequiresPermissions("system:file:upload")
// public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) throws Exception
// {
// return AjaxResult.success(fileSourceService.uploadContract(file));
// }
@SysLog(value = "合同", businessType = BusinessType.UPLOAD)
@PostMapping(value = "/uploadContract")
@RequiresPermissions("system:file:upload")
public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) throws Exception
{
public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) {
try {
log.info("开始上传合同文件: {}", file.getOriginalFilename());
// 上传合同文件
return AjaxResult.success(fileSourceService.uploadContract(file));
} catch (Exception e) {
log.error("上传合同文件失败: {}", e.getMessage(), e);
return AjaxResult.error("上传合同文件失败");
}
}
/**