导出经费。取消:query权限

research-admin/src/main/java/com/research/web/controller/client/flow/SysExpressionController.java

@@ -62,7 +62,7 @@ public class SysExpressionController extends BaseController
     /**
      * 获取流程达式详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:expression:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

research-admin/src/main/java/com/research/web/controller/client/flow/SysFormController.java

@@ -69,7 +69,7 @@ public class SysFormController extends BaseController {
     /**
      * 获取流程表单详细信息
      */
-    @PreAuthorize("@ss.hasPermi('flowable:form:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{formId}")
     public AjaxResult getInfo(@PathVariable("formId") Long formId) {
         return AjaxResult.success(SysFormService.selectSysFormById(formId));

research-admin/src/main/java/com/research/web/controller/client/flow/SysListenerController.java

@@ -62,7 +62,7 @@ public class SysListenerController extends BaseController
     /**
      * 获取流程监听详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:listener:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

research-admin/src/main/java/com/research/web/controller/client/funding/FundingController.java

@@ -4,11 +4,14 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.research.common.core.domain.BaseDto;
 import com.research.common.core.domain.JsonResponse;
+import com.research.common.utils.StringUtils;
+import com.research.common.utils.poi.ExcelUtil;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.FundingDto;
 import com.research.system.domain.vo.FundingVo;
 import com.research.system.service.FundingService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -53,4 +58,26 @@ public class FundingController {
         fundingService.del(dto);
         return JsonResponse.ok();
     }
+
+    @PostMapping("/export")
+    @ApiOperation("导出经费收支数据")
+    public void exportFunding(@RequestBody @Validated FundingDto.Query query, HttpServletResponse response) {
+        List<FundingVo.Result> list = fundingService.queryList(query);
+
+        String baseUrl = "https://kygx.sxyfrs.com/research/";
+
+        list.forEach(result -> {
+            if (StringUtils.hasText(result.getPzhUrl())) {
+                String fullUrl = result.getPzhUrl();
+                if (!fullUrl.startsWith("http")) {
+                    fullUrl = baseUrl + fullUrl;
+                }
+                result.setPzhUrl(fullUrl);
+            }
+        });
+
+        // 使用自定义Excel导出，支持超链接
+        ExcelUtil<FundingVo.Result> util = new ExcelUtil<>(FundingVo.Result.class);
+        util.exportExcel(response, list, "经费收支数据");
+    }
 }

research-admin/src/main/java/com/research/web/controller/system/SysConfigController.java

@@ -59,7 +59,7 @@ public class SysConfigController extends BaseController
     /**
      * 根据参数编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{configId}")
     public AjaxResult getInfo(@PathVariable Long configId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysDeptController.java

@@ -73,7 +73,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysDictDataController.java

@@ -64,7 +64,7 @@ public class SysDictDataController extends BaseController
     /**
      * 查询字典数据详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode)
     {

research-admin/src/main/java/com/research/web/controller/system/SysDictTypeController.java

@@ -56,7 +56,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 查询字典类型详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{dictId}")
     public AjaxResult getInfo(@PathVariable Long dictId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysMenuController.java

@@ -47,7 +47,7 @@ public class SysMenuController extends BaseController
     /**
      * 根据菜单编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysNoticeController.java

@@ -47,7 +47,7 @@ public class SysNoticeController extends BaseController
     /**
      * 根据通知公告编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{noticeId}")
     public AjaxResult getInfo(@PathVariable Long noticeId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysPostController.java

@@ -59,7 +59,7 @@ public class SysPostController extends BaseController
     /**
      * 根据岗位编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{postId}")
     public AjaxResult getInfo(@PathVariable Long postId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysRoleController.java

@@ -79,7 +79,7 @@ public class SysRoleController extends BaseController
     /**
      * 根据角色编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{roleId}")
     public AjaxResult getInfo(@PathVariable Long roleId)
     {
@@ -185,7 +185,7 @@ public class SysRoleController extends BaseController
      * 获取角色选择框列表
      */
     @Anonymous
-//    @PreAuthorize("@ss.hasPermi('system:role:query')")
+//    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     {
@@ -253,7 +253,7 @@ public class SysRoleController extends BaseController
     /**
      * 获取对应角色部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/deptTree/{roleId}")
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     {

research-admin/src/main/java/com/research/web/controller/system/SysUserController.java

@@ -108,7 +108,7 @@ public class SysUserController extends BaseController
     /**
      * 根据用户编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
@@ -247,7 +247,7 @@ public class SysUserController extends BaseController
     /**
      * 根据用户编号获取授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId)
     {

research-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -66,7 +66,7 @@ public class GenController extends BaseController
     /**
      * 获取代码生成信息
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{tableId}")
     public AjaxResult getInfo(@PathVariable Long tableId)
     {

research-quartz/src/main/java/com/research/quartz/controller/SysJobController.java

@@ -67,7 +67,7 @@ public class SysJobController extends BaseController
     /**
      * 获取定时任务详细信息
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{jobId}")
     public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
     {

research-quartz/src/main/java/com/research/quartz/controller/SysJobLogController.java

@@ -59,7 +59,7 @@ public class SysJobLogController extends BaseController
     /**
      * 根据调度编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+    //@PreAuthorize("@ss.hasPermi('[^']*:query')")
     @GetMapping(value = "/{jobLogId}")
     public AjaxResult getInfo(@PathVariable Long jobLogId)
     {

research-system/src/main/java/com/research/system/domain/vo/FundingVo.java

@@ -1,6 +1,8 @@
 package com.research.system.domain.vo;
 
+import com.research.common.annotation.Excel;
 import com.research.system.domain.po.FudFundRecord;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,43 +18,85 @@ public class FundingVo {
 
     @Data
     public static class Result {
+        @ApiModelProperty("表ID")
         private Long id;
 
+        @ApiModelProperty("项目id")
         private Long projId;
 
+        @Excel(name = "项目名称")
+        @ApiModelProperty("项目名称")
+        private String projName;
+
+        @ApiModelProperty("合作单位id")
         private Long projOrgId;
 
+        @Excel(name = "合作单位名称")
+        @ApiModelProperty("合作单位名称")
+        private String projOrgName;
+
+        @ApiModelProperty("课题组id")
         private Long ktGroupId;
 
+        @Excel(name = "课题组名称")
+        @ApiModelProperty("课题组名称")
+        private String ktGroupName;
+
+        @Excel(name = "经费类型", readConverterExp = "0=收入,1=支出")
+        @ApiModelProperty("经费类型：0-收入，1-支出")
         private Byte payType;
 
+        @Excel(name = "收入来源/支出用途")
+        @ApiModelProperty("收入来源/支出用途")
         private String paySource;
 
+        @Excel(name = "收支科目")
+        @ApiModelProperty("收支科目，eg:科研项目经费,设备购置费,材料费，差旅费")
         private String paySubject;
 
+        @Excel(name = "用途/摘要/说明")
+        @ApiModelProperty("用途/摘要/说明")
         private String payAbstract;
 
+        @Excel(name = "收支时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty("收支时间")
         private Date payTime;
 
+        @Excel(name = "收入金额", cellType = Excel.ColumnType.NUMERIC)
+        @ApiModelProperty("收入金额")
         private BigDecimal incomeAmount;
 
+        @Excel(name = "支出金额", cellType = Excel.ColumnType.NUMERIC)
+        @ApiModelProperty("支出金额")
         private BigDecimal payAmount;
 
+        @Excel(name = "经手人")
+        @ApiModelProperty("经手人")
         private String jsr;
 
+        @Excel(name = "审批人")
+        @ApiModelProperty("审批人")
         private String spr;
 
+        @Excel(name = "凭证号/发票号码/转账记录号")
+        @ApiModelProperty("凭证号/发票号码/转账记录号")
         private String pzh;
 
+        @Excel(name = "发票/转账凭证")
+        @ApiModelProperty("发票/转账凭证")
         private String pzhUrl;
 
+        @Excel(name = "备注")
+        @ApiModelProperty("备注")
         private String remark;
 
+        @Excel(name = "创建者")
+        @ApiModelProperty("创建者")
         private String createBy;
 
+        @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty("创建时间")
         private Date createTime;
 
-        private String projOrgName;
-        private String ktGroupName;
     }
 }

research-system/src/main/java/com/research/system/persist/dao/TaskDao.java

@@ -66,4 +66,6 @@ public interface TaskDao {
 
 
     UserVo.MyselfVo getTaskNumByUserId(String phone);
+
+    Integer getResultCount(@Param("userName")String userName);
 }

research-system/src/main/java/com/research/system/service/impl/SysUserServiceImpl.java

@@ -585,7 +585,8 @@ public class SysUserServiceImpl implements ISysUserService
         //查找任务信息
         UserVo.MyselfVo myselfVo = taskDao.getTaskNumByUserId(SecurityUtils.getLoginUser().getUser().getPhonenumber());
         //查找成果数量
-
+        Integer resultCount = taskDao.getResultCount(SecurityUtils.getLoginUser().getUsername());
+        myselfVo.setResultCount(resultCount);
         //查找客服电话
         myselfVo.setServicePhone(servicePhone);
         //版本号

research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java

@@ -301,6 +301,8 @@ public class TaskServiceImpl implements ITaskService {
                 memberIdList = groupMembers.stream()
                         .map(KtsKtGroupMember::getId)
                         .collect(Collectors.toList());
+            }else {
+                return new ArrayList<>();
             }
         }
         //查找任务

research-system/src/main/java/com/research/system/service/impl/TmsTenantUserServiceImpl.java

@@ -2,6 +2,8 @@ package com.research.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import com.research.common.annotation.DataSource;
+import com.research.common.enums.DataSourceType;
 import com.research.system.domain.dto.TmsTenantUserDto;
 import com.research.system.domain.po.*;
 import com.research.system.domain.vo.AdminTenantUserVo;
@@ -31,6 +33,7 @@ public class TmsTenantUserServiceImpl implements TmsTenantUserService {
     private SrvDataSourceMapper srvDataSourceMapper;
 
     @Override
+    @DataSource(DataSourceType.MASTER)
     public SrvDataSource getDataSourceByTenantId(Long tenantId) {
         TmsTenant tmsTenant = tmsTenantMapper.selectByPrimaryKey(tenantId);
         if (tmsTenant != null && tmsTenant.getDataSourceId() != null) {

research-system/src/main/resources/mapper/dao/FundingDao.xml

@@ -6,6 +6,7 @@
         select
         r.id,
         r.proj_id as projId,
+        p.title as projName,
         r.proj_org_id as projOrgId,
         r.kt_group_id as ktGroupId,
         r.pay_type as payType,
@@ -26,10 +27,9 @@
         g.kt_group_name as ktGroupName
         from
         fud_fund_record r
-        left join
-            prj_proj_org o on r.proj_org_id = o.id
-        left join
-            kts_kt_group g on r.kt_group_id = g.id
+        left join prj_proj_org o on r.proj_org_id = o.id
+        left join kts_kt_group g on r.kt_group_id = g.id
+        left join prj_proj_info p on r.proj_id = p.id
         where
         r.del_flag = 0
         <if test="dto.projOrgId != null">

research-system/src/main/resources/mapper/dao/TaskDao.xml

@@ -103,12 +103,12 @@
             AND t.task_creator_id = #{userId}
         </if>
         <if test="param.taskType == 1">
-            <if test="memberIdList != null and memberIdList.size() > 0">
+#             <if test="memberIdList != null and memberIdList.size() > 0">
                 AND
                 <foreach collection="memberIdList" item="memberId" open="(" close=")" separator="OR">
                     FIND_IN_SET(#{memberId}, tm.member_ids) > 0
                 </foreach>
-            </if>
+#             </if>
         </if>
         GROUP BY tm.id
         ) t
@@ -228,4 +228,13 @@
         WHERE 	kgm.member_phone = #{phone}
           AND tm.del_flag = 0;
     </select>
+    <select id="getResultCount" resultType="java.lang.Integer">
+        select
+            count(1)
+        from
+            ach_achievement
+        where
+            del_flag = 0
+        and create_by = #{userName}
+    </select>
 </mapper>