Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopInstitutionController.java

@@ -0,0 +1,92 @@
+package com.zhongzheng.controller.top;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.system.bo.TopInstitutionAddBo;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionEditBo;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionQueryBo;
+import com.zhongzheng.modules.top.system.service.ITopInstitutionService;
+import com.zhongzheng.modules.top.system.vo.TopInstitutionVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 职能机构Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Api(value = "职能机构控制器", tags = {"职能机构管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/top/institution")
+public class TopInstitutionController extends BaseController {
+
+    private final ITopInstitutionService iTopInstitutionService;
+
+    /**
+     * 查询职能机构列表
+     */
+    @ApiOperation("查询职能机构列表")
+    @PreAuthorize("@ss.hasPermi('system:institution:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopInstitutionVo> list(TopInstitutionQueryBo bo) {
+        startPage();
+        List<TopInstitutionVo> list = iTopInstitutionService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取职能机构详细信息
+     */
+    @ApiOperation("获取职能机构详细信息")
+    @PreAuthorize("@ss.hasPermi('system:institution:query')")
+    @GetMapping("/{instId}")
+    public AjaxResult<TopInstitutionVo> getInfo(@PathVariable("instId" ) Long instId) {
+        return AjaxResult.success(iTopInstitutionService.queryById(instId));
+    }
+
+    /**
+     * 新增职能机构
+     */
+    @ApiOperation("新增职能机构")
+    @PreAuthorize("@ss.hasPermi('system:institution:add')")
+    @Log(title = "职能机构", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopInstitutionAddBo bo) {
+        return toAjax(iTopInstitutionService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改职能机构
+     */
+    @ApiOperation("修改职能机构")
+    @PreAuthorize("@ss.hasPermi('system:institution:edit')")
+    @Log(title = "职能机构", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopInstitutionEditBo bo) {
+        return toAjax(iTopInstitutionService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/tool/TestController.java

@@ -60,7 +60,7 @@ public class TestController extends BaseController
     @PostMapping("/zip")
     public AjaxResult zip(UserEntity user)
     {
-    //    ossService.zipPeopleDownload(18L,523L,"李盛仁","445224199901040003");
+        ossService.processObject("oss/images/avatar/318/1686645474183_748829657","oss/images/avatar/318/1686645474183_748829657","image/rotate,90");
         return AjaxResult.success(users.put(user.getUserId(), user));
     }
 

zhongzheng-common/pom.xml

@@ -96,7 +96,7 @@
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.10.2</version>
+            <version>3.15.2</version>
         </dependency>
 
         <dependency>

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/OssService.java

@@ -38,4 +38,6 @@ public interface OssService {
     void zipWisdomDownload(List<FileBean> list, ZipOutputStream outStream);
 
     InputStream getStreamByObject(String filePath) throws Exception;
+
+    void processObject(String targetImage ,String sourceImage,String styleType) ;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -6,9 +6,12 @@ import cn.hutool.json.JSONUtil;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.OSSException;
 import com.aliyun.oss.common.utils.BinaryUtil;
+import com.aliyun.oss.common.utils.IOUtils;
 import com.aliyun.oss.internal.OSSUtils;
 import com.aliyun.oss.model.*;
+import com.aliyuncs.exceptions.ClientException;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.exception.CustomException;
@@ -20,7 +23,6 @@ import com.zhongzheng.modules.alioss.vo.ResultBean;
 import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportVo;
 import com.zhongzheng.modules.grade.vo.WeekDataVo;
 import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
-import org.apache.commons.io.IOUtils;
 import org.apache.xmlbeans.impl.values.XmlValueNotNillableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -242,9 +244,8 @@ public class OssServiceImpl implements OssService {
             //获取上传文件输入流
             InputStream inputStream = file.getFile().getInputStream();
             String originalFilename = file.getFile().getOriginalFilename();
-            String suffix = originalFilename.substring(originalFilename.lastIndexOf(".") + 1);
 
-            String fileName = ALIYUN_OSS_DIR_PREFIX + generateRandomFilename(file) + "." + suffix;
+            String fileName = ALIYUN_OSS_DIR_PREFIX + generateRandomFilename(file) ;
 
             //调用oss方法实现上传
             //第一个参数  Bucket名称
@@ -344,6 +345,32 @@ public class OssServiceImpl implements OssService {
             return ossObject.getObjectContent();
     }
 
+    @Override
+    public void processObject(String targetImage,String sourceImage, String styleType) {
+        try {
+            StringBuilder sbStyle = new StringBuilder();
+            Formatter styleFormatter = new Formatter(sbStyle);
+            styleFormatter.format("%s|sys/saveas,o_%s,b_%s", styleType,
+                    BinaryUtil.toBase64String(targetImage.getBytes()),
+                    BinaryUtil.toBase64String(ALIYUN_OSS_BUCKET_NAME.getBytes()));
+            ProcessObjectRequest request = new ProcessObjectRequest(ALIYUN_OSS_BUCKET_NAME, sourceImage, sbStyle.toString());
+            GenericResult processResult = ossClient.processObject(request);
+            String json = IOUtils.readStreamAsString(processResult.getResponse().getContent(), "UTF-8");
+            processResult.getResponse().getContent().close();
+        } catch (OSSException oe) {
+            System.out.println("Caught an OSSException, which means your request made it to OSS, "
+                    + "but was rejected with an error response for some reason.");
+            System.out.println("Error Message:" + oe.getErrorMessage());
+            System.out.println("Error Code:" + oe.getErrorCode());
+            System.out.println("Request ID:" + oe.getRequestId());
+            System.out.println("Host ID:" + oe.getHostId());
+        }catch (IOException e) {
+
+        } finally {
+
+        }
+    }
+
     public void zipFile(List<String> fileList, ZipOutputStream zipOut,String dir) {
         if (CollectionUtils.isEmpty(fileList)) {
             return;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -226,8 +226,8 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
             String[] splitMonth=vo.getMonthTime().split(",");
             for(String month : splitMonth){
                 Calendar cal = Calendar.getInstance();
-                Integer day_moneth=cal.get(Calendar.DAY_OF_MONTH);
-                if(day_moneth==Integer.parseInt(month)){
+                Integer day_month=cal.get(Calendar.DAY_OF_MONTH);
+                if(day_month==Integer.parseInt(month)){
                     String dayStr = DateUtils.getDate();
                     String timeStr = dayStr+" "+vo.getDayTime()+":00";
                     Long time = DateUtils.dateTimeSec(DateUtils.YYYY_MM_DD_HH_MM_SS,timeStr);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/bo/TopInstitutionAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.top.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 职能机构添加对象 top_institution
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Data
+@ApiModel("职能机构添加对象")
+public class TopInstitutionAddBo {
+
+    /** 职能部门名称 */
+    @ApiModelProperty("职能部门名称")
+    private String instName;
+    /** 开户名 */
+    @ApiModelProperty("开户名")
+    private String bankName;
+    /** 开户行 */
+    @ApiModelProperty("开户行")
+    private String bank;
+    /** 开户账号 */
+    @ApiModelProperty("开户账号")
+    private String bankAccount;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/bo/TopInstitutionEditBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.top.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 职能机构编辑对象 top_institution
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Data
+@ApiModel("职能机构编辑对象")
+public class TopInstitutionEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long instId;
+
+    /** 职能部门名称 */
+    @ApiModelProperty("职能部门名称")
+    private String instName;
+
+    /** 开户名 */
+    @ApiModelProperty("开户名")
+    private String bankName;
+
+    /** 开户行 */
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    /** 开户账号 */
+    @ApiModelProperty("开户账号")
+    private String bankAccount;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/bo/TopInstitutionQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.top.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 职能机构分页查询对象 top_institution
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("职能机构分页查询对象")
+public class TopInstitutionQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 职能部门名称 */
+	@ApiModelProperty("职能部门名称")
+	private String instName;
+	/** 开户名 */
+	@ApiModelProperty("开户名")
+	private String bankName;
+	/** 开户行 */
+	@ApiModelProperty("开户行")
+	private String bank;
+	/** 开户账号 */
+	@ApiModelProperty("开户账号")
+	private String bankAccount;
+	/** 1正常 0关闭 */
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/domain/TopInstitution.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.top.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 职能机构对象 top_institution
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_institution")
+public class TopInstitution implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "inst_id")
+    private Long instId;
+    /** 职能部门名称 */
+    private String instName;
+    /** 开户名 */
+    private String bankName;
+    /** 开户行 */
+    private String bank;
+    /** 开户账号 */
+    private String bankAccount;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 1正常 0关闭 */
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/mapper/TopInstitutionMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.system.domain.TopInstitution;
+
+/**
+ * 职能机构Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+public interface TopInstitutionMapper extends BaseMapper<TopInstitution> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/service/ITopInstitutionService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.top.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionAddBo;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionEditBo;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionQueryBo;
+import com.zhongzheng.modules.top.system.domain.TopInstitution;
+import com.zhongzheng.modules.top.system.vo.TopInstitutionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 职能机构Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+public interface ITopInstitutionService extends IService<TopInstitution> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopInstitutionVo queryById(Long instId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopInstitutionVo> queryList(TopInstitutionQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入职能机构
+	 * @param bo 职能机构新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopInstitutionAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改职能机构
+	 * @param bo 职能机构编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopInstitutionEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/service/impl/TopInstitutionServiceImpl.java

@@ -0,0 +1,124 @@
+package com.zhongzheng.modules.top.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.domain.Certificate;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionAddBo;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionEditBo;
+import com.zhongzheng.modules.top.system.bo.TopInstitutionQueryBo;
+import com.zhongzheng.modules.top.system.domain.TopInstitution;
+import com.zhongzheng.modules.top.system.mapper.TopInstitutionMapper;
+import com.zhongzheng.modules.top.system.service.ITopInstitutionService;
+import com.zhongzheng.modules.top.system.vo.TopInstitutionVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 职能机构Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Service
+public class TopInstitutionServiceImpl extends ServiceImpl<TopInstitutionMapper, TopInstitution> implements ITopInstitutionService {
+
+    @Override
+    public TopInstitutionVo queryById(Long instId){
+        TopInstitution db = this.baseMapper.selectById(instId);
+        return BeanUtil.toBean(db, TopInstitutionVo.class);
+    }
+
+    @Override
+    public List<TopInstitutionVo> queryList(TopInstitutionQueryBo bo) {
+        LambdaQueryWrapper<TopInstitution> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getInstName()), TopInstitution::getInstName, bo.getInstName());
+        lqw.like(StrUtil.isNotBlank(bo.getBankName()), TopInstitution::getBankName, bo.getBankName());
+        lqw.eq(StrUtil.isNotBlank(bo.getBank()), TopInstitution::getBank, bo.getBank());
+        lqw.eq(StrUtil.isNotBlank(bo.getBankAccount()), TopInstitution::getBankAccount, bo.getBankAccount());
+        lqw.eq(bo.getStatus() != null, TopInstitution::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopInstitutionVo> entity2Vo(Collection<TopInstitution> collection) {
+        List<TopInstitutionVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopInstitutionVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopInstitution> page = (Page<TopInstitution>)collection;
+            Page<TopInstitutionVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopInstitutionAddBo bo) {
+        TopInstitution add = BeanUtil.toBean(bo, TopInstitution.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopInstitutionEditBo bo) {
+        TopInstitution update = BeanUtil.toBean(bo, TopInstitution.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopInstitution entity){
+        //TODO 做一些数据校验,如唯一约束
+        if(checkNameUnique(entity)){
+            throw new CustomException("名称重复");
+        }
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    private boolean checkNameUnique(TopInstitution entity) {
+        TopInstitution info = getOne(new LambdaQueryWrapper<TopInstitution>()
+                .eq(TopInstitution::getInstName,entity.getInstName()).ne(TopInstitution::getStatus,-1)
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            if(Validator.isNotEmpty(entity.getInstId())){
+                if(entity.getInstId().longValue() != info.getInstId().longValue()){
+                    return true;
+                }
+            }else{
+                return true;
+            }
+        }
+        return false;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/vo/TopInstitutionVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.top.system.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 职能机构视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-07-17
+ */
+@Data
+@ApiModel("职能机构视图对象")
+public class TopInstitutionVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long instId;
+
+	/** 职能部门名称 */
+	@Excel(name = "职能部门名称")
+	@ApiModelProperty("职能部门名称")
+	private String instName;
+	/** 开户名 */
+	@Excel(name = "开户名")
+	@ApiModelProperty("开户名")
+	private String bankName;
+	/** 开户行 */
+	@Excel(name = "开户行")
+	@ApiModelProperty("开户行")
+	private String bank;
+	/** 开户账号 */
+	@Excel(name = "开户账号")
+	@ApiModelProperty("开户账号")
+	private String bankAccount;
+	/** 1正常 0关闭 */
+	@Excel(name = "1正常 0关闭")
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/resources/mapper/modules/base/ShoppingCartMapper.xml

@@ -60,6 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         WHERE
             s.user_id =  #{userId}
-        order by s.update_time desc
+        order by s.create_time desc
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopInstitutionMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.top.system.mapper.TopInstitutionMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.system.domain.TopInstitution" id="TopInstitutionResult">
+        <result property="instId" column="inst_id"/>
+        <result property="instName" column="inst_name"/>
+        <result property="bankName" column="bank_name"/>
+        <result property="bank" column="bank"/>
+        <result property="bankAccount" column="bank_account"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>