diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java index 35b56e61..a08878b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java @@ -15,8 +15,11 @@ import com.adc.da.slrs.wgCommittee.entity.WgCommittee; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -43,6 +46,7 @@ public class WgCommitteeController extends BaseController { @PostMapping("/insert") public ResponseMessage addWorkCommitter(WgCommittee wgCommittee) { + wgCommittee.setCreateTime(new Date()); if (isDistinct(wgCommittee.getCommitteeName(),null)){ if (iWgCommitteeService.add(wgCommittee)){ return Result.success("200","新增成功"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java index bff59910..5dff6902 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; import java.util.List; /** @@ -45,6 +46,9 @@ public class WgCommittee extends BasePage { @ApiModelProperty(value = "委员关联表") private String committeer; + @ApiModelProperty(value = "创建时间") + private Date createTime; + @ApiModelProperty(value = "委员") @TableField(exist = false) private String committeeIds; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml index e32ed03c..405fb81e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml @@ -16,6 +16,7 @@ and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') + order by create_time desc limit ${(page-1)*pageSize},${pageSize} @@ -45,6 +46,7 @@ and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%') + order by create_time desc limit ${(page-1)*pageSize},${pageSize} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index bbdd94d2..91709a12 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -752,4 +753,12 @@ public class AttFileEOController { } } + + @ApiOperation(value = "修改文件名称") + @GetMapping("/updateFileName") + public ResponseMessage updateFileName(@Param("fileId") String fileId,@Param("fileName") String fileName) { + AttFileEO attFileEO = attFileEOService.updateFileInfo(fileId,fileName); + return Result.success(attFileEO); + } + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java index 1e2b9c43..b51ade10 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java @@ -20,6 +20,8 @@ public interface AttFileEODao extends BaseMapper { public AttFileEO selectFileInfoById(AttFileEO attFileEO); + public int updateFileInfoById(AttFileEO attFileEO); + public int insertData(AttFileEO attFileEO); - + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index 60f7922a..9f6a3b41 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -20,6 +20,8 @@ public interface IAttFileEOService extends IService { public AttFileEO getFileInfo(String attId); + public AttFileEO updateFileInfo(String attId,String name); + public List getMultiFileInfos(String fileIds); public List getMultiFileInfosOrderByDateDesc(String fileIds); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 82654b60..5a6ee40d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -333,6 +333,26 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileEO; } + @Override + public AttFileEO updateFileInfo(String attId,String name) { + /** + * 根据ID获取文件信息 + */ + AttFileEO attFileEO = new AttFileEO(); + AttFileEO attFileInfo=null; + Integer flag=0; + try { + attFileEO.setId(attId); + attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); + attFileInfo.setOldFileName(name); + this.baseMapper.updateFileInfoById(attFileEO); + return attFileInfo; + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return attFileInfo; + } + /** * @Author super_liu * @Description 多文件查询 diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index ce248b14..565a95df 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -96,5 +96,8 @@ where id = #{id} + + update ${tableName} set OLD_FILE_NAME = #{oldFileName} where id = #{id} +