Browse Source

优化附件清单管理

master
fanzongzhe 2 years ago
parent
commit
33ff7d4597
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java
  3. 29
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java
  4. 15
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java
  6. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml
  7. 22
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java
  8. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java

@ -57,6 +57,8 @@ public class BaseFiles extends BaseEntity {
private String fileNo; private String fileNo;
@ApiModelProperty("文件名称") @ApiModelProperty("文件名称")
private String fileName; private String fileName;
@ApiModelProperty("文件格式key")
private String fileTypeKey;
@ApiModelProperty("文件格式") @ApiModelProperty("文件格式")
private String fileType; private String fileType;
@ApiModelProperty("示例") @ApiModelProperty("示例")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java

@ -65,6 +65,8 @@ public class BaseFilesDto implements Dto {
private String fileNo; private String fileNo;
@ApiModelProperty("文件名称") @ApiModelProperty("文件名称")
private String fileName; private String fileName;
@ApiModelProperty("文件格式key")
private String fileTypeKey;
@ApiModelProperty("文件格式") @ApiModelProperty("文件格式")
private String fileType; private String fileType;
@ApiModelProperty("份数") @ApiModelProperty("份数")

29
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java

@ -103,5 +103,34 @@ public interface BaseFilesFeign {
@GetMapping("/createFileNo") @GetMapping("/createFileNo")
ResultBean<String> createFileNo(@RequestParam("busTypeKey") String busTypeKey); ResultBean<String> createFileNo(@RequestParam("busTypeKey") String busTypeKey);
/**
* 隐藏
*
* @param
* @return
*/
@ApiOperation("隐藏")
@PostMapping("/hide")
ResultBean hide(@RequestParam("sid") String sid);
/**
* 隐藏
*
* @param
* @return
*/
@ApiOperation("隐藏")
@PostMapping("/hideOrShow")
ResultBean hideOrShow(@RequestParam("sid") String sid, @RequestParam("state") String state);
/**
* 显示
*
* @param
* @return
*/
@ApiOperation("显示")
@PostMapping("/show")
ResultBean show(@RequestParam("sid") String sid);
} }

15
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java

@ -75,5 +75,20 @@ public class BaseFilesFeignFallback implements BaseFilesFeign {
return null; return null;
} }
@Override
public ResultBean hide(String sid) {
return null;
}
@Override
public ResultBean hideOrShow(String sid, String state) {
return null;
}
@Override
public ResultBean show(String sid) {
return null;
}
} }

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java

@ -70,6 +70,6 @@ public class BaseFilesVo implements Vo {
private List<String> files = new ArrayList<>(); private List<String> files = new ArrayList<>();
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remarks; private String remarks;
@ApiModelProperty("查看附件按钮显示") @ApiModelProperty("显示状态")
private Boolean showSampleBtn; private String state;
} }

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml

@ -13,6 +13,7 @@
fileName, fileName,
fileType, fileType,
`count`, `count`,
`state`,
isUpload, isUpload,
sample, sample,
remarks remarks
@ -22,6 +23,9 @@
</where> </where>
</select> </select>
<select id="createFileNo" resultType="java.lang.String"> <select id="createFileNo" resultType="java.lang.String">
SELECT fileNo FROM base_files where busTypeKey = #{busTypeKey} order by fileNo DESC limit 1 SELECT fileNo
FROM base_files
where busTypeKey = #{busTypeKey}
order by fileNo DESC limit 1
</select> </select>
</mapper> </mapper>

22
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java

@ -89,4 +89,26 @@ public class BaseFilesRest implements BaseFilesFeign {
return baseFilesService.createFileNo(busTypeKey); return baseFilesService.createFileNo(busTypeKey);
} }
@Override
public ResultBean hide(String sid) {
return baseFilesService.hide(sid);
}
@Override
public ResultBean hideOrShow(String sid, String state) {
ResultBean rb = ResultBean.fireFail();
if (state.equals("0")) {
this.hide(sid);
} else if (state.equals("1")) {
this.show(sid);
}
return rb.success();
}
@Override
public ResultBean show(String sid) {
return baseFilesService.show(sid);
}
} }

28
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java

@ -157,9 +157,7 @@ public class BaseFilesService extends MybatisBaseService<BaseFilesMapper, BaseFi
records.removeAll(Collections.singleton(null)); records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) { if (!records.isEmpty()) {
for (BaseFilesVo record : records) { for (BaseFilesVo record : records) {
record.setShowSampleBtn(false);
if (StringUtils.isNotBlank(record.getSample())) { if (StringUtils.isNotBlank(record.getSample())) {
record.setShowSampleBtn(true);
String filePath = record.getSample(); String filePath = record.getSample();
List<String> filePaths = new ArrayList<>(); List<String> filePaths = new ArrayList<>();
String array[] = filePath.split(","); String array[] = filePath.split(",");
@ -254,4 +252,30 @@ public class BaseFilesService extends MybatisBaseService<BaseFilesMapper, BaseFi
} }
return rb.success().setData(finNo); return rb.success().setData(finNo);
} }
/**
* 隐藏
* @param sid
* @return
*/
public ResultBean hide(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseFiles baseFiles = fetchBySid(sid);
baseFiles.setState(0);
baseMapper.updateById(baseFiles);
return rb.success();
}
/**
* 显示
* @param sid
* @return
*/
public ResultBean show(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseFiles baseFiles = fetchBySid(sid);
baseFiles.setState(1);
baseMapper.updateById(baseFiles);
return rb.success();
}
} }
Loading…
Cancel
Save